aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-04-02arch/tile: don't enable irqs unconditionally in page fault handlerChris Metcalf1-2/+5
If we took a page fault while we had interrupts disabled, we shouldn't enable them in the page fault handler. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: don't set the homecache of a PTE unless appropriateChris Metcalf1-4/+12
We make sure not to try to set the home for an MMIO PTE (on tilegx) or a PTE that isn't referencing memory managed by Linux. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: don't wait for migrating PTEs in an NMI handlerChris Metcalf1-3/+10
Doing so raises the possibility of self-deadlock if we are waiting for a backtrace for an oprofile or perf interrupt while we are in the middle of migrating our own stack page. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile/Makefile: use KCFLAGS when figuring out the libgcc path.Chris Metcalf1-1/+2
Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: fix a couple of comments that needed updatingChris Metcalf2-3/+10
Not associated with any code changes, so I'm just lumping these comment changes into a commit by themselves. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: fix up some minor trap handling issuesChris Metcalf2-3/+8
We now respond to MEM_ERROR traps (e.g. an atomic instruction to non-cacheable memory) with a SIGBUS. We also no longer generate a console crash message if a user process die due to a SIGTRAP. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: work around a hardware issue with the return-address stackChris Metcalf3-2/+22
In certain circumstances we need to do a bunch of jump-and-link instructions to fill the hardware return-address stack with nonzero values. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: various bugs in stack backtracerChris Metcalf2-120/+112
Fix a long-standing bug in the stack backtracer where we would print garbage to the console instead of kernel function names, if the kernel wasn't built with symbol support (e.g. mboot). Make sure to tag every line of userspace backtrace output if we actually have the mmap_sem, since that way if there's no tag, we know that it's because we couldn't trylock the semaphore. Stop doing a TLB flush and examining page tables during backtrace. Instead, just trust that __copy_from_user_inatomic() will properly fault and return a failure, which it should do in all cases. Fix a latent bug where the backtracer would directly examine a signal context in user space, rather than copying it safely to kernel memory first. This meant that a race with another thread could potentially have caused a kernel panic. Guard against unaligned sp when trying to restart backtrace at an interrupt or signal handler point in the kernel backtracer. Report kernel symbolic information for the call instruction rather than for the following instruction. We still report the actual numeric address corresponding to the instruction after the call, for the sake of consistency with the normal expectations for stack backtracers. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: make sure to build memcpy_user_64 without frame pointerChris Metcalf2-1/+8
Add a comment explaining why this is important, and add a CFLAGS_REMOVE clause to the Makefile to make sure it happens. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: avoid false corrupt frame warning in early bootChris Metcalf1-1/+1
With lockstat we can end up trying to get a backtrace before "high_memory" is initialized, so don't worry about range testing if it is zero. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: use 0 for IRQ_RESCHEDULE instead of 1Chris Metcalf1-1/+1
This avoids assigning IRQ 0 to PCI devices, because we've seen that doesn't always work well. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: fix gcc 4.6 warnings in <asm/bitops_64.h>Chris Metcalf1-4/+4
Fix some signedness and variable usage warnings in change_bit() and test_and_change_bit(). Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile: revert comment for atomic64_add_unless().Chris Metcalf1-1/+1
It still returns whether @v was not @u, not the old value, unlike __atomic_add_unless(). Signed-off-by: Chris Metcalf <[email protected]> Acked-by: Arun Sharma <[email protected]>
2012-04-02arch/tile: fix typo in <arch/spr_def.h>Chris Metcalf1-2/+2
We aren't yet using this definition in the kernel, but fix it up before someone goes looking for it. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile/Kconfig: don't specify CONFIG_PAGE_OFFSET for 64-bit buildsChris Metcalf1-0/+1
It's fixed at half the VA space and there's no point in configuring it. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile/Kconfig: rename tile_defconfig to tilepro_defconfigChris Metcalf1-1/+4
We switched to using "tilepro" for the 32-bit stuff a while ago, but missed this one usage. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02arch/tile/Kconfig: remove pointless "!M386" test.Chris Metcalf1-1/+1
Looks like a cut and paste bug from the x86 version. Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02tile: fix multiple build failures from system.h dismantlePaul Gortmaker4-48/+77
Commit bd119c69239322caafdb64517a806037d0d0c70a "Disintegrate asm/system.h for Tile" created the asm/switch_to.h file, but did not add an include of it to all its users. Also, commit b4816afa3986704d1404fc48e931da5135820472 "Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h" introduced the concept of asm/cmpxchg.h but the tile arch never got one. Fork the cmpxchg content out of the asm/atomic.h file to create one. Acked-by: David Howells <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> Signed-off-by: Chris Metcalf <[email protected]>
2012-04-02Merge tag 'for-linus' of git://github.com/rustyrussell/linuxLinus Torvalds28-90/+79
Pull cpumask cleanups from Rusty Russell: "(Somehow forgot to send this out; it's been sitting in linux-next, and if you don't want it, it can sit there another cycle)" I'm a sucker for things that actually delete lines of code. Fix up trivial conflict in arch/arm/kernel/kprobes.c, where Rusty fixed a user of &cpu_online_map to be cpu_online_mask, but that code got deleted by commit b21d55e98ac2 ("ARM: 7332/1: extract out code patch function from kprobes"). * tag 'for-linus' of git://github.com/rustyrussell/linux: cpumask: remove old cpu_*_map. documentation: remove references to cpu_*_map. drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map. remove references to cpu_*_map in arch/
2012-04-02irq_work: fix compile failure on MIPS from system.h splitPaul Gortmaker1-0/+1
Builds of the MIPS platform ip32_defconfig fails as of commit 0195c00244dc ("Merge tag 'split-asm_system_h ...") because MIPS xchg() macro uses BUILD_BUG_ON and it was moved in commit b81947c646bf ("Disintegrate asm/system.h for MIPS"). The root cause is that the system.h split wasn't tested on a baseline with commit 6c03438edeb5 ("kernel.h: doesn't explicitly use bug.h, so don't include it.") Since this file uses BUG code in several other places besides the xchg call, simply make the inclusion explicit. Signed-off-by: Paul Gortmaker <[email protected]> Acked-by: David Howells <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-04-02ARM: armadillo5x0: Fix smsc911x driver probeFabio Estevam1-0/+9
Fix smsc911x driver probe by adding a fixed dummy regulator. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02ARM: kzm_arm11_01: Fix smsc911x driver probeFabio Estevam1-0/+9
Fix smsc911x driver probe by adding a fixed dummy regulator. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02ARM: mx31lilly: Fix smsc911x driver probeFabio Estevam1-0/+9
Fix smsc911x driver probe by adding a fixed dummy regulator. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02ARM: mx31lite: Fix smsc911x driver probeFabio Estevam1-0/+9
Fix smsc911x driver probe by adding a fixed dummy regulator. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02ARM: mx53ard: Fix smsc911x driver probeFabio Estevam1-0/+8
Fix smsc911x driver probe by adding a fixed dummy regulator. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02drm/i915: disable ppgtt on snb when dmar is enabledDaniel Vetter5-5/+23
Totally unexpected that this regressed. Luckily it sounds like we just need to have dmar disable on the igfx, not the entire system. At least that's what a few days of testing between Tony Vroon and me indicates. Reported-by: Tony Vroon <[email protected]> Cc: Tony Vroon <[email protected]> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43024 Acked-by: Chris Wilson <[email protected]> Signed-Off-by: Daniel Vetter <[email protected]>
2012-04-02drm/i915: add Ivy Bridge GT2 Server entriesEugeni Dodonov3-0/+4
This adds PCI ID for IVB GT2 server variant which we were missing. Signed-off-by: Eugeni Dodonov <[email protected]> [danvet: fix up conflict because the patch has been diffed against next. tsk.] Signed-Off-by: Daniel Vetter <[email protected]>
2012-04-02x86, kvm: Call restore_sched_clock_state() only after %gs is initializedMarcelo Tosatti1-1/+1
s2ram broke due to this KVM commit: b74f05d61b73 x86: kvmclock: abstract save/restore sched_clock_state restore_sched_clock_state() methods use percpu data, therefore they must run after %gs is initialized, but before mtrr_bp_restore() (due to lockstat using sched_clock). Move it to the correct place. Reported-and-tested-by: Konstantin Khlebnikov <[email protected]> Signed-off-by: Marcelo Tosatti <[email protected]> Cc: Avi Kivity <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2012-04-02microblaze: Fix ret_from_fork declarationMichal Simek1-2/+2
ret_from_fork is used by noMMU system too. It should be the part of patch "Disintegrate asm/system.h for Microblaze" (sha1: c40d04df152a1111c5bbcb632278394dabd2b73d) Signed-off-by: Michal Simek <[email protected]>
2012-04-02microblaze: Do not use tlb_skip in early_printkMichal Simek1-0/+2
tlb_skip is valid only for MMU system. Signed-off-by: Michal Simek <[email protected]>
2012-04-02drm/radeon: Don't dereference possibly-NULL pointer.Michel Dänzer1-1/+2
Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Michel Dänzer <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-04-02mm, drm/udl: fixup vma flags on mmapKonstantin Khlebnikov3-1/+16
There should be VM_MIXEDMAP, not VM_PFNMAP, because udl_gem_fault() inserts pages via vm_insert_page(). Other drm/gem drivers already do this. Signed-off-by: Konstantin Khlebnikov <[email protected]> Cc: Dave Airlie <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2012-04-02drm/radeon/kms: fix fans after resumeAlex Deucher2-1/+15
On pre-R600 asics, the SpeedFanControl table is not executed as part of ASIC_Init as it is on newer asics. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=29412 Signed-off-by: Alex Deucher <[email protected]> Reviewed-by: Michel Dänzer <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2012-04-02nouveau/bios: Fix tracking of BIOS image dataBenjamin Herrenschmidt1-1/+3
The code tries various methods for retreiving the BIOS data. However it doesn't clear the bios->data pointer between the iterations. In some cases, the shadow() method will fail and not update bios->data at all, which will cause us to "score" the old data and incorrectly attribute that score to the new method. This can cause double frees later when disposing of the unused data. Additionally, we were not freeing the data for methods that fail the score test (we only freed when a "best" is superseeded, not when the new method has a lower score than the exising "best"). Fix that as well. Signed-off-by: Benjamin Herrenschmidt <[email protected]> Acked-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-04-02nouveau: Fix crash when pci_ram_rom() returns a size of 0Benjamin Herrenschmidt1-2/+3
From b15b244d6e6e20964bd4b85306722cb60c3c0809 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt <[email protected]> Date: Mon, 2 Apr 2012 13:28:18 +1000 Subject: Under some circumstances, pci_map_rom() can return a valid mapping but a size of 0 (if it cannot find an image in the header). This causes nouveau to try to kmalloc() a 0 sized pointer and dereference it, which crashes. Signed-off-by: Benjamin Herrenschmidt <[email protected]> Acked-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-04-02ARM: at91/at91sam9x5: add clkdev entries for DMA controllersNicolas Ferre1-0/+2
Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
2012-04-02drm/nouveau: select POWER_SUPPLYDave Airlie1-0/+1
Ben H. reported that building nouveau into the kernel and power supply as a module was broken. Just have nouveau select it, like radeon does. Reported-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-04-02Merge branch 'drm-nouveau-fixes' of ↵Dave Airlie3-8/+8
git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes * 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: inform userspace of relaxed kernel subchannel requirements Revert "drm/nouveau: inform userspace of new kernel subchannel requirements" drm/nouveau: oops, create m2mf for nvd9 too
2012-04-02Subject: [PATCH] tags.sh: Add missing quotesStephen Boyd1-1/+1
When $remove_structs is empty a test for empty string will turn into test -n with no arguments meaning true. Add quotes so an empty string is tested and so that make cscope works again. Reported-and-tested-by: Jike Song <[email protected]> Reported-by: Prarit Bhargava <[email protected]> Acked-by: Yang Bai <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-04-02ARM: mx35: Fix registration of camera clockFabio Estevam1-1/+1
Fix registration of camera clock so that mx3-camera driver can get its clock correctly. Reported-by: Alex Gershgorin <[email protected]> Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02ARM: 3ds_debugboard: Fix smsc911x driver probeFabio Estevam1-1/+1
Fix smsc911x id field in order to fix smsc911x driver probe error: smsc911x smsc911x.0: Failed to get supply 'vdd33a': -517 smsc911x smsc911x.0: (unregistered net_device): couldn't get regulators -517 platform smsc911x.0: Driver smsc911x requests probe deferral Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02MX2: Fix mx2_camera clock regression.Javier Martin1-0/+1
The following patch breaks mx2_camera driver: http://git.linuxtv.org/media_tree.git?a=commitdiff;h=52f1a845e25dc0c6435153aca1a170e20b282429 This change fixes the problem. Signed-off-by: Javier Martin <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02ARM: mach-mx35_3ds: Fix build warning due to the lack of 'const' annotationFabio Estevam1-1/+1
Fix the following build warning: arch/arm/mach-imx/mach-mx35_3ds.c: In function 'mx35_3ds_lcd_set_power': arch/arm/mach-imx/mach-mx35_3ds.c:112: warning: passing argument 2 of 'gpiochip_find' from incompatible pointer type include/asm-generic/gpio.h:145: note: expected 'int (*)(struct gpio_chip *, const void *)' but argument is of type 'int (*)(struct gpio_chip *, void *)' Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-04-02powerpc/eeh: Fix use of set_current_state() in eeh event handling ↵Andrew Morton1-1/+1
set_current_state() wart That set_current_state() won't work very well: the subsequent mutex_lock() might flip the task back into TASK_RUNNING. Attempt to put it somewhere where it might have been meant to be, and attempt to describe why it might have been added. Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2012-04-02powerpc/eeh: Remove eeh_event_handler()->daemonize()Oleg Nesterov1-1/+1
daemonize() is only needed when a user-space task does kernel_thread(). eeh_event_handler() thread is created by the worker kthread, and thus it doesn't need the soon-to-be-deprecated daemonize(). Signed-off-by: Oleg Nesterov <[email protected]> Acked-by: Linas Vepstas <[email protected]> Acked-by: Tejun Heo <[email protected]> Acked-by: Matt Fleming <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2012-04-02powerpc/kvm: Fallout from system.h disintegrationBenjamin Herrenschmidt3-0/+3
Add a missing include to fix build Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2012-04-02powerpc: Fix fallout from system.h split upStephen Rothwell2-0/+3
Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2012-04-02powerpc: Mark const init data with __initconst instead of __initdataUwe Kleine-König3-3/+3
As long as there is no other non-const variable marked __initdata in the same compilation unit it doesn't hurt. If there were one however compilation would fail with error: $variablename causes a section type conflict because a section containing const variables is marked read only and so cannot contain non-const variables. Signed-off-by: Uwe Kleine-König <[email protected]> Cc: Josh Boyer <[email protected]> Cc: Matt Porter <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Anatolij Gustschin <[email protected]> Cc: Kumar Gala <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2012-04-02Merge remote-tracking branch 'kumar/next' into mergeBenjamin Herrenschmidt25-56/+701
2012-04-01net: usb: cdc_eem: fix mtuRabin Vincent1-0/+1
Make CDC EEM recalculate the hard_mtu after adjusting the hard_header_len. Without this, usbnet adjusts the MTU down to 1494 bytes, and the host is unable to receive standard 1500-byte frames from the device. Tested with the Linux USB Ethernet gadget. Cc: Oliver Neukum <[email protected]> Signed-off-by: Rabin Vincent <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.