commit cb0a02ecf95e5f47d92e7d4c513cc1f7aeb40cda Merge: d681f12 c5182b8 Author: Linus Torvalds Date: Tue Jun 7 19:21:11 2011 -0700 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Ensure we locate the passed IRQ in irq_alloc_descs() genirq: Fix descriptor init on non-sparse IRQs irq: Handle spurios irq detection for threaded irqs genirq: Print threaded handler in spurious debug output commit d681f1204d701cafbc45fa90e0ac977acddc33cc Merge: 6715a52 2601887 Author: Linus Torvalds Date: Tue Jun 7 19:20:53 2011 -0700 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/amd-iommu: Fix boot crash with hidden PCI devices x86/amd-iommu: Use only per-device dma_ops x86/amd-iommu: Fix 3 possible endless loops commit 6715a52a581c891e9a2034abe1c81ddb482d70b3 Merge: ef23980 6c6c54e Author: Linus Torvalds Date: Tue Jun 7 19:20:28 2011 -0700 Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix/clarify set_task_cpu() locking rules lockdep: Fix lock_is_held() on recursion sched: Fix schedstat.nr_wakeups_migrate sched: Fix cross-cpu clock sync on remote wakeups commit ef2398019b305827ea7130ebaf7bf521b444530e Merge: 12871a0 dcc32b8 Author: Linus Torvalds Date: Tue Jun 7 19:09:26 2011 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/nv40: fall back to paged dma object for the moment drm/nouveau: fix leak of gart mm node drm/nouveau: fix vram page mapping when crossing page table boundaries drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). drm/nouveau: don't create accel engine objects when noaccel=1 drm/nvc0: recognise 0xdX chipsets as NV_C0 drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007 drm/i915: Share the common force-audio property between connectors drm/i915: Remove unused enum "chip_family" drm/915: fix relaxed tiling on gen2: tile height drm/i915/crt: Explicitly return false if connected to a digital monitor drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0 drm/i915: Only print out the actual number of fences for i915_error_state drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/ drm: i915: correct return status in intel_hdmi_mode_valid() drm/i915: fix regression after clock gating init split drm/i915: fix if statement in ivybridge irq handler commit 12871a0bd67dd4db4418e1daafcd46e9d329ef10 Merge: ecff4fc f3aecea Author: Linus Torvalds Date: Tue Jun 7 19:09:17 2011 -0700 Merge branch 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms/atom: fix PHY init drm/radeon/kms: add missing Evergreen texture formats to the CS parser drm/radeon/kms: viewport height has to be even drm/radeon/kms: remove duplicate reg from r600 safe regs drm/radeon/kms: add support for Llano Fusion APUs drm/radeon/kms: add llano pci ids drm/radeon/kms: fill in asic struct for llano drm/radeon/kms: add family ids for llano APUs drm/radeon: fix oops in ttm reserve when pageflipping (v2) drm/radeon/kms: clean up the radeon kms Kconfig drm/radeon/kms: fix thermal sensor reading on juniper drm/radeon/kms: add missing case for cayman thermal sensor drm/radeon/kms: add blit support for cayman (v2) drm/radeon/kms/blit: workaround some hw issues on evergreen+ commit ecff4fcc7bbaf060646d2160123f8dc02605a047 Merge: 58a9a36 1c3cc11 Author: Linus Torvalds Date: Tue Jun 7 19:07:22 2011 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timers: Consider slack value in mod_timer() clockevents: Handle empty cpumask gracefully commit 58a9a36b5444cbd921cdfc8ddd344d9983cc2c7b Merge: 22b174f 74b5c5b Author: Linus Torvalds Date: Tue Jun 7 19:06:28 2011 -0700 Merge branch 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Initialize kvm before registering the mmu notifier KVM: x86: use proper port value when checking io instruction permission KVM: add missing void __user * cast to access_ok() call commit 22b174f8b7daf59f01b7b76e95c14edf41bf45fa Author: Grant Likely Date: Mon Jun 6 00:40:48 2011 -0600 MAINTAINERS: Saying goodbye to David Brownell We had to say goodbye when David passed away recently. David had a huge impact on our community, both personally in the lives of the people he worked with, and technically in the design and maintenance of several subsystems. He is greatly missed. He also leaves behind a number of much loved subsystems now orphaned. This patch updates the MAINTAINERS file for the areas that David was responsible for and adds an entry for him to the CREDITS file. Signed-off-by: Grant Likely Acked-by: Harry Wei Signed-off-by: Linus Torvalds commit 9c125d2af8f4d06ea62a4d8ff100af392a0a3a3b Merge: 4018237 1adffba Author: Linus Torvalds Date: Tue Jun 7 19:04:21 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6: fat: Fix corrupt inode flags when remove ATTR_SYS flag commit 40182373ac6cbbd10c6d08ba339947eea009d513 Author: David Howells Date: Mon Jun 6 15:47:23 2011 +0100 MN10300: Add missing _sdata declaration _sdata needs to be declared in the linker script now as of commit a2d063ac216c ("extable, core_kernel_data(): Make sure all archs define _sdata") Signed-off-by: David Howells Cc: Steven Rostedt Signed-off-by: Linus Torvalds commit db1c9dfa649f9bd8dc11415fbfe5cfe1e24c5b33 Author: David Howells Date: Mon Jun 6 15:47:14 2011 +0100 MN10300: die_if_no_fixup() shouldn't use get_user() as it doesn't call set_fs() die_if_no_fixup() shouldn't use get_user() as it doesn't call set_fs() to indicate that it wants to probe a kernel address. Instead it should use probe_kernel_read(). This fixes the problem of gdb seeing SIGILL rather than SIGTRAP when hitting the KGDB special breakpoint upon SysRq+g being seen. The problem was that die_if_no_fixup() was failing to read the opcode of the instruction that caused the exception, and thus not fixing up the exception. This caused gdb to get a S04 response to the $? request in its remote protocol rather than S05 - which would then cause it to continue with $C04 rather than $c in an attempt to pass the signal onto the inferior process. The kernel, however, does not support $Cnn, and so objects by returning an E22 response, indicating an error. gdb does not expect this and prints: warning: Remote failure reply: E22 and then returns to the gdb command prompt unable to continue. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 2e65d1f6eecc176ba1341541b5f41edd7eb4346a Author: David Howells Date: Mon Jun 6 15:47:05 2011 +0100 MN10300: Fix one of the kernel debugger cacheflush variants One of the kernel debugger cacheflush variants escaped proper testing. Two of the labels are wrong, being derived from the code that was copied to construct the variant. The first label results in the following assembler message: AS arch/mn10300/mm/cache-dbg-flush-by-reg.o arch/mn10300/mm/cache-dbg-flush-by-reg.S: Assembler messages: arch/mn10300/mm/cache-dbg-flush-by-reg.S:123: Error: symbol `debugger_local_cache_flushinv_no_dcache' is already defined And the second label results in the following linker message: arch/mn10300/mm/built-in.o:(.text+0x1d39): undefined reference to `mn10300_local_icache_inv_range_reg_end' arch/mn10300/mm/built-in.o:(.text+0x1d39): relocation truncated to fit: R_MN10300_PCREL16 against undefined symbol `mn10300_local_icache_inv_range_reg_end' To test this file the following configuration pieces must be set: CONFIG_AM34=y CONFIG_MN10300_CACHE_WBACK=y CONFIG_MN10300_DEBUGGER_CACHE_FLUSH_BY_REG=y CONFIG_MN10300_CACHE_MANAGE_BY_REG=y CONFIG_AM34_HAS_CACHE_SNOOP=n Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit aec040e29e804b40fa2934ec7a5be9f515f23098 Merge: 8ea656b 6c61cfe Author: Linus Torvalds Date: Tue Jun 7 18:47:53 2011 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] fix kvm defines for 31 bit compile [S390] use generic RCU page-table freeing code [S390] qdio: Split SBAL entry flags [S390] kvm-s390: fix stfle facilities numbers >=64 [S390] kvm-s390: Fix host crash on misbehaving guests commit 8ea656bdc9d3c39e18f2bd5d8ffe0301fde64f72 Merge: d205df9 1fcecf2 Author: Linus Torvalds Date: Tue Jun 7 18:46:37 2011 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (21 commits) ARM: OMAP4: MMC: increase delay for pbias arm: omap2plus: move NAND_BLOCK_SIZE out of boards omap4: hwmod: Enable the keypad omap3: Free Beagle rev gpios when they are read, so others can read them later arm: omap3: beagle: Ensure msecure is mux'd to be able to set the RTC omap: rx51: Don't power up speaker amplifier at bootup omap: rx51: Set regulator V28_A always on ARM: OMAP4: MMC: no regulator off during probe for eMMC arm: omap2plus: fix ads7846 pendown gpio request ARM: OMAP2: Add missing iounmap in omap4430_phy_init ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init ARM: omap2+: mux: Allow board mux settings to be NULL OMAP4: fix return value of omap4_l3_init OMAP: iovmm: fix SW flags passed by user arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del OMAP2+: mux: fix compilation warnings OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int' arm: omap3: cm-t3517: fix section mismatch warning OMAP2+: Fix 9 section mismatch(es) warnings from mach-omap2/built-in.o ARM: OMAP2: Add missing include of linux/gpio.h ... commit d205df9955feb9c2ae63ac1387804e225ff22605 Merge: 2421007 f90e5b5 Author: Linus Torvalds Date: Tue Jun 7 18:44:10 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Processes waiting on inode glock that no processes are holding commit 24210071e0dd7da1a945a2a1686b93f2b2f3b410 Merge: 8397345 a50d28de Author: Linus Torvalds Date: Tue Jun 7 18:41:26 2011 -0700 Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x: video: Fix use-after-free by vga16fb on rmmod video: Convert vmalloc/memset to vzalloc efifb: Disallow manual bind and unbind efifb: Fix mismatched request/release_mem_region efifb: Enable write-combining drivers/video/pxa168fb.c: add missing clk_put drivers/video/imxfb.c: add missing clk_put fbdev: bf537-lq035: add missing blacklight properties type savagefb: Use panel CVT mode as default fbdev: sh_mobile_lcdcfb: Fix up fallout from MERAM changes. commit 8397345172aa5cdcbc133977af9d525f45b874ea Merge: 59c5f46 e6bc45d Author: Linus Torvalds Date: Tue Jun 7 18:36:59 2011 -0700 Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: vfs: make unlink() and rmdir() return ENOENT in preference to EROFS lmLogOpen() broken failure exit usb: remove bad dput after dentry_unhash more conservative S_NOSEC handling commit e6bc45d65df8599fdbae73be9cec4ceed274db53 Author: Theodore Ts'o Date: Mon Jun 6 19:19:40 2011 -0400 vfs: make unlink() and rmdir() return ENOENT in preference to EROFS If user space attempts to remove a non-existent file or directory, and the file system is mounted read-only, return ENOENT instead of EROFS. Either error code is arguably valid/correct, but ENOENT is a more specific error message. Reported-by: Michael Tokarev Signed-off-by: "Theodore Ts'o" Signed-off-by: Al Viro commit 9054760ff585a7fa436599990b63a585ae89ff4d Author: Al Viro Date: Sun Jun 5 19:22:56 2011 +0100 lmLogOpen() broken failure exit Callers of lmLogOpen() expect it to return -E... on failure exits, which is what it returns, except for the case of blkdev_get_by_dev() failure. It that case lmLogOpen() return the error with the wrong sign... Signed-off-by: Al Viro Acked-by: Dave Kleikamp commit 6c6c54e1807faf116724451ef2bd14993780470a Author: Peter Zijlstra Date: Fri Jun 3 17:37:07 2011 +0200 sched: Fix/clarify set_task_cpu() locking rules Sergey reported a CONFIG_PROVE_RCU warning in push_rt_task where set_task_cpu() was called with both relevant rq->locks held, which should be sufficient for running tasks since holding its rq->lock will serialize against sched_move_task(). Update the comments and fix the task_group() lockdep test. Reported-and-tested-by: Sergey Senozhatsky Cc: Oleg Nesterov Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/1307115427.2353.3456.camel@twins Signed-off-by: Ingo Molnar commit f2513cde93f0957d5dc6c09bc24b0cccd27d8e1d Author: Peter Zijlstra Date: Mon Jun 6 12:32:43 2011 +0200 lockdep: Fix lock_is_held() on recursion The main lock_is_held() user is lockdep_assert_held(), avoid false assertions in lockdep_off() sections by unconditionally reporting the lock is taken. [ the reason this is important is a lockdep_assert_held() in ttwu() which triggers a warning under lockdep_off() as in printk() which can trigger another wakeup and lock up due to spinlock recursion, as reported and heroically debugged by Arne Jansen ] Reported-and-tested-by: Arne Jansen Signed-off-by: Peter Zijlstra Cc: Linus Torvalds Cc: Link: http://lkml.kernel.org/r/1307398759.2497.966.camel@laptop Signed-off-by: Ingo Molnar commit 26018874e3584f1658570d41d57d4c34f6a53aa0 Author: Joerg Roedel Date: Mon Jun 6 16:50:14 2011 +0200 x86/amd-iommu: Fix boot crash with hidden PCI devices Some PCIe cards ship with a PCI-PCIe bridge which is not visible as a PCI device in Linux. But the device-id of the bridge is present in the IOMMU tables which causes a boot crash in the IOMMU driver. This patch fixes by removing these cards from the IOMMU handling. This is a pure -stable fix, a real fix to handle this situation appriatly will follow for the next merge window. Cc: stable@kernel.org # > 2.6.32 Signed-off-by: Joerg Roedel commit dcc32b838b449aef8533f130cfad41b912bfb228 Merge: de52bca 4cff3ce Author: Dave Airlie Date: Tue Jun 7 10:07:09 2011 +1000 Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes * 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next: drm/nv40: fall back to paged dma object for the moment drm/nouveau: fix leak of gart mm node drm/nouveau: fix vram page mapping when crossing page table boundaries drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). drm/nouveau: don't create accel engine objects when noaccel=1 drm/nvc0: recognise 0xdX chipsets as NV_C0 commit de52bcab836e6ad21bb0c03c6030725044b2819e Merge: 59c5f46 6a574b5 Author: Dave Airlie Date: Tue Jun 7 09:54:04 2011 +1000 Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes * 'keithp/drm-intel-fixes' of /ssd/git/drm-next: drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007 drm/i915: Share the common force-audio property between connectors drm/i915: Remove unused enum "chip_family" drm/915: fix relaxed tiling on gen2: tile height drm/i915/crt: Explicitly return false if connected to a digital monitor drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0 drm/i915: Only print out the actual number of fences for i915_error_state drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/ drm: i915: correct return status in intel_hdmi_mode_valid() drm/i915: fix regression after clock gating init split drm/i915: fix if statement in ivybridge irq handler commit 4cff3ce5fe5c3c88f103d58c5e7855f9519960e4 Author: Ben Skeggs Date: Wed Jun 1 14:08:49 2011 +1000 drm/nv40: fall back to paged dma object for the moment PCI(E)GART isn't quite stable it seems, fall back to old method until I get the time to sort it out properly. Signed-off-by: Ben Skeggs commit 960bdba08e06a1f35fc2fe784aa293dee58abc68 Author: Ben Skeggs Date: Mon May 30 09:28:31 2011 +1000 drm/nouveau: fix leak of gart mm node Signed-off-by: Ben Skeggs commit 73c337e70e75bb94dcb21459dd06afad0746634c Author: Ben Skeggs Date: Sat May 28 02:12:04 2011 +1000 drm/nouveau: fix vram page mapping when crossing page table boundaries Hopefully the cause of nvc0 "page jumping" issue. Signed-off-by: Ben Skeggs commit c1003d9c90f410777ab57f675b2a575c9c7ab5d7 Author: Francisco Jerez Date: Tue May 24 15:57:14 2011 +0200 drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). Reported-by: Mario Bachmann Tested-by: Greg Turner Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 18b54c4d5893f32641d4961563c0f196cc04dc83 Author: Ben Skeggs Date: Wed May 25 15:22:33 2011 +1000 drm/nouveau: don't create accel engine objects when noaccel=1 Fixes various potential oopses. Signed-off-by: Ben Skeggs commit cdf81a235f11c8a55023c6b181d21d519a8a5967 Author: Ben Skeggs Date: Wed May 25 14:39:52 2011 +1000 drm/nvc0: recognise 0xdX chipsets as NV_C0 Should hopefully get modesetting at least from this, it appears these are GF119 chipsets. Accel will come eventually, once I order a board. Signed-off-by: Ben Skeggs commit 27c2127a15d340706c0aa84e311188a14468d841 Author: Joerg Roedel Date: Mon May 30 15:56:24 2011 +0200 x86/amd-iommu: Use only per-device dma_ops Unfortunatly there are systems where the AMD IOMMU does not cover all devices. This breaks with the current driver as it initializes the global dma_ops variable. This patch limits the AMD IOMMU to the devices listed in the IVRS table fixing DMA for devices not covered by the IOMMU. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit 0de66d5b35ee148455e268b2782873204ffdef4b Author: Joerg Roedel Date: Mon Jun 6 16:04:02 2011 +0200 x86/amd-iommu: Fix 3 possible endless loops The driver contains several loops counting on an u16 value where the exit-condition is checked against variables that can have values up to 0xffff. In this case the loops will never exit. This patch fixed 3 such loops. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit 6c61cfe91be53b444abc1da2dbab14efa77706c0 Author: Martin Schwidefsky Date: Mon Jun 6 14:14:42 2011 +0200 [S390] fix kvm defines for 31 bit compile KVM is not available for 31 bit but the KVM defines cause warnings: arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_dirty': arch/s390/include/asm/pgtable.h:817: warning: integer constant is too large for 'unsigned long' type arch/s390/include/asm/pgtable.h:818: warning: integer constant is too large for 'unsigned long' type arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_young': arch/s390/include/asm/pgtable.h:837: warning: integer constant is too large for 'unsigned long' type arch/s390/include/asm/pgtable.h:838: warning: integer constant is too large for 'unsigned long' type Add 31 bit versions of the KVM defines to remove the warnings. Signed-off-by: Martin Schwidefsky commit 36409f6353fc2d7b6516e631415f938eadd92ffa Author: Martin Schwidefsky Date: Mon Jun 6 14:14:41 2011 +0200 [S390] use generic RCU page-table freeing code Replace the s390 specific rcu page-table freeing code with the generic variant. This requires to duplicate the definition for the struct mmu_table_batch as s390 does not use the generic tlb flush code. While we are at it remove the restriction that page table fragments can not be reused after a single fragment has been freed with rcu and split out allocation and freeing of page tables with pgstes. Signed-off-by: Martin Schwidefsky commit 3ec90878bade9280dee87c9e27d759f1cee07e70 Author: Jan Glauber Date: Mon Jun 6 14:14:40 2011 +0200 [S390] qdio: Split SBAL entry flags The qdio SBAL entry flag is made-up of four different values that are independent of one another. Some of the bits are reserved by the hardware and should not be changed by qdio. Currently all four values are overwritten since the SBAL entry flag is defined as an u32. Split the SBAL entry flag into four u8's as defined by the hardware and don't touch the reserved bits. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 9950f8be3f379e36be73be958ec5cf6c15eac0b2 Author: Christian Borntraeger Date: Mon Jun 6 14:14:39 2011 +0200 [S390] kvm-s390: fix stfle facilities numbers >=64 Currently KVM masks out the known good facilities only for the first double word, but passed the 2nd double word without filtering. This breaks some code on newer systems: [ 0.593966] ------------[ cut here ]------------ [ 0.594086] WARNING: at arch/s390/oprofile/hwsampler.c:696 [ 0.594213] Modules linked in: [ 0.594321] Modules linked in: [ 0.594439] CPU: 0 Not tainted 3.0.0-rc1 #46 [ 0.594564] Process swapper (pid: 1, task: 00000001effa8038, ksp: 00000001effafab8) [ 0.594735] Krnl PSW : 0704100180000000 00000000004ab89a (hwsampler_setup+0x75a/0x7b8) [ 0.594910] R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:1 PM:0 EA:3 [ 0.595120] Krnl GPRS: ffffffff00000000 00000000ffffffea ffffffffffffffea 00000000004a98f8 [ 0.595351] 00000000004aa002 0000000000000001 000000000080e720 000000000088b9f8 [ 0.595522] 000000000080d3e8 0000000000000000 0000000000000000 000000000080e464 [ 0.595725] 0000000000000000 00000000005db198 00000000004ab3a2 00000001effafd98 [ 0.595901] Krnl Code: 00000000004ab88c: c0e5000673ca brasl %r14,57a020 [ 0.596071] 00000000004ab892: a7f4fc77 brc 15,4ab180 [ 0.596276] 00000000004ab896: a7f40001 brc 15,4ab898 [ 0.596454] >00000000004ab89a: a7c8ffa1 lhi %r12,-95 [ 0.596657] 00000000004ab89e: a7f4fc71 brc 15,4ab180 [ 0.596854] 00000000004ab8a2: a7f40001 brc 15,4ab8a4 [ 0.597029] 00000000004ab8a6: a7f4ff22 brc 15,4ab6ea [ 0.597230] 00000000004ab8aa: c0200011009a larl %r2,6cb9de [ 0.597441] Call Trace: [ 0.597511] ([<00000000004ab3a2>] hwsampler_setup+0x262/0x7b8) [ 0.597676] [<0000000000875812>] oprofile_arch_init+0x32/0xd0 [ 0.597834] [<0000000000875788>] oprofile_init+0x28/0x74 [ 0.597991] [<00000000001001be>] do_one_initcall+0x3a/0x170 [ 0.598151] [<000000000084fa22>] kernel_init+0x142/0x1ec [ 0.598314] [<000000000057db16>] kernel_thread_starter+0x6/0xc [ 0.598468] [<000000000057db10>] kernel_thread_starter+0x0/0xc [ 0.598606] Last Breaking-Event-Address: [ 0.598707] [<00000000004ab896>] hwsampler_setup+0x756/0x7b8 [ 0.598863] ---[ end trace ce3179037f4e3e5b ]--- So lets also mask the 2nd double word. Facilites 66,76,76,77 should be fine. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit a578b37cc2e719447810343089a7cb93efc3812f Author: Christian Borntraeger Date: Mon Jun 6 14:14:38 2011 +0200 [S390] kvm-s390: Fix host crash on misbehaving guests commit 9ff4cfb3fcfd48b49fdd9be7381b3be340853aa4 ([S390] kvm-390: Let kernel exit SIE instruction on work) fixed a problem of commit commit cd3b70f5d4d82f85d1e1d6e822f38ae098cf7c72 ([S390] virtualization aware cpu measurement) but uncovered another one. If a kvm guest accesses guest real memory that doesnt exist, the page fault handler calls the sie hook, which then rewrites the return psw from sie_inst to either sie_exit or sie_reenter. On return, the page fault handler will then detect the wrong access as a kernel fault causing a kernel oops in sie_reenter or sie_exit. We have to add these two addresses to the exception table to allow graceful exits. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit a50d28de8d5085e0f34f96088a45cc156d022021 Author: Bruno Prémont Date: Tue May 24 19:59:17 2011 +0000 video: Fix use-after-free by vga16fb on rmmod Since fb_info is now refcounted and thus may get freed at any time it gets unregistered module unloading will try to unregister framebuffer as stored in platform data on probe though this pointer may be stale. Cleanup platform data on framebuffer release. CC: stable@kernel.org Signed-off-by: Bruno Prémont Signed-off-by: Paul Mundt commit 74b5c5bfff429f464c38dd49af41d75cf0e7dc26 Author: Mike Waychison Date: Fri Jun 3 13:04:53 2011 -0700 KVM: Initialize kvm before registering the mmu notifier It doesn't make sense to ever see a half-initialized kvm structure on mmu notifier callbacks. Previously, 85722cda changed the ordering to ensure that the mmu_lock was initialized before mmu notifier registration, but there is still a race where the mmu notifier could come in and try accessing other portions of struct kvm before they are intialized. Solve this by moving the mmu notifier registration to occur after the structure is completely initialized. Google-Bug-Id: 452199 Signed-off-by: Mike Waychison Signed-off-by: Avi Kivity commit 221192bdff2583834984639121595fc9296120d3 Author: Marcelo Tosatti Date: Mon May 30 15:23:14 2011 -0300 KVM: x86: use proper port value when checking io instruction permission Commit f6511935f42 moved the permission check for io instructions to the ->check_perm callback. It failed to copy the port value from RDX register for string and "in,out ax,dx" instructions. Fix it by reading RDX register at decode stage when appropriate. Fixes FC8.32 installation. Signed-off-by: Marcelo Tosatti commit f3aeceac61b6e2f3167717ea1793472108e47564 Author: Alex Deucher Date: Fri Jun 3 16:39:06 2011 -0400 drm/radeon/kms/atom: fix PHY init The PHY was not initialized correctly after ac89af1e1010640db072416c786f97391b85790f since the function bailed early as an encoder was not assigned. The encoder isn't necessary for PHY init so just assign to 0 for init so that the table is executed. Reported-by: Ari Savolainen Tested-by: Ari Savolainen Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6a574b5b9b186e28abd3e571dfd1700c5220b510 Author: Hans de Goede Date: Sat Jun 4 15:39:21 2011 +0200 drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007 I found this while figuring out why gnome-shell would not run on my Asus EeeBox PC EB1007. As a standalone "pc" this device cleary does not have an internal panel, yet it claims it does. Add a quirk to fix this. Signed-off-by: Hans de Goede Reviewed-by: Keith Packard cc: stable@kernel.org Signed-off-by: Keith Packard commit 3f43c48d333777e815ae68d66396cb6dfbc2dd79 Author: Chris Wilson Date: Thu May 12 22:17:24 2011 +0100 drm/i915: Share the common force-audio property between connectors Make the audio property creation routine common and share the single property between the connectors. Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 4bce2da393dbbc6650a1d62683ef60e03594b4c7 Author: Chris Wilson Date: Thu May 12 22:17:21 2011 +0100 drm/i915: Remove unused enum "chip_family" Superseded by the tracking the render generation in the chipset capabiltiies struct. Signed-off-by: Chris Wilson Signed-off-by: Keith Packard commit c8ebc2b076ad9e1833cb4f7f1a6f30b4786a2a09 Author: Daniel Vetter Date: Thu May 12 22:17:20 2011 +0100 drm/915: fix relaxed tiling on gen2: tile height A tile on gen2 has a size of 2kb, stride of 128 bytes and 16 rows. Userspace was broken and assumed 8 rows. Chris Wilson noted that the kernel unfortunately can't reliable check that because libdrm rounds up the size to the next bucket. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson Signed-off-by: Keith Packard commit d3bcb75776a10ee4b67afe6156fd927b9da77d03 Author: Chris Wilson Date: Thu May 12 22:17:15 2011 +0100 drm/i915/crt: Explicitly return false if connected to a digital monitor Rather than proceed on and silently return false by default, mention why we rejected the presence of an EDID as implying the presence of a VGA monitor. (The question arises whether there is a broken EDID which falsely reports a digital connection when attached by VGA.) Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 9f405100f2b39be7759eea3f4cf910869727429c Author: Chris Wilson Date: Thu May 12 22:17:14 2011 +0100 drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0 The computation of the first-level watermarks for g4x and gen5+ are based on the same algorithm, so we can refactor those code paths to use a single function. Note that g4x_compute_wm0 takes a 'plane' argument while ironlake_compute_wm0 took a 'pipe' argument. Both should have used a 'plane' argument, so this patch fixes that as well (not that it caused a problem; ironlake always uses pipe == plane). Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit bf3301abba31ee71ed8dc87f18fcaebd27dc3b3e Author: Daniel Vetter Date: Thu May 12 22:17:12 2011 +0100 drm/i915: Only print out the actual number of fences for i915_error_state Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit c8cbbb8ba9f9f6d2d63513a715700127598e7f86 Author: Chris Wilson Date: Thu May 12 22:17:11 2011 +0100 drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/ Convert our open coded offset_in_page() to the common macro. Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 5cbba41d2857477bd9a008f2d82c0622db1a8dee Author: Nicolas Kaiser Date: Mon May 30 12:48:26 2011 +0200 drm: i915: correct return status in intel_hdmi_mode_valid() Signed-off-by: Nicolas Kaiser Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 95e0ee92d3a605de75a633dd2360700595d5a8ad Author: Jason Stubbs Date: Sat May 28 14:26:48 2011 +1000 drm/i915: fix regression after clock gating init split During the refactoring in revision 6067aaeadb5b3df26f27ac827256b1ef01e674f5, the intel_enable_clock_gating was split up into several functions that are then called indirectly. However, which function to call was not specified for the IS_PINEVIEW() case. This patch specifies the correct gating function. Signed-off-by: Jason Stubbs Reviewed-by: Jesse Barnes Signed-off-by: Keith Packard commit f6b07f45e2df42d63a0292dcd13aaaa18d6c01f7 Author: Dan Carpenter Date: Wed May 25 12:56:56 2011 +0300 drm/i915: fix if statement in ivybridge irq handler The extra semicolon was not intended. Signed-off-by: Dan Carpenter Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 3ece48a746088be3dd75904e8d9bb9b49af0aa95 Author: Sage Weil Date: Tue May 31 09:11:11 2011 -0700 usb: remove bad dput after dentry_unhash Commit 64252c75a removed the useless dget from dentry_unhash but didn't fix up this caller in the usb code. There used to be exactly one dput per dentry_unhash call; now there are none. Tested-by: Sebastian Andrzej Siewior Signed-off-by: Sage Weil Signed-off-by: Al Viro commit 9e1f1de02c2275d7172e18dc4e7c2065777611bf Author: Al Viro Date: Fri Jun 3 18:24:58 2011 -0400 more conservative S_NOSEC handling Caching "we have already removed suid/caps" was overenthusiastic as merged. On network filesystems we might have had suid/caps set on another client, silently picked by this client on revalidate, all of that *without* clearing the S_NOSEC flag. AFAICS, the only reasonably sane way to deal with that is * new superblock flag; unless set, S_NOSEC is not going to be set. * local block filesystems set it in their ->mount() (more accurately, mount_bdev() does, so does btrfs ->mount(), users of mount_bdev() other than local block ones clear it) * if any network filesystem (or a cluster one) wants to use S_NOSEC, it'll need to set MS_NOSEC in sb->s_flags *AND* take care to clear S_NOSEC when inode attribute changes are picked from other clients. It's not an earth-shattering hole (anybody that can set suid on another client will almost certainly be able to write to the file before doing that anyway), but it's a bug that needs fixing. Signed-off-by: Al Viro commit 1c3cc11602111d1318c2a5743bd2e88c82813927 Author: Sebastian Andrzej Siewior Date: Sat May 21 12:58:28 2011 +0200 timers: Consider slack value in mod_timer() There is an optimization which does not update the timer if the timer was pending and the expiration time was unchanged. Since commit 3bbb9ec9 ("timers: Introduce the concept of timer slack for legacy timers") this optimization is no longer applied for timers where the expiration time got extended due to the slack value. So we need to check again after the expiration time might have been updated. [ tglx: Made it a single check by applying slack first and sorting out the slack = 0 value (all timeouts < 256 jiffies) early ] Signed-off-by: Sebastian Andrzej Siewior Link: http://lkml.kernel.org/r/20110521105828.GA29442@Chamillionaire.breakpoint.cc Signed-off-by: Thomas Gleixner commit c5182b8867e189e14a8df5dbfcba1c73f286e061 Author: Mark Brown Date: Thu Jun 2 18:55:13 2011 +0100 genirq: Ensure we locate the passed IRQ in irq_alloc_descs() When irq_alloc_descs() is called with no base IRQ specified then it will search for a range of IRQs starting from a specified base address. In the case where an IRQ is specified it still does this search in order to ensure that none of the requested range is already allocated and it still uses the from parameter to specify the base for the search. This means that in the case where a base is specified but from is zero (which is reasonable as any IRQ number is in the range specified by a zero from) the function will get confused and try to allocate the first suitably sized block of free IRQs it finds. Instead use a specified IRQ as the base address for the search, and insist that any from that is specified can support that IRQ. Signed-off-by: Mark Brown Link: http://lkml.kernel.org/r/1307037313-15733-1-git-send-email-broonie@opensource.wolfsonmicro.com Signed-off-by: Thomas Gleixner commit e7fbad300a7a6432238f086e3c9a61538a905858 Author: Linus Walleij Date: Tue May 31 18:14:39 2011 +0200 genirq: Fix descriptor init on non-sparse IRQs The genirq changes are initializing descriptors for sparse IRQs quite differently from how non-sparse (stacked?) IRQs are initialized, with the effect that on my platform all IRQs are default-disabled on sparse IRQs and default-enabled if non-sparse IRQs are used, crashing some GPIO driver. Fix this by refactoring the non-sparse IRQs to use the same descriptor init function as the sparse IRQs. Signed-off: Linus Walleij Link: http://lkml.kernel.org/r/1306858479-16622-1-git-send-email-linus.walleij@stericsson.com Cc: stable@kernel.org # 2.6.39 Signed-off-by: Thomas Gleixner commit 3a43e05f4d0600e906fa09f4a65d749288c44592 Author: Sebastian Andrzej Siewior Date: Tue May 31 08:56:11 2011 +0200 irq: Handle spurios irq detection for threaded irqs The detection of spurios interrupts is currently limited to first level handler. In force-threaded mode we never notice if the threaded irq does not feel responsible. This patch catches the return value of the threaded handler and forwards it to the spurious detector. If the primary handler returns only IRQ_WAKE_THREAD then the spourious detector ignores it because it gets called again from the threaded handler. [ tglx: Report the erroneous return value early and bail out ] Signed-off-by: Sebastian Andrzej Siewior Link: http://lkml.kernel.org/r/1306824972-27067-2-git-send-email-sebastian@breakpoint.cc Signed-off-by: Thomas Gleixner commit ef26f20cd117eb3c185038ed7cbf7b235575751d Author: Sebastian Andrzej Siewior Date: Tue May 31 08:56:10 2011 +0200 genirq: Print threaded handler in spurious debug output In forced threaded mode (or with an explicit threaded handler) we only see the primary handler, but not the threaded handler. Signed-off-by: Sebastian Andrzej Siewior Link: http://lkml.kernel.org/r/1306824972-27067-1-git-send-email-sebastian@breakpoint.cc Signed-off-by: Thomas Gleixner commit 1b054b67d3bfc6dca9f634c104780f3f24ff3eec Author: Thomas Gleixner Date: Fri Jun 3 11:13:33 2011 +0200 clockevents: Handle empty cpumask gracefully For UP it's stupid to request an initialized cpumask for the clock event devices. Though we need the mask set even on UP to avoid a horrible ifdeffery especially in the broadcast code. For SMP we can at least try to survive with a warning and set the cpumask of the cpu we're running on. That gives a decent chance to bring the machine up and retrieve the debug info. Signed-off-by: Thomas Gleixner Cc: Linus Walleij Cc: Russell King - ARM Linux Cc: Stephen Boyd commit 1b86d775dd4c13967e1895df09d0cef198956e81 Author: Joe Perches Date: Sat May 28 11:13:33 2011 -0700 video: Convert vmalloc/memset to vzalloc Signed-off-by: Joe Perches Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Paul Mundt commit bb8b26627267a82c49f47fc52a0785f079a7b063 Author: Andy Lutomirski Date: Thu May 26 10:13:34 2011 -0400 efifb: Disallow manual bind and unbind Both were buggy: bind would happily scribble over a real graphics device and unbind wouldn't destroy the framebuffer. Hotplugging efifb makes no sense anyway, so just disable it. As an added benefit, we save some runtime memory. Signed-off-by: Andy Lutomirski Signed-off-by: Peter Jones Signed-off-by: Paul Mundt commit da0241f12bf785f74e57ad6d67abdf269216f76b Author: Andy Lutomirski Date: Thu May 26 10:13:32 2011 -0400 efifb: Fix mismatched request/release_mem_region Signed-off-by: Andy Lutomirski Signed-off-by: Peter Jones Signed-off-by: Paul Mundt commit 3c004b4f7eab239e726c6dde0f6cfca46a96956b Author: Andy Lutomirski Date: Thu May 26 10:13:31 2011 -0400 efifb: Enable write-combining Running fbcon on an uncached framebuffer is remarkably slow. So try to enable write combining in efifb. Without this patch, it takes 5.8 seconds from efifb probe to i915 probe (default options; no plymouth or quiet mode). With this patch, it only takes 1.7 seconds. That means we wasted over 4 seconds just writing to UC memory. Signed-off-by: Andy Lutomirski Signed-off-by: Peter Jones Signed-off-by: Paul Mundt commit 0057f1809d44b26765ec2374e0107a2f8ab256f5 Author: Julia Lawall Date: Wed Jun 1 17:10:13 2011 +0000 drivers/video/pxa168fb.c: add missing clk_put Add a label for error-handling code in the case where only clk_get has succeeded. Rename the label failed to be consistent with the rest. A simplified version of the semantic match that finds the missing clk_put is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // Signed-off-by: Julia Lawall Signed-off-by: Paul Mundt commit 609d3bbf044a6766f6505d8a29d4ed48020c014c Author: Julia Lawall Date: Wed Jun 1 17:10:11 2011 +0000 drivers/video/imxfb.c: add missing clk_put Reorder the labels at the end of the function to correspond to the order in which the resources are allocated. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // Signed-off-by: Julia Lawall Acked-by: Sascha Hauer Signed-off-by: Paul Mundt commit 70f289db31502ac030049450e63d380f3bc30cd2 Author: Steven Miao Date: Mon May 30 03:23:36 2011 +0000 fbdev: bf537-lq035: add missing blacklight properties type Seems this new field was missed, probably due to this driver being merged around the time this new backlight field was being added. At any rate, initial the type field to avoid ugly WARN() dumps. Signed-off-by: Steven Miao Signed-off-by: Mike Frysinger Signed-off-by: Paul Mundt commit 1bae852fb0beca3cc95b8de84efbc7254cae62e1 Author: Tormod Volden Date: Sat May 28 15:06:11 2011 +0000 savagefb: Use panel CVT mode as default If there is no EDID but an LCD panel is detected, generate a CVT mode from the panel resolution (at 60 Hz), and use this as a default mode instead of the hardcoded 800x600x8 mode. Signed-off-by: Tormod Volden Signed-off-by: Paul Mundt commit 554cc1028603587e28ae49e9594b1508df5f29aa Author: Paul Mundt Date: Thu May 26 15:01:22 2011 +0900 fbdev: sh_mobile_lcdcfb: Fix up fallout from MERAM changes. The LCDC driver does no longer compile: CC drivers/video/sh_mobile_meram.o CC drivers/video/sh_mobile_lcdcfb.o drivers/video/sh_mobile_lcdcfb.c: In function 'sh_mobile_lcdc_start': drivers/video/sh_mobile_lcdcfb.c:640:4: error: 'ret' undeclared (first use in this function) drivers/video/sh_mobile_lcdcfb.c:640:4: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [drivers/video/sh_mobile_lcdcfb.o] Error 1 make[1]: *** [drivers/video] Error 2 make: *** [drivers] Error 2 Reported-by: Magnus Damm Signed-off-by: Paul Mundt commit fe6f0bd03d697835e76dd18d232ba476c65b8282 Author: Marek Olšák Date: Sat May 7 01:09:57 2011 +0200 drm/radeon/kms: add missing Evergreen texture formats to the CS parser BC6 and BC7 are described in ARB_texture_compression_bptc. No idea what FMT_32_AS_32_32_32_32 is good for. Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie commit adcfde516e10aad72d66f6fefd36e6d0e6bd7be7 Author: Alex Deucher Date: Fri May 27 10:05:03 2011 -0400 drm/radeon/kms: viewport height has to be even Otherwise, no vblank interrupts. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=37522 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 8a5617bdc111aa7ba49c81fa694fde63d3474f94 Author: Alex Deucher Date: Thu May 26 14:20:38 2011 -0400 drm/radeon/kms: remove duplicate reg from r600 safe regs It got added twice by accident. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d5c5a72f2a5821ba3ebdbe02bce03345790458aa Author: Alex Deucher Date: Tue May 31 15:42:48 2011 -0400 drm/radeon/kms: add support for Llano Fusion APUs - add gpu init support - add blit support - add ucode loader Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3b68a26ec058fda2d6b470cdd8fedc5a3c854916 Author: Alex Deucher Date: Tue May 31 15:42:49 2011 -0400 drm/radeon/kms: add llano pci ids Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 89da5a375ad797ad5e38ad7a9ec64ea40afe8c7a Author: Alex Deucher Date: Tue May 31 15:42:47 2011 -0400 drm/radeon/kms: fill in asic struct for llano Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 4df64e65025dfa493bf75fddf50d83bba069e1eb Author: Alex Deucher Date: Tue May 31 15:42:46 2011 -0400 drm/radeon/kms: add family ids for llano APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 498c555f56a02ec1059bc150cde84411ba0ac010 Author: Dave Airlie Date: Sun May 29 17:48:32 2011 +1000 drm/radeon: fix oops in ttm reserve when pageflipping (v2) We need to take a reference to this object, pinning doesn't take a reference so if userspace deletes the object it can disappear even if pinned. v2: fix error paths to unreference properly also. should fix: https://bugzilla.kernel.org/show_bug.cgi?id=32402 and https://bugzilla.redhat.com/show_bug.cgi?id=680651 Acked-By: Alex Deucher Signed-off-by: Dave Airlie commit 1fcecf281b99f9ca262ae7fbc3703c421be5c857 Author: Balaji T K Date: Wed Jun 1 16:45:22 2011 +0530 ARM: OMAP4: MMC: increase delay for pbias 4 micro seconds is not enough for PBIAS if MMC regulator is enabled from MMC regulator OFF. Increase the delay for PBIAS to stabilize. Wait for PBIAS and timeout if not. Resolves MMC/SD failure on OMAP4 "Pbias Voltage is not same as LDO" Signed-off-by: Balaji T K Acked-by: Kishore Kadiyala Signed-off-by: Tony Lindgren commit 1704bf15deb6de20f8f4272c8d8232b36bbc7484 Author: Igor Grinberg Date: Mon May 30 00:11:45 2011 -0700 arm: omap2plus: move NAND_BLOCK_SIZE out of boards Several boards defining mtd partitions also defined NAND_BLOCK_SIZE as SZ_128K. Move the define to common-board-devices.h This removes multiple defines of NAND_BLOCK_SIZE. Signed-off-by: Igor Grinberg [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren commit 4998b245732572b027eef6b7221d80da0a3486e9 Author: Shubhrajyoti D Date: Wed May 4 14:57:44 2011 -0700 omap4: hwmod: Enable the keypad Commit 407a6888f7362cb3dabe69ea6d9dcf3c750dc56a (OMAP4: hwmod data: Add AESS, McPDM, bandgap, counter_32k, MMC, KBD, ISS & IPU) added the entry for keypad, but did not enable it. Enable the keypad in the hwmod database so it works. Signed-off-by: Shubhrajyoti D Acked-by: Benoit Cousson [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren commit 5e2ffc308a3aa44a318452fccae7b23a029eeeb8 Author: Tasslehoff Kjappfot Date: Tue May 31 04:58:56 2011 -0700 omap3: Free Beagle rev gpios when they are read, so others can read them later Free Beagle rev gpios when they are read, so others can read them later Signed-off-by: Tasslehoff Kjappfot [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren commit e2a346a2a054f702fd76f328ff747b9ad9264a4c Author: Alexander Holler Date: Tue Apr 5 15:40:08 2011 +0200 arm: omap3: beagle: Ensure msecure is mux'd to be able to set the RTC Without msecure beeing high it isn't possible to set (or start) the RTC. Tested with a BeagleBoard C4. Signed-off-by: Alexander Holler Signed-off-by: Tony Lindgren commit c0ad4fac5011c5534c45011ee8dee2b3de256663 Author: Jarkko Nikula Date: Tue May 31 11:27:01 2011 +0300 omap: rx51: Don't power up speaker amplifier at bootup Speaker amplifier is accidentally powered up in early TWL gpio setup. This causes a few mA of needless battery current consumption. Without this patch the amplifier can be shutdown only by having one active audio playback and shutdown cycle to speaker output. Thanks to Kalle Jokiniemi for noticing the issue. Signed-off-by: Jarkko Nikula Cc: Kalle Jokiniemi Signed-off-by: Tony Lindgren commit 2827411e25d7da7913463474606fe624404b2339 Author: Jarkko Nikula Date: Tue May 31 11:27:00 2011 +0300 omap: rx51: Set regulator V28_A always on The V28_A domain in Nokia N900 that supplies VDD voltages to TLV320AIC34 and TPA6130A2 should not be shutdown. This is because otherwise there will be leak from VIO to VDD in TLV320AIC34 and this leak consumes more battery current that is saved from keeping V28_A off. With this patch the battery current consumption is approximately 1.5 mA lower. Thanks to Kalle Jokiniemi for noticing the issue. Signed-off-by: Jarkko Nikula Cc: Kalle Jokiniemi Signed-off-by: Tony Lindgren commit b1c1df7a7d50bf94de89704e963467bc94b1fef9 Author: Balaji T K Date: Mon May 30 19:55:34 2011 +0530 ARM: OMAP4: MMC: no regulator off during probe for eMMC eMMC does not handle power off when not in sleep state, Skip regulator disable during probe when eMMC is not in known state - state left by bootloader. Resolves eMMC failure on OMAP4 mmc0: error -110 whilst initialising MMC card Signed-off-by: Balaji T K Tested-by: Kishore Kadiyala Acked-by: Kishore Kadiyala Signed-off-by: Tony Lindgren commit e68273baf30390e9c907831b47384085c7f664d5 Author: Igor Grinberg Date: Wed May 4 18:04:55 2011 +0300 arm: omap2plus: fix ads7846 pendown gpio request introduced by: 96974a24 (omap: consolidate touch screen initialization among different boards) ads7846 driver can use either gpio_pendown or get_pendown_state() callback. In case of gpio_pendown, it requests the provided gpio_pendown thus resulting in double requesting that gpio: ads7846 spi1.0: failed to request pendown GPIO57 ads7846: probe of spi1.0 failed with error -16 Fix this by restricting the gpio request to the case of get_pendown_state() callback is used. Signed-off-by: Igor Grinberg Tested-by: Thomas Weber Signed-off-by: Tony Lindgren commit 03b562d7859c6d7c640f071b422d521146471d6d Author: Todd Poynor Date: Thu May 26 12:25:53 2011 -0700 ARM: OMAP2: Add missing iounmap in omap4430_phy_init !dev case needs iounmap before return. Signed-off-by: Todd Poynor Signed-off-by: Tony Lindgren commit 21a42c92750446008dc0847a78aba5459e3b6b5a Author: Colin Cross Date: Wed May 4 14:57:57 2011 -0700 ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init OMAP4 contains two separate instances of the padconf registers, one in the core system config and one in the wakeup system config. Pass in two tables to apply the correct values to each instance. Signed-off-by: Colin Cross Signed-off-by: Tony Lindgren commit d4ff6121b44081601206980cafcd6ed3ecb367b6 Author: Colin Cross Date: Tue May 31 12:00:09 2011 -0700 ARM: omap2+: mux: Allow board mux settings to be NULL OMAP4 has two mux instances, and the board may not have settings for one of them. Allow the board file to pass NULL for an instance's mux settings, which will initialize the mux instance but skip writing board settings. Signed-off-by: Colin Cross Signed-off-by: Tony Lindgren commit 1499f2dbafafe844e485ff8945f60cd9f3d5cbd9 Author: Rabin Vincent Date: Sat May 7 22:28:47 2011 +0530 OMAP4: fix return value of omap4_l3_init Don't PTR_ERR() a non-error pointer: initcall omap4_l3_init+0x0/0xdc returned -544980480 after 0 usecs initcall omap4_l3_init+0x0/0xdc returned with error code -544980480 Signed-off-by: Rabin Vincent Signed-off-by: Tony Lindgren commit 50b4860d577b4bef76c71ad38ef83b9f368283c2 Author: Omar Ramirez Luna Date: Fri Mar 25 14:04:31 2011 -0600 OMAP: iovmm: fix SW flags passed by user Commit d038aee24dcd5a2a0d8547f5396f67ae9698ac8e "omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag", changes iovmm to receive flags specified by user, however the upper 16 bits of the flags are wiped by iovmm itself. This fixes IOVMF_DA_FIXED flags from being lost, and lets the user map its desired "device addresses". Signed-off-by: Omar Ramirez Luna Acked-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit 77f7059a329fc8a514bbcc2f204aaa7c150e8046 Author: Julia Lawall Date: Fri May 13 18:46:10 2011 +0200 arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del Platform_device_del should be called before platform_device_put, as platform_device_put can delete the structure. Additionally, improve the error handling code for the call to ioremap, so that it calls platform_device_put. The semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @@ expression e1,e2; @@ *platform_device_put(e1); ... when != e1 = e2 *platform_device_del(e1); // Signed-off-by: Julia Lawall Signed-off-by: Tony Lindgren commit 30ebad9d756a0b2c97c6c4ca6c5e6b799e3b64da Author: Govindraj.R Date: Wed Jun 1 11:28:56 2011 +0530 OMAP2+: mux: fix compilation warnings Fix below compilation warnings. arch/arm/mach-omap2/omap_hwmod.c: In function 'omap_hwmod_for_each': arch/arm/mach-omap2/omap_hwmod.c:1631: warning: 'ret' may be used uninitialized in this function arch/arm/mach-omap2/mux.c: In function 'omap_mux_get_gpio': arch/arm/mach-omap2/mux.c:917: warning: 'm' may be used uninitialized in this function Signed-off-by: Govindraj.R Signed-off-by: Tony Lindgren commit 26a510ba12448d3af26951376eae202bee8cdf65 Author: Santosh Shilimkar Date: Mon Apr 4 14:20:08 2011 +0530 OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int' Fix below build warning. CC arch/arm/plat-omap/sram.o arch/arm/plat-omap/sram.c: In function 'omap_map_sram': arch/arm/plat-omap/sram.c:224: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'unsigned int' While at this, convert SRAM printk(* "") to pr_*(""). Signed-off-by: Santosh Shilimkar Acked-by: Russell King Signed-off-by: Tony Lindgren commit 026fe79d75c3a7a257ca72250f46b472835784c9 Author: Igor Grinberg Date: Mon May 30 00:11:45 2011 -0700 arm: omap3: cm-t3517: fix section mismatch warning WARNING: arch/arm/mach-omap2/built-in.o(.text+0x11014): Section mismatch in reference from the function cm_t3517_init_usbh() to the (unknown reference) .init.data:(unknown) The function cm_t3517_init_usbh() references the (unknown reference) __initdata (unknown). This is often because cm_t3517_init_usbh lacks a __initdata annotation or the annotation of (unknown) is wrong. Signed-off-by: Igor Grinberg Signed-off-by: Tony Lindgren commit 89c4705ed58a9e6faa7649eb561aead79bb77b3f Author: Santosh Shilimkar Date: Mon May 30 00:11:45 2011 -0700 OMAP2+: Fix 9 section mismatch(es) warnings from mach-omap2/built-in.o The serial*_data should have been marked as __initdata as per it's usage in the board files. Fix the same to remove the section mismatch warnings caused by it. Signed-off-by: Santosh Shilimkar Signed-off-by: Silesh C V [tony@atomide.com: updated with additional fixes from Silesh] Signed-off-by: Tony Lindgren commit f9fa1bb9d7a3c9537d6abd4ad47c58fe27862625 Author: Axel Lin Date: Tue May 31 20:55:44 2011 +0800 ARM: OMAP2: Add missing include of linux/gpio.h I got some build error like below while executing "make omap2plus_defconfig". CC arch/arm/mach-omap2/board-2430sdp.o arch/arm/mach-omap2/board-2430sdp.c: In function 'omap_2430sdp_init': arch/arm/mach-omap2/board-2430sdp.c:247: error: 'GPIOF_OUT_INIT_LOW' undeclared (first use in this function) arch/arm/mach-omap2/board-2430sdp.c:247: error: (Each undeclared identifier is reported only once arch/arm/mach-omap2/board-2430sdp.c:247: error: for each function it appears in.) This patch fixes the build error by include linux/gpio.h instead of mach/gpio.h. Signed-off-by: Axel Lin Cc: Syed Mohammed Khasim Cc: Grazvydas Ignotas Cc: Steve Sakoman Signed-off-by: Tony Lindgren commit 046d886db18260d4435c942985392b7ef872337f Author: Janusz Krzysztofik Date: Tue May 31 00:44:31 2011 +0200 OMAP: fix compilation error Forward-declare platform_device structure in arch/arm/plat-omap/include/plat/flash.h, otherwise compilation may break with: In file included from arch/arm/mach-omap1/flash.c:15: arch/arm/plat-omap/include/plat/flash.h:14: warning: 'struct platform_device' declared inside parameter list arch/arm/plat-omap/include/plat/flash.h:14: warning: its scope is only this definition or declaration, which is probably not what you want arch/arm/mach-omap1/flash.c:16: warning: 'struct platform_device' declared inside parameter list arch/arm/mach-omap1/flash.c:17: error: conflicting types for 'omap1_set_vpp' arch/arm/plat-omap/include/plat/flash.h:14: error: previous declaration of 'omap1_set_vpp' was here Detected and corrected while building for Amstrad Delta, confirmed with omap1_defconfig. Signed-off-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit f339b9dc1f03591761d5d930800db24bc0eda1e1 Author: Peter Zijlstra Date: Tue May 31 10:49:20 2011 +0200 sched: Fix schedstat.nr_wakeups_migrate While looking over the code I found that with the ttwu rework the nr_wakeups_migrate test broke since we now switch cpus prior to calling ttwu_stat(), hence the test is always true. Cure this by passing the migration state in wake_flags. Also move the whole test under CONFIG_SMP, its hard to migrate tasks on UP :-) Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-pwwxl7gdqs5676f1d4cx6pj7@git.kernel.org Signed-off-by: Ingo Molnar commit f01114cb59d670e9b4f2c335930dd57db96e9360 Author: Peter Zijlstra Date: Tue May 31 12:26:55 2011 +0200 sched: Fix cross-cpu clock sync on remote wakeups Markus reported that commit 317f394160e ("sched: Move the second half of ttwu() to the remote cpu") caused some accounting funnies on his AMD Phenom II X4, such as weird 'top' results. It turns out that this is due to non-synced TSC and the queued remote wakeups stopped coupeling the two relevant cpu clocks, which leads to wakeups seeing time jumps, which in turn lead to skewed runtime stats. Add an explicit call to sched_clock_cpu() to couple the per-cpu clocks to restore the normal flow of time. Reported-and-tested-by: Markus Trippelsdorf Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/1306835745.2353.3.camel@twins Signed-off-by: Ingo Molnar commit 1adffbae22332bb558c2a29de19d9aca391869f6 Author: OGAWA Hirofumi Date: Tue May 31 19:38:07 2011 +0900 fat: Fix corrupt inode flags when remove ATTR_SYS flag We are clearly missing '~' in fat_ioctl_set_attributes(). Cc: Reported-by: Dmitry Dmitriev Signed-off-by: OGAWA Hirofumi commit 9e3bb6b6f6a0c535eb053fbf0005a8e79e053374 Author: Heiko Carstens Date: Tue May 24 07:51:27 2011 +0200 KVM: add missing void __user * cast to access_ok() call fa3d315a "KVM: Validate userspace_addr of memslot when registered" introduced this new warning onn s390: kvm_main.c: In function '__kvm_set_memory_region': kvm_main.c:654:7: warning: passing argument 1 of '__access_ok' makes pointer from integer without a cast arch/s390/include/asm/uaccess.h:53:19: note: expected 'const void *' but argument is of type '__u64' Add the missing cast to get rid of it again... Cc: Takuya Yoshikawa Signed-off-by: Heiko Carstens Signed-off-by: Avi Kivity commit 2f2f96d1ea72e6602ae440ac2867a6004edb37a1 Author: Alex Deucher Date: Wed May 25 12:51:44 2011 -0400 drm/radeon/kms: clean up the radeon kms Kconfig - no longer in staging - all radeons supported Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 67b3f823ec78d08aea8835bce2655674237abc1d Author: Alex Deucher Date: Wed May 25 18:45:37 2011 -0400 drm/radeon/kms: fix thermal sensor reading on juniper Uses a different method than other evergreen asics. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 457558eda1545c22163574f6dbb883394705e9dd Author: Alex Deucher Date: Wed May 25 17:49:54 2011 -0400 drm/radeon/kms: add missing case for cayman thermal sensor The rest of the code is already in place. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit cb92d452ba665205ad6bfb424c0ef009cf26587d Author: Alex Deucher Date: Wed May 25 16:39:00 2011 -0400 drm/radeon/kms: add blit support for cayman (v2) Allows us to use the 3D engine for memory management and allows us to use vram beyond the BAR aperture. v2: fix copy paste typo Reported-by: Nils Wallménius Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit f90e5b5b136ede1f0fd15999e95f13124d6b0dbd Author: Bob Peterson Date: Tue May 24 10:44:42 2011 -0400 GFS2: Processes waiting on inode glock that no processes are holding This patch fixes a race in the GFS2 glock state machine that may result in lockups. The symptom is that all nodes but one will hang, waiting for a particular glock. All the holder records will have the "W" (Waiting) bit set. The other node will typically have the glock stuck in Exclusive mode (EX) with no holder records, but the dinode will be cached. In other words, an entry with "I:" will appear in the glock dump for that glock, but nothing else. The race has to do with the glock "Pending Demote" bit, which can be set, then immediately reset, thus losing the fact that another node needs the glock. The sequence of events is: 1. Something schedules the glock workqueue (e.g. glock request from fs) 2. The glock workqueue gets to the point between the test of the reply pending bit and the spin lock: if (test_and_clear_bit(GLF_REPLY_PENDING, &gl->gl_flags)) { finish_xmote(gl, gl->gl_reply); drop_ref = 1; } down_read(&gfs2_umount_flush_sem); <---- i.e. here spin_lock(&gl->gl_spin); 3. In comes (a) the reply to our EX lock request setting GLF_REPLY_PENDING and (b) the demote request which sets GLF_PENDING_DEMOTE 4. The following test is executed: if (test_and_clear_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) && gl->gl_state != LM_ST_UNLOCKED && gl->gl_demote_state != LM_ST_EXCLUSIVE) { This resets the pending demote flag, and gl->gl_demote_state is not equal to exclusive, however because the reply from the dlm arrived after we checked for the GLF_REPLY_PENDING flag, gl->gl_state is still equal to unlocked, so although we reset the GLF_PENDING_DEMOTE flag, we didn't then set the GLF_DEMOTE flag or reinstate the GLF_PENDING_DEMOTE_FLAG. The patch closes the timing window by only transitioning the "Pending demote" bit to the "demote" flag once we know the other conditions (not unlocked and not exclusive) are met. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit ac10f81d94f49f1bd9618680263400d275ddf825 Author: Alex Deucher Date: Wed May 25 01:00:45 2011 -0400 drm/radeon/kms/blit: workaround some hw issues on evergreen+ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie