commit 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d Author: Linus Torvalds Date: Tue Mar 29 12:09:47 2011 -0700 Linux 2.6.39-rc1 commit 6b2a4f7a5b777ea8fcf3bb38a0a33e68a920a9dc Merge: eefbab5 022b483 Author: Linus Torvalds Date: Tue Mar 29 12:09:30 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (26 commits) mmc: SDHI should depend on SUPERH || ARCH_SHMOBILE mmc: tmio_mmc: Move some defines into a shared header mmc: tmio: support aggressive clock gating mmc: tmio: fix power-mode interpretation mmc: tmio: remove work-around for unmasked SDIO interrupts sh: fix SDHI IO address-range ARM: mach-shmobile: fix SDHI IO address-range mmc: tmio: only access registers above 0xff, if available mfd: remove now redundant sh_mobile_sdhi.h header sh: convert boards to use linux/mmc/sh_mobile_sdhi.h ARM: mach-shmobile: convert boards to use linux/mmc/sh_mobile_sdhi.h mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD mmc: tmio: split core functionality, DMA and MFD glue mmc: tmio: use PIO for short transfers mmc: tmio-mmc: Improve DMA stability on sh-mobile mmc: fix mmc_app_send_scr() for dma transfer mmc: sdhci-esdhc: enable esdhc on imx53 mmc: sdhci-esdhc: use writel/readl as general APIs mmc: sdhci: add the abort CMDTYPE bits definition ... commit eefbab599531240adaffa1d23900afbc8b0342bd Merge: 90f1e74 3062aa5 Author: Linus Torvalds Date: Tue Mar 29 11:43:30 2011 -0700 Merge branch 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv * 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv: FRV: Use generic show_interrupts() FRV: Convert genirq namespace frv: Select GENERIC_HARDIRQS_NO_DEPRECATED frv: Convert cpu irq_chip to new functions frv: Convert mb93493 irq_chip to new functions frv: Convert mb93093 irq_chip to new function frv: Convert mb93091 irq_chip to new functions frv: Fix typo from __do_IRQ overhaul frv: Remove stale irq_chip.end FRV: Do some cleanups FRV: Missing node arg in alloc_thread_info_node() macro NOMMU: implement access_remote_vm NOMMU: support SMP dynamic percpu_alloc NOMMU: percpu should use is_vmalloc_addr(). commit 90f1e7481eebfd47e7dbf7c8c0cbfe31e025e031 Merge: d6ae0c6 e240ae4 Author: Linus Torvalds Date: Tue Mar 29 11:36:52 2011 -0700 Merge branch 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: Use new irq_move functions xen: Convert genirq namespace xen: fix p2m section mismatches xen/p2m: Allocate p2m tracking pages on override xen-gntdev: unlock on error path in gntdev_mmap() xen-gntdev: return -EFAULT on copy_to_user failure commit d6ae0c63f09cc443aa14f8b966aa3e7b2229360b Merge: 8c82840 7fff4be Author: Linus Torvalds Date: Tue Mar 29 11:20:09 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: softdog.c: enhancement to optionally invoke panic instead of reboot on timer expiry watchdog: fix nv_tco section mismatch watchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase. watchdog: Convert release_resource to release_region/release_mem_region watchdog: s3c2410_wdt.c: Convert release_resource to release_region/release_mem_region commit 8c82840e5414259b1963da36f82b64a755fafc75 Merge: c86defc a9f0fbe Author: Linus Torvalds Date: Tue Mar 29 11:11:18 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Fix potential memleak commit c86defc82c18b648193b5c6aabcc6204fd6bb373 Merge: 1309d7a 9ad198c Author: Linus Torvalds Date: Tue Mar 29 10:46:15 2011 -0700 Merge branch 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (111 commits) gpio: ab8500: Mark broken genirq: Remove move_*irq leftovers genirq: Remove compat code drivers: Final irq namespace conversion mn10300: Use generic show_interrupts() mn10300: Cleanup irq_desc access mn10300: Convert genirq namespace frv: Use generic show_interrupts() frv: Convert genirq namespace frv: Select GENERIC_HARDIRQS_NO_DEPRECATED frv: Convert cpu irq_chip to new functions frv: Convert mb93493 irq_chip to new functions frv: Convert mb93093 irq_chip to new function frv: Convert mb93091 irq_chip to new functions frv: Fix typo from __do_IRQ overhaul frv: Remove stale irq_chip.end m68k: Convert irq function namespace xen: Use new irq_move functions xen: Cleanup genirq namespace unicore32: Use generic show_interrupts() ... commit 1309d7afbed112f0e8e90be9af975550caa0076b Author: Peter Huewe Date: Tue Mar 29 13:31:25 2011 +0200 char/tpm: Fix unitialized usage of data buffer This patch fixes information leakage to the userspace by initializing the data buffer to zero. Reported-by: Peter Huewe Signed-off-by: Peter Huewe Signed-off-by: Marcel Selhorst [ Also removed the silly "* sizeof(u8)". If that isn't 1, we have way deeper problems than a simple multiplication can fix. - Linus ] Signed-off-by: Linus Torvalds commit a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 Author: Borislav Petkov Date: Tue Mar 29 18:10:53 2011 +0200 amd64_edac: Fix potential memleak We check the pointers together but at least one of them could be invalid due to failed allocation. Since we cannot continue if either of the two allocations has failed, exit early by freeing them both. Cc: # 38.x Reported-by: Mauro Carvalho Chehab Signed-off-by: Borislav Petkov commit 0444d76ae64fffc7851797fc1b6ebdbb44ac504a Author: Dave Chinner Date: Tue Mar 29 18:08:50 2011 +1100 fs: don't use igrab() while holding i_lock Fix the incorrect use of igrab() inside the i_lock in NFS and Ceph‥ If we are already holding the i_lock, we have a reference to the inode so we can safely use ihold() to gain an extra reference. This avoids hangs due to lock recursion on the i_lock now that the inode_lock is gone and igrab() uses the i_lock itself. Signed-off-by: Dave Chinner Cc: Al Viro Cc: linux-fsdevel@vger.kernel.org Cc: Ryan Mallon Signed-off-by: Linus Torvalds commit cb1817b37313b4b6c7f8f93c730553dd3cb6ac57 Merge: 89078d5 02aadf7 Author: Linus Torvalds Date: Tue Mar 29 07:41:33 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits) xfrm: Restrict extended sequence numbers to esp xfrm: Check for esn buffer len in xfrm_new_ae xfrm: Assign esn pointers when cloning a state xfrm: Move the test on replay window size into the replay check functions netdev: bfin_mac: document TE setting in RMII modes drivers net: Fix declaration ordering in inline functions. cxgb3: Apply interrupt coalescing settings to all queues net: Always allocate at least 16 skb frags regardless of page size ipv4: Don't ip_rt_put() an error pointer in RAW sockets. net: fix ethtool->set_flags not intended -EINVAL return value mlx4_en: Fix loss of promiscuity tg3: Fix inline keyword usage tg3: use and instead and net: use CHECKSUM_NONE instead of magic number Net / jme: Do not use legacy PCI power management myri10ge: small rx_done refactoring bridge: notify applications if address of bridge device changes ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo() can: c_can: Fix tx_bytes accounting can: c_can_platform: fix irq check in probe ... commit e240ae4aad9c5c0da189cb6c956cca58abd428d0 Author: Thomas Gleixner Date: Thu Mar 24 21:37:31 2011 +0100 xen: Use new irq_move functions These functions take irq_data as an argument and avoid a redundant lookup in the sparse irq case. Signed-off-by: Thomas Gleixner Cc: Ian Campbell Cc: Jeremy Fitzhardinge Cc: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk commit 3b3af761669ae59530a8be763b83c937c6096772 Author: Thomas Gleixner Date: Fri Mar 25 11:01:39 2011 +0100 xen: Convert genirq namespace Converted with coccinelle. Signed-off-by: Thomas Gleixner Acked-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit b83c6e55ac482f08984504d61382ecf05f0afe32 Author: Randy Dunlap Date: Thu Mar 24 13:34:32 2011 -0700 xen: fix p2m section mismatches Fix section mismatch warnings: set_phys_range_identity() is called by __init xen_set_identity(), so also mark set_phys_range_identity() as __init. then: __early_alloc_p2m() is called set_phys_range_identity(), so also mark __early_alloc_p2m() as __init. WARNING: arch/x86/built-in.o(.text+0x7856): Section mismatch in reference from the function __early_alloc_p2m() to the function .init.text:extend_brk() The function __early_alloc_p2m() references the function __init extend_brk(). This is often because __early_alloc_p2m lacks a __init annotation or the annotation of extend_brk is wrong. WARNING: arch/x86/built-in.o(.text+0x7967): Section mismatch in reference from the function set_phys_range_identity() to the function .init.text:extend_brk() The function set_phys_range_identity() references the function __init extend_brk(). This is often because set_phys_range_identity lacks a __init annotation or the annotation of extend_brk is wrong. [v2: Per Stephen Hemming recommonedation made __early_alloc_p2m static] Signed-off-by: Randy Dunlap Signed-off-by: Konrad Rzeszutek Wilk commit 3062aa50a6b2c3103470178fe7506c450d79ebe5 Author: Thomas Gleixner Date: Tue Mar 29 14:05:13 2011 +0100 FRV: Use generic show_interrupts() Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 60af3ab1e6b0b7a1bdbb7392134c27e6be9630df Author: Thomas Gleixner Date: Tue Mar 29 14:05:13 2011 +0100 FRV: Convert genirq namespace Convert to new function names. Converted with coccinelle. Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit a9554c3a5d02d50aeff08203ca8dd1e2dffdaa0d Author: Thomas Gleixner Date: Tue Mar 29 14:05:13 2011 +0100 frv: Select GENERIC_HARDIRQS_NO_DEPRECATED All chips converted Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 12516469756f773ac756ac73c4070ba8efef155a Author: Thomas Gleixner Date: Tue Mar 29 14:05:13 2011 +0100 frv: Convert cpu irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit a4b48a494aef7ab2458b365e00eeebc6c0a2d997 Author: Thomas Gleixner Date: Tue Mar 29 14:05:13 2011 +0100 frv: Convert mb93493 irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 9148d88b120d260aa64fb21faaf18aa7a46b18a4 Author: Thomas Gleixner Date: Tue Mar 29 14:05:13 2011 +0100 frv: Convert mb93093 irq_chip to new function Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 193e7a5f824b54386621df9303053c36ed0d9c16 Author: Thomas Gleixner Date: Tue Mar 29 14:05:13 2011 +0100 frv: Convert mb93091 irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 303fef9052d90257df3e0e434b834af3938b8a7f Author: Thomas Gleixner Date: Tue Mar 29 14:05:13 2011 +0100 frv: Fix typo from __do_IRQ overhaul Compiles way better. Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit c4b159802306c07692324f9aa277e6ed144811e3 Author: Thomas Gleixner Date: Tue Mar 29 14:05:12 2011 +0100 frv: Remove stale irq_chip.end irq_chip.end got obsolete with the removal of __do_IRQ(). irq-mb93093.c even lacks an implementation, but nobody noticed that it's broken since commit 88d6e1 in 2006. Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 5ca7202bc4db3e2fd5653c52a608601c7a64a2ac Author: Amerigo Wang Date: Tue Mar 29 14:05:12 2011 +0100 FRV: Do some cleanups 1. frv doesn't support SMP, remove the useless SMP bits. 2. frv has its own alloc_task_struct, so define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR (I am not sure if frv should use generic alloc_task_struct().) Signed-off-by: WANG Cong Signed-off-by: David Howells commit 5ef9bdde9cd8e7f9d43a975b47f520ca64cbd0a1 Author: David Howells Date: Tue Mar 29 14:05:12 2011 +0100 FRV: Missing node arg in alloc_thread_info_node() macro There are two alloc_thread_info_node() macros defined (one for debugging and one for normal). The commit that changed them most recently: commit b6a84016bd2598e35ead635147fa53619982648d Author: Eric Dumazet Date: Tue Mar 22 16:30:42 2011 -0700 Subject: mm: NUMA aware alloc_thread_info_node() didn't add the node argument into the macro argument list for the normal macro. This results in the following error: kernel/fork.c:267:39: error: macro "alloc_thread_info_node" passed 2 arguments, but takes just 1 kernel/fork.c: In function 'dup_task_struct': kernel/fork.c:267: error: 'alloc_thread_info_node' undeclared (first use in this function) kernel/fork.c:267: error: (Each undeclared identifier is reported only once kernel/fork.c:267: error: for each function it appears in.) Signed-off-by: David Howells commit f55f199b7d76a01e7ce9d1c3bb004327e075c327 Author: Mike Frysinger Date: Tue Mar 29 14:05:12 2011 +0100 NOMMU: implement access_remote_vm Recent vm changes brought in a new function which the core procfs code utilizes. So implement it for nommu systems too to avoid link failures. Signed-off-by: Mike Frysinger Signed-off-by: David Howells Tested-by: Simon Horman Tested-by: Ithamar Adema Acked-by: Greg Ungerer commit 9ad198cba2a8177eea6a7f2f0202b910abdef96b Author: Thomas Gleixner Date: Tue Mar 29 04:02:50 2011 +0200 gpio: ab8500: Mark broken This driver is broken in several aspects. 1) old style irq_chip functions. Sigh 2) Abuse of the unlock callback. That's not supposed to be a state machine for evrything and some more. Signed-off-by: Thomas Gleixner commit 851d7cf647e0d31668eb5dc496f7698a2f6136b4 Author: Thomas Gleixner Date: Tue Mar 29 02:51:13 2011 +0200 genirq: Remove move_*irq leftovers All users converted to new interface. Signed-off-by: Thomas Gleixner commit 0c6f8a8b917ad361319c8ace3e9f28e69bfdb4c1 Author: Thomas Gleixner Date: Mon Mar 28 13:32:20 2011 +0200 genirq: Remove compat code Signed-off-by: Thomas Gleixner commit dced35aeb0367dda2636ee9ee914bda14510dcc9 Author: Thomas Gleixner Date: Mon Mar 28 17:49:12 2011 +0200 drivers: Final irq namespace conversion Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit 2a8f55b1f577c205e71ddcb696564cbd05c50eb5 Author: Thomas Gleixner Date: Thu Mar 24 18:54:24 2011 +0100 mn10300: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit 232f1d8591dd1933a39fba5378763f5210dce138 Author: Thomas Gleixner Date: Thu Mar 24 17:36:37 2011 +0100 mn10300: Cleanup irq_desc access The migration needs only access to irq_data. Signed-off-by: Thomas Gleixner commit f4c547ebb4a3f11e0515433fa4472e34740c10c9 Author: Thomas Gleixner Date: Thu Mar 24 17:35:56 2011 +0100 mn10300: Convert genirq namespace Convert to new function names. Converted with coccinelle. Signed-off-by: Thomas Gleixner commit a120017c501ec69d046f3f29a2a3550ef2697f1e Author: Thomas Gleixner Date: Thu Mar 24 18:48:36 2011 +0100 frv: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit de2e95a6630454d3657a3271152f4ef41b2a20eb Author: Thomas Gleixner Date: Thu Mar 24 16:38:49 2011 +0100 frv: Convert genirq namespace Convert to new function names. Converted with coccinelle. Signed-off-by: Thomas Gleixner commit 808339b1dd76cc9c72bea16f40c335111b5451c1 Author: Thomas Gleixner Date: Sun Feb 6 20:20:39 2011 +0100 frv: Select GENERIC_HARDIRQS_NO_DEPRECATED All chips converted Signed-off-by: Thomas Gleixner Cc: David Howells LKML-Reference: <20110206192106.601290592@linutronix.de> Signed-off-by: Thomas Gleixner commit 380e31119611b26ee593e4426115feae765be837 Author: Thomas Gleixner Date: Sun Feb 6 20:20:38 2011 +0100 frv: Convert cpu irq_chip to new functions Signed-off-by: Thomas Gleixner Cc: David Howells LKML-Reference: <20110206192106.501651128@linutronix.de> Signed-off-by: Thomas Gleixner commit a55174f1ec5052d3eff5ba6cd25e3d58bdfb1713 Author: Thomas Gleixner Date: Sun Feb 6 20:20:37 2011 +0100 frv: Convert mb93493 irq_chip to new functions Signed-off-by: Thomas Gleixner Cc: David Howells LKML-Reference: <20110206192106.401266547@linutronix.de> Signed-off-by: Thomas Gleixner commit 9741f28688de348e74a43173e0229cbb569fb9b0 Author: Thomas Gleixner Date: Sun Feb 6 20:20:36 2011 +0100 frv: Convert mb93093 irq_chip to new function Signed-off-by: Thomas Gleixner Cc: David Howells LKML-Reference: <20110206192106.300303769@linutronix.de> Signed-off-by: Thomas Gleixner commit ac3460554b8f8861c2857bb1a3692243e6327e79 Author: Thomas Gleixner Date: Sun Feb 6 20:20:35 2011 +0100 frv: Convert mb93091 irq_chip to new functions Signed-off-by: Thomas Gleixner Cc: David Howells LKML-Reference: <20110206192106.203431646@linutronix.de> Signed-off-by: Thomas Gleixner commit 0f421c9dc2c9760db5381a75ce81433e31472e0b Author: Thomas Gleixner Date: Sun Feb 6 20:20:34 2011 +0100 frv: Fix typo from __do_IRQ overhaul Compiles way better. Signed-off-by: Thomas Gleixner Cc: David Howells LKML-Reference: <20110206192106.109992056@linutronix.de> Signed-off-by: Thomas Gleixner commit db3b3602b90bcdc220b48f473010a4663310d95d Author: Thomas Gleixner Date: Sun Feb 6 20:20:33 2011 +0100 frv: Remove stale irq_chip.end irq_chip.end got obsolete with the removal of __do_IRQ(). irq-mb93093.c even lacks an implementation, but nobody noticed that it's broken since commit 88d6e1 in 2006. Signed-off-by: Thomas Gleixner Cc: David Howells LKML-Reference: <20110206192106.011224503@linutronix.de> Signed-off-by: Thomas Gleixner commit 0b98b1636cf2e112216a5661a629606cde7b1c07 Author: Thomas Gleixner Date: Mon Mar 28 13:31:17 2011 +0200 m68k: Convert irq function namespace Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit a3b975c49e3e21864268892760f630433d96e01a Author: Thomas Gleixner Date: Thu Mar 24 21:31:25 2011 +0100 xen: Use new irq_move functions These functions take irq_data as an argument and avoid a redundant lookup in the sparse irq case. Signed-off-by: Thomas Gleixner Cc: Ian Campbell Cc: Jeremy Fitzhardinge Cc: Konrad Rzeszutek Wilk commit c442b8068f7c53c40a73a82bbfd96d3f41f6778c Author: Thomas Gleixner Date: Fri Mar 25 10:58:06 2011 +0100 xen: Cleanup genirq namespace Converted with coccinelle. Signed-off-by: Thomas Gleixner commit 37daf3223e61685854798f755e4af9f073aaa26c Author: Thomas Gleixner Date: Thu Mar 24 18:26:42 2011 +0100 unicore32: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit e1f5ce819c60a1020b43532333b0db291f2ce5c1 Author: Thomas Gleixner Date: Thu Mar 24 18:26:16 2011 +0100 unicore32: Convert to new irq function names Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit fa680c7c22ea8382847815c5fb91a30202a578a0 Author: Thomas Gleixner Date: Thu Mar 24 18:03:13 2011 +0100 sparc: Use generic show_interrupts() Signed-off-by: Thomas Gleixner Cc: sparclinux@vger.kernel.org commit 394d441b91c146696ec2765a56be34855d375bd5 Author: Thomas Gleixner Date: Thu Mar 24 17:52:54 2011 +0100 sparc: Convert to new irq function names Scripted with coccinelle. Signed-off-by: Thomas Gleixner Cc: sparclinux@vger.kernel.org commit 16741ea0411ff8adb9b84934433638fa432c5292 Author: Thomas Gleixner Date: Thu Mar 24 17:57:12 2011 +0100 sparc: Cleanup direct irq_desc access Use the proper wrapper functions. Signed-off-by: Thomas Gleixner Cc: sparclinux@vger.kernel.org commit fcd8d4f498698265fc0fba1dd376303caea71de4 Author: Thomas Gleixner Date: Thu Mar 24 09:03:45 2011 +0100 sparc: Use the new genirq functionality Make use of the new features in genirq: 1) Set the chip flag IRCHIP_EOI_IF_HANDLED, which ensures in the core code that irq_eoi() is only called when the interrupt was handled. That removes the extra status check in the callback. 2) Use the preflow handler, which is called from the fasteoi core code before the device handler. That avoids another status check and the open coded handler redirection. Signed-off-by: Thomas Gleixner Cc: sparclinux@vger.kernel.org commit fcb8918fd242f39496090dbbd6789ab24098295b Author: Thomas Gleixner Date: Thu Mar 24 16:31:17 2011 +0100 sh: Convert to new function names Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit a821b2793ea958038687c481c1ea7f74c8fcccfd Author: Thomas Gleixner Date: Thu Mar 24 14:47:46 2011 +0100 sh: Use the proper accessor functions Signed-off-by: Thomas Gleixner commit 433c9c67c53cc42b2824532d3abb7ac62970d3fb Author: Thomas Gleixner Date: Fri Mar 25 17:04:59 2011 +0100 powerpc: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit ec775d0e70eb6b7116406b3441cb8501c2849dd2 Author: Thomas Gleixner Date: Fri Mar 25 16:45:20 2011 +0100 powerpc: Convert to new irq_* function names Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit 7bfbc1f28311d680e45d7122ecd48dec57703750 Author: Thomas Gleixner Date: Fri Mar 25 16:36:35 2011 +0100 powerpc: irq: Use irqdata based information We want to tighten the irq_desc access. So use the new accessors for the same information. Signed-off-by: Thomas Gleixner commit ddaedd1c4aa0762563ca0cfdb22bbd8ef3ef785a Author: Thomas Gleixner Date: Mon Mar 28 16:46:02 2011 +0200 powerpc-fsl-msi-use-irqd.patch Signed-off-by: Thomas Gleixner commit 773e20d5b7bf948ab0207e1ddb81e52ae7e7c6f3 Author: Thomas Gleixner Date: Fri Mar 25 16:26:01 2011 +0100 powerpc: xilinx: Cleanup flow type handling The core irq_set_type() function updates the flow type when the chip callback returns 0. So setting the type is bogus. The core also updates the LEVEL flag. Signed-off-by: Thomas Gleixner commit 1ac06cdadf3f6e9c52cf87304238bffdf4c71566 Author: Thomas Gleixner Date: Fri Mar 25 16:23:57 2011 +0100 powerpc: uic: Cleanup flow type handling The core irq_set_type() function updates the flow type when the chip callback returns 0. So setting the type is bogus. The core also updates IRQ_LEVEL. Use irq_data to get the level type information in the chip functions. Signed-off-by: Thomas Gleixner commit 24a3f2e82bc8cf7ed05294008794f842cf170ea2 Author: Thomas Gleixner Date: Fri Mar 25 16:20:15 2011 +0100 powerpc: mpic: Cleanup flow type handling The core irq_set_type() function updates the flow type when the chip callback returns 0. So setting the type is bogus. The new core code allows to update the type in irq_data and return IRQ_SET_MASK_OK_NOCOPY, so the core code will not touch it, except for setting the IRQ_LEVEL flag. Retrieve the IRQ_LEVEL information from irq_data which avoids a redundant sparse irq lookup as well. Signed-off-by: Thomas Gleixner commit 5fed97a9fdc0bc76ea2e220cf3aac0e8c7cf4b2b Author: Thomas Gleixner Date: Fri Mar 25 16:18:32 2011 +0100 powerpc: mpc8xx_pic: Cleanup flow type handling The core irq_set_type() function updates the flow type when the chip callback returns 0. So setting the type is bogus. The level flag is updated in the core as well. Use the proper accessors for setting the irq handlers. Signed-off-by: Thomas Gleixner commit ecf4b1961583e2a56fc935061f56f782173d0749 Author: Thomas Gleixner Date: Fri Mar 25 16:16:30 2011 +0100 powerpc: ipic: Cleanup flow type handling The core irq_set_type() function updates the flow type when the chip callback returns 0. So setting the type is bogus. The new core code allows to update the type in irq_data and return IRQ_SET_MASK_OK_NOCOPY, so the core code will not touch it, except for setting the IRQ_LEVEL flag. Use the proper accessors for setting the irq handlers. Signed-off-by: Thomas Gleixner commit 7bf811a8744d1eacff556bb7decc9c606b1537c2 Author: Thomas Gleixner Date: Fri Mar 25 16:13:38 2011 +0100 powerpc: cpm2_pic: Use IRQCHIP_EOI_IF_HANDLED The core code provides the same functionality when the IRQCHIP_EOI_IF_HANDLED flag is set for the irq chip. Signed-off-by: Thomas Gleixner commit a28ab38c440d0391d8a3673514e4cfb079445309 Author: Thomas Gleixner Date: Fri Mar 25 16:07:51 2011 +0100 powerpc: cpm2_pic: Cleanup flow type handling The core irq_set_type() function updates the flow type when the chip callback returns 0. So setting the type is bogus. The new core code allows to update the type in irq_data and return IRQ_SET_MASK_OK_NOCOPY, so the core code will not touch it, except for setting the IRQ_LEVEL flag. Use the proper accessors for setting the irq handlers. Signed-off-by: Thomas Gleixner commit 00e70bad1abba1f96f7b9e6454b222f393e5281f Author: Thomas Gleixner Date: Fri Mar 25 16:04:41 2011 +0100 powerpc: cell: Fix the irq_desc access The core irq_set_type() function updates the flow type when the chip callback returns 0. It also updates irq_data, so this can be used in irq_ack() to check for the level bit. That avoids a redundant sparse irq lookup. Signed-off-by: Thomas Gleixner commit 8c99f561395f59ba9ec926c8940a4446fdfd8103 Author: Thomas Gleixner Date: Fri Mar 25 16:03:07 2011 +0100 powerpc: mac: pic: Use irqd_is_level_type() No need for a redundant sparse irq lookup. irqdata provides the same information. Signed-off-by: Thomas Gleixner commit 212d786dabfee69c2ce5498821c2a0a679a1197b Author: Thomas Gleixner Date: Fri Mar 25 15:54:03 2011 +0100 powerpc: media5200: Remove pointless set_irq_type() The irq chip has no irq_set_type() callback. So calling the call is pointless. Set IRQ_LEVEL via the proper accessor. Signed-off-by: Thomas Gleixner commit 98488db9ff01849354bffb6a9675b1cc2ecf03fd Author: Thomas Gleixner Date: Fri Mar 25 15:43:57 2011 +0100 powerpc: Use proper accessors for IRQ_* flags Use the proper accessors instead of open access to irq_desc. Converted with coccinelle. Signed-off-by: Thomas Gleixner commit 68f20f43dae770bdb3d93cfb8fbe9679d3568c3b Author: Thomas Gleixner Date: Mon Mar 28 13:47:54 2011 +0200 parisc: Use irq_to_desc() in show_interrupts() Signed-off-by: Thomas Gleixner commit e2f571d294cc5f944539088bed46abae375b75f6 Author: Thomas Gleixner Date: Thu Mar 24 17:41:44 2011 +0100 parisc: Convert irq namespace Convert to the new function names. Scripted with coccinelle. Signed-off-by: Thomas Gleixner Cc: Kyle McMartin Cc: linux-parisc@vger.kernel.org commit 337ce6811bfe474cc449de1f95d2c4f26641f5af Author: Thomas Gleixner Date: Thu Mar 24 17:48:47 2011 +0100 parisc: Convert the final irq bits 1) As promised in the comment, the core does not copy cpumask anymore when the arch code returns -EINVAL 2) Get the per cpu information from irq_data Signed-off-by: Thomas Gleixner Cc: Kyle McMartin Cc: linux-parisc@vger.kernel.org commit 1d5f821c3f9f2344e1a854aa91a5ab3b25ee5c2a Author: Thomas Gleixner Date: Mon Mar 28 13:59:54 2011 +0200 mips: vr41xx: Use irdq_irq_disabled() Signed-off-by: Thomas Gleixner commit e4ec7989b4e55d9275ebac66230b7dac6dcb1fae Author: Thomas Gleixner Date: Sun Mar 27 15:19:28 2011 +0200 MIPS: Convert the irq functions to the new names Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit 9efbc3fba2cd7f703b55d72e5168ed4348930442 Author: Thomas Gleixner Date: Sun Mar 27 15:11:13 2011 +0200 MIPS: alchemy: Use proper irq accessors This really starts to be a sysiphean task. Signed-off-by: Thomas Gleixner commit 5b7cd6fd8278a754df6495fcc5cfa4dd3df42206 Author: Thomas Gleixner Date: Sun Mar 27 16:04:30 2011 +0200 MIPS: Octeon: Simplify irq_cpu_on/offline irq chip functions Make use of the IRQCHIP_ONOFFLINE_ENABLED flag and remove the wrappers. Use irqd_irq_disabled() instead of desc->status, which will go away. Signed-off-by: Thomas Gleixner Tested-by: David Daney commit 0c3263870f5f80cf7b6cb322bd8e708ce568d36b Author: David Daney Date: Fri Mar 25 12:38:51 2011 -0700 MIPS: Octeon: Rewrite interrupt handling code. This includes conversion to new style irq_chip functions, and correctly enabling/disabling per-CPU interrupts. The hardware interrupt bit to irq number mapping is now done with a flexible map, instead of by bit twiddling the irq number. [ tglx: Adjusted to new irq_cpu_on/offline callbacks and __irq_set_affinity_lock ] Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Cc: ralf@linux-mips.org LKML-Reference: <1301081931-11240-5-git-send-email-ddaney@caviumnetworks.com> Signed-off-by: Thomas Gleixner commit a458465641bf61a00f4ca54da7265202a911f975 Author: Thomas Gleixner Date: Sun Mar 27 16:54:26 2011 +0200 MIPS: Fix syncfs syscall copy and paste failure Signed-off-by: Thomas Gleixner commit 9d61c18b25726306c9231428c17db42e3ff29ba7 Author: Thomas Gleixner Date: Thu Mar 24 14:55:52 2011 +0100 microblaze: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit 4adc192ec7d977c74c750320f289af9d61c1caca Author: Thomas Gleixner Date: Thu Mar 24 14:52:04 2011 +0100 microblaze: Convert to new irq function names Namespace conversion scripted with coccinelle. Also retrieve the irq type from irq_data in intc_enable_or_unmask() Signed-off-by: Thomas Gleixner commit a749f8a547d4a18cf8d6c521832eb36e13114a70 Author: Thomas Gleixner Date: Mon Mar 28 13:50:08 2011 +0200 ia64: Remove redundant declaration of irq_desc[] Signed-off-by: Thomas Gleixner commit 53c909c96ade613b5b485fadf7c3b833b3fd0bc7 Author: Thomas Gleixner Date: Fri Mar 25 21:06:09 2011 +0100 ia64: Convert to the new irq_* function names Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit e3d781227808d12a5d5228028bf01de3e3824f69 Author: Thomas Gleixner Date: Fri Mar 25 21:04:38 2011 +0100 ia64: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6 Author: Thomas Gleixner Date: Fri Mar 25 20:50:49 2011 +0100 ia64: Use irqd_irq_disabled() instead of desc->status access Remove the last open coded access to irq_desc. Signed-off-by: Thomas Gleixner commit 33776b009a45c8e921c47ea2d8304104677ee778 Author: Thomas Gleixner Date: Fri Mar 25 20:43:34 2011 +0100 ia64: sn: Use irqd_mark_affinity_set() helper irq_desc->status is going to be restricted. Provide a helper to set that information in irq_data, where it belongs. Signed-off-by: Thomas Gleixner commit 97499b2ed7ce80cb03e9f513f9f552f833501fbe Author: Thomas Gleixner Date: Fri Mar 25 20:36:55 2011 +0100 ia64: msi: Use irq_move_irq() This replaces the old move_native_irq() function which is going away. Signed-off-by: Thomas Gleixner commit b5f0149626ebca4e5f8dd465d335d1b05f28608b Author: Thomas Gleixner Date: Fri Mar 25 20:35:17 2011 +0100 ia64: sn: Use irq_move_irq() This replaces the old move_native_irq() function which is going away. Signed-off-by: Thomas Gleixner commit 91ce72e08047190291777ec56598118225910203 Author: Thomas Gleixner Date: Fri Mar 25 20:30:53 2011 +0100 ia64: iosapic: Use new irq_move_* functions The current functions are going away. Also use the accessor for pending setaffinity in irq_data instead of the open coded irq_desc access. Signed-off-by: Thomas Gleixner commit 459960d831d14924eb4bcccadeb03ec81a1f524c Author: Thomas Gleixner Date: Fri Mar 25 20:25:06 2011 +0100 ia64: iosapic: Remove redundant mask from ack() The core code calls mask_ack() which calls irq_ack() and irq_mask() for the case where an interrupt is disabled and marked pending. That seems to be a leftover from the old __do_IRQ() mode. Signed-off-by: Thomas Gleixner commit a2178334e9e7bb0fc11c9706114b43dbdd612ce4 Author: Thomas Gleixner Date: Thu Mar 24 16:44:38 2011 +0100 ia64: Use accessor functions all over the place Use the proper accessor functions instead of open coded irq_desc access. Signed-off-by: Thomas Gleixner commit 41ef0203214644ad003e8dac0147a3e5b6381034 Author: Thomas Gleixner Date: Fri Mar 25 20:18:14 2011 +0100 ia64: xen: Use irq accessor functions Signed-off-by: Thomas Gleixner commit dea1078e1a67f3d877ef553e3189df20fcca54e0 Author: Thomas Gleixner Date: Fri Mar 25 20:16:05 2011 +0100 ia64: iosapic: Cleanup irq_desc access Use irq_to_desc() and use accessors for setting chip and handler. Signed-off-by: Thomas Gleixner commit e5ffece737378ddefb3412f76e8d2928915af3a1 Author: Thomas Gleixner Date: Fri Mar 25 19:40:39 2011 +0100 ia64: sn: Drop unused function Leftover from the irq chip conversion. Reported-by: Tony Luck Signed-off-by: Thomas Gleixner commit 8fac171f72efb2e62f34ffeca22820823e60cdb0 Author: Thomas Gleixner Date: Fri Feb 4 20:31:21 2011 +0100 ia64: Convert iosapic to new irq_chip functions Signed-off-by: Thomas Gleixner commit 5c217b60fed39ed2ac6a2e8b788df4a74fa68878 Author: Thomas Gleixner Date: Fri Feb 4 20:29:37 2011 +0100 ia64: Convert lsapic to new irq_chip functions Signed-off-by: Thomas Gleixner commit f1f701e937b542368a43b55b437ac90d74d724d9 Author: Thomas Gleixner Date: Fri Feb 4 20:18:43 2011 +0100 ia64: Convert msi to new irq_chip functions Signed-off-by: Thomas Gleixner commit 545c8d8d4f03b2d9d3a556b05e7eaf2019c530d7 Author: Thomas Gleixner Date: Fri Feb 4 20:08:36 2011 +0100 ia64: Convert sn to new irq_chip functions Signed-off-by: Thomas Gleixner commit 42c9a74d0ed6b2034ac450058b6b2cc0cc81139e Author: Thomas Gleixner Date: Fri Feb 4 20:02:09 2011 +0100 ia64: Convert msi_sn to new irq_chip functions Signed-off-by: Thomas Gleixner commit 4a983ed44f38a6a41649aaab54d699d5248d3a51 Author: Thomas Gleixner Date: Sat Feb 5 20:23:29 2011 +0100 ia64: hp-sim: Cleanup direct access to irq_desc Use accessor functions instead of open coded access. Signed-off-by: Thomas Gleixner commit 35d75b0e03520ac09abd4a1f9490facf6a1ac82e Author: Thomas Gleixner Date: Fri Feb 4 20:12:06 2011 +0100 ia64: Convert hp-sim to new irq_chip functions Signed-off-by: Thomas Gleixner commit 3d373ce82aaa2b5380d91074aa88879108b47ecf Author: Thomas Gleixner Date: Thu Feb 3 00:46:48 2011 +0000 ia64: Remove stale irq_chip.end irq_chip.end got obsolete with the removal of __do_IRQ(). Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Tony Luck LKML-Reference: <20110203004210.143127544@linutronix.de> commit 428a40c591f5f2ac7531db8dc191534b8590f339 Author: Thomas Gleixner Date: Fri Mar 25 20:12:33 2011 +0100 ia64: Cleanup migrate_irqs() Signed-off-by: Thomas Gleixner commit 097e98b4fc53fa9e9ef2b7b0c5364f2f079e7d6b Author: Thomas Gleixner Date: Fri Mar 25 19:00:33 2011 +0100 ia64: Convert migrate_platform_irqs() to new irq chip functions Signed-off-by: Thomas Gleixner commit 28a283aae3bdd5088246ca830247ec8393e3e06b Author: Thomas Gleixner Date: Mon Mar 28 13:50:50 2011 +0200 bfin: Use proper accessors in trace Signed-off-by: Thomas Gleixner commit 43f2f1154aecce40e6ced16b46dab47fbb4de866 Author: Thomas Gleixner Date: Thu Mar 24 17:22:30 2011 +0100 bfin: Convert irq namespace Convert to the new function names. Scripted with coccinelle. Signed-off-by: Thomas Gleixner Cc: Mike Frysinger Cc: uclinux-dist-devel@blackfin.uclinux.org commit 1907d8be2d54de461c682ee2fac45d97c29fd5dd Author: Thomas Gleixner Date: Thu Mar 24 17:21:01 2011 +0100 bfin: Final irq cleanup Use the trigger type in irq_data and check level type instead of looking at desc->handle_irq. Signed-off-by: Thomas Gleixner Cc: Mike Frysinger Cc: uclinux-dist-devel@blackfin.uclinux.org commit a6e120ed42004d6051fff7c3233e2554f12ccecb Author: Thomas Gleixner Date: Fri Mar 25 22:20:51 2011 +0100 alpha: Use generic show_interrupts() The only subtle difference is that alpha uses ACTUAL_NR_IRQS and prints the IRQF_DISABLED flag. Change the generic implementation to deal with ACTUAL_NR_IRQS if defined. The IRQF_DISABLED printing is pointless, as we nowadays run all interrupts with irqs disabled. Signed-off-by: Thomas Gleixner commit a9eb076b21425929ce543978db03265d9db210de Author: Thomas Gleixner Date: Fri Mar 25 22:17:31 2011 +0100 alpha: Convert to new irq function names Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit f38c02f3b338651e145aac2889ba976baf6b28b3 Author: Thomas Gleixner Date: Thu Mar 24 13:35:09 2011 +0100 arm: Fold irq_set_chip/irq_set_handler Use irq_set_chip_and_handler() instead. Converted with coccinelle. Signed-off-by: Thomas Gleixner commit 9323f26186403433293e87e717a7785f74f75d80 Author: Thomas Gleixner Date: Thu Mar 24 13:29:39 2011 +0100 arm: Reorder irq_set_ function calls Reorder irq_set_chip() irq_set_chip_data() irq_set_handler() to irq_set_chip() irq_set_handler() irq_set_chip_data() so the next patch can combine irq_set_chip() and irq_set_handler() to irq_set_chip_and_handler(). Automated conversion with coccinelle. Signed-off-by: Thomas Gleixner commit 6845664a6a7d443f03883db59d10749d38d98b8e Author: Thomas Gleixner Date: Thu Mar 24 13:25:22 2011 +0100 arm: Cleanup the irq namespace Convert to the new function names. Automated with coccinelle. Signed-off-by: Thomas Gleixner commit 25a5662a13e604d86b0a9fd71703582a7393d8ec Author: Thomas Gleixner Date: Thu Mar 24 12:02:11 2011 +0100 arm: Use generic show_interrupts() Use the generic version and just keep the arch specific output. Signed-off-by: Thomas Gleixner commit cf0d6b76c11b565f8d8b7d527d17b9f82eb3b3a5 Author: Thomas Gleixner Date: Thu Mar 24 12:33:40 2011 +0100 arm: dove: Use proper irq accessor functions Remove the obsolete desc_handle_irq() helper. Signed-off-by: Thomas Gleixner commit fdea77b88ea19525cce3b850f9183286b8a554e0 Author: Thomas Gleixner Date: Thu Mar 24 12:48:54 2011 +0100 arm: gic: Use proper accessor functions Signed-off-by: Thomas Gleixner commit ac93cdbd6e5e2547a031e2739e0dd445824bf1c8 Author: Thomas Gleixner Date: Thu Mar 24 12:48:18 2011 +0100 arm: at91: Cleanup irq chip Avoid the whole lazy disable dance in the demux handler by providing a irq_disable() callback. Use the proper accessor functions and tidy up gpio_irq_handler() Signed-off-by: Thomas Gleixner commit 5093aec872e5be7a55d8dd2b639e8a3818dc19db Author: Thomas Gleixner Date: Thu Mar 24 12:47:04 2011 +0100 arm: davinci: Cleanup irq chip code Make use of the new functionality which ensures that irq_set_type is called with the chip masked. Unmask is only done when the interrupt is not disabled. Retrieve the trigger type from irq_data in unmask Signed-off-by: Thomas Gleixner commit d1735a2ebd8868ee9b5bb419860e633f0f839042 Author: Thomas Gleixner Date: Thu Mar 24 12:45:56 2011 +0100 arm: ep93xx: Use proper irq accessor functions No need to write the flow type. Core code does already. Signed-off-by: Thomas Gleixner commit a0b0f5ac7816672534f3839672c38f027158b81f Author: Thomas Gleixner Date: Thu Mar 24 12:44:54 2011 +0100 arm: gemini: Use proper irq accessor functions Signed-off-by: Thomas Gleixner commit eb2d7188f9bf68523248c45f4986313011389f5f Author: Thomas Gleixner Date: Thu Mar 24 12:43:25 2011 +0100 arm: mxc: Use generic_handle_irq() Signed-off-by: Thomas Gleixner commit ce4ed256b8c2e67f6743cdb9a5ac1904ff9d2f0d Author: Thomas Gleixner Date: Thu Mar 24 12:42:50 2011 +0100 arm: vt8500: Use proper irq accessors Signed-off-by: Thomas Gleixner commit 70c4fa2265dde6570fe5bd300fe56986190d7c8c Author: Thomas Gleixner Date: Thu Mar 24 12:41:27 2011 +0100 arm: msm: Use proper irq accessor functions Signed-off-by: Thomas Gleixner commit 8c04a1769f9efa6e072114229b1714ddc0c86ad1 Author: Thomas Gleixner Date: Thu Mar 24 12:40:15 2011 +0100 arm: plat-omap: Cleanup irq_desc access 1) Core code stores the flow type already 2) Flow type is accessible in irq_data Signed-off-by: Thomas Gleixner commit d1118f68b66ef6e0f36c9887c504462f2ec02d0d Author: Thomas Gleixner Date: Thu Mar 24 12:38:50 2011 +0100 arm: nomadik: Use local irq state Store the enabled mask in the local state, so there is no need to fiddle in the irq descriptor. Signed-off-by: Thomas Gleixner commit e0fc5b3226cc5668afc8a1277f79a271ec5ffcb5 Author: Thomas Gleixner Date: Thu Mar 24 12:38:17 2011 +0100 arm: stmp3xxx: Use generic_handle_irq() Signed-off-by: Thomas Gleixner commit 7222f3912fe3f00cdca0a6db16708af281ff97b6 Author: Thomas Gleixner Date: Thu Mar 24 12:36:46 2011 +0100 arm: plat-samsung: Use proper irq accessor functions Signed-off-by: Thomas Gleixner commit e83bbb115e3afc87bdb1d375d33bcfe910920002 Author: Thomas Gleixner Date: Thu Mar 24 12:35:19 2011 +0100 arm: Cleanup irq_desc access Use the proper wrappers and use the flow type in irq_data. Signed-off-by: Thomas Gleixner commit cf8d1581c46254d286c51d12154196f7b94c46d2 Author: Thomas Gleixner Date: Thu Mar 24 11:58:31 2011 +0100 arm: msm: Convert to new irq chip functions Signed-off-by: Thomas Gleixner commit 1b7a2d90c83bec624ac89f0642cb57bed17a2d3d Author: Thomas Gleixner Date: Mon Feb 7 22:30:49 2011 +0100 arm: Use irq flag setter function Use the proper accessor function instead of fiddling in the status bits directly. Signed-off-by: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org commit 1475b85d08b51b5ee2b7b426247d3ef3f531eafe Author: Thomas Gleixner Date: Tue Mar 22 17:11:09 2011 +0100 arm: Use genirq lockdep helper to set lock class Remove the open coded access to irq_desc which will fail on sparse irq and use the proper wrappers. Signed-off-by: Thomas Gleixner commit b0f18edaf6ee4e6fac89cae63a90bd38ad2a3418 Author: Thomas Gleixner Date: Wed Feb 9 16:46:14 2011 +0100 arm: tegra: Remove unused bogus irq enable/disable magic The core code handles thees already. Signed-off-by: Thomas Gleixner Cc: Colin Cross Cc: linux-tegra@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org commit 1738209a1500a10fe3cce0b11b81b5bb1c6dffbe Author: Thomas Gleixner Date: Mon Mar 28 10:54:40 2011 +0200 arm: h720x: Fix irq conversion fallout The conversion missed, that one of the irq functions is called from the init code. Split it out, so the irq number based call works. Signed-off-by: Thomas Gleixner commit 4fe25e3898ec53de322f32b67afa2be872f8ed21 Author: Thomas Gleixner Date: Mon Mar 28 13:12:20 2011 +0200 arm: nomadik: Remove non existing cpu id check Signed-off-by: Thomas Gleixner commit 504f1dfeccb3f523a3faefb0802016c818efa5fb Author: Thomas Gleixner Date: Mon Mar 28 12:11:46 2011 +0200 arm: ns9xxx: Remove non exisiting machine checks The machine id cleanup missed to remove the checks for now removed ids. Signed-off-by: Thomas Gleixner commit a40bd62153db5031f2afacd1615be8759684ce18 Author: Thomas Gleixner Date: Mon Mar 28 11:26:09 2011 +0200 arm: dove: Use correct GPIO_BASE and remove orion_gpio_init() leftover commit 9eac6d0 (ARM: Remove dependency of plat-orion GPIO code on mach directory includes) missed to convert one instance of DOVE_GPIO_VIRT_BASE and left the orion_gpio_init() in mpp.c Fix it up. Signed-off-by: Thomas Gleixner commit a68e5e0b9f744e0c884db8fcba8d365f6724b4cc Author: Thomas Gleixner Date: Mon Mar 28 12:32:39 2011 +0200 arm: at91: at572d940hf: Fix SDRAMC define That wants to be AT91_SDRAMC0 Signed-off-by: Thomas Gleixner commit f2e0bf2181e4117fa7319be2c9249df968ad9096 Author: Thomas Gleixner Date: Mon Mar 28 11:25:40 2011 +0200 arm: footbridge: Make cksrc_dc21285_disable() void This clocksource function needs to be void. Signed-off-by: Thomas Gleixner commit 11f2cde1165b56c88701954088437a556ddff07f Author: Thomas Gleixner Date: Sun Mar 27 19:45:00 2011 +0200 arm: bios32: Remove non exisiting machine code The id removal left this machine check in which breaks the build on some platforms. Remove it. Signed-off-by: Thomas Gleixner commit 7fff4beb311dfab4f18ff2cd64f78ec89296a39a Author: Anithra P Janakiraman Date: Mon Mar 28 14:29:19 2011 -0700 watchdog: softdog.c: enhancement to optionally invoke panic instead of reboot on timer expiry This is needed for determining the reason for failure when a softdog timeout occurs. We use softdog to watch for critical application failures and at the minimum a snapshot of the system would help to determine the cause. In such a scenario the application could fail but there isn't a softlockup as such, hence the detect softlockup feature does not help. The patch adds a module parameter soft_panic which when set to 1 causes softdog to invoke panic instead of reboot when the softdog timer expires. By invoking panic we execute kdump if it is configured and the vmcore generated by kdump should provide atleast a minimal idea of the reason for failure. Based on an original patch by Ken Sugawara Signed-off-by: Anithra P J Reviewed-by: WANG Cong Acked-by: Alan Cox Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 708d42472fba9a661a85ce12006c87ba3172a37e Author: Randy Dunlap Date: Thu Mar 24 13:32:44 2011 -0700 watchdog: fix nv_tco section mismatch Fix section mismatch warning: Mark the called nv_tco_getdevice() as __devinit, just like its caller. WARNING: drivers/watchdog/nv_tco.o(.devinit.text+0x16): Section mismatch in reference from the function nv_tco_init() to the function .init.text:nv_tco_getdevice() The function __devinit nv_tco_init() references a function __init nv_tco_getdevice(). If nv_tco_getdevice is only used by nv_tco_init then annotate nv_tco_getdevice with a matching annotation. Signed-off-by: Randy Dunlap Signed-off-by: Wim Van Sebroeck commit 90d241edd13bdeef70f264b569f7e150bf23621e Author: Yinghai Lu Date: Wed Mar 16 20:01:07 2011 -0700 watchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase. Stefano found SP5100 TCO watchdog driver using wrong address. [ 9.148536] SP5100 TCO timer: SP5100 TCO WatchDog Timer Driver v0.01 [ 9.148628] DEBUG __ioremap_caller WARNING address=b8fe00 size=8 valid=1 reserved=1 and e820 said that range is RAM. We should check if we can use that reading out. BIOS could just program wrong address there. Reported-by: Stefano Stabellini Signed-off-by:Yinghai Lu Acked-by: Mike Waychison Tested-by: Konrad Rzeszutek Wilk Signed-off-by: Wim Van Sebroeck Cc: stable commit f712eacf02ecfbf4f1686addb8c569841549b0b7 Author: Julia Lawall Date: Sat Feb 26 17:34:39 2011 +0100 watchdog: Convert release_resource to release_region/release_mem_region Request_mem_region should be used with release_mem_region, not release_resource. In pnx4008_wdt.c, a missing clk_put is added as well. The semantic match that finds the first problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,E; @@ *x = request_mem_region(...) ... when != release_mem_region(x) when != x = E * release_resource(x); // Signed-off-by: Julia Lawall Signed-off-by: Wim Van Sebroeck Cc: stable commit f72401e94d159bc4b2beab51d74e956da2c32e0a Author: Julia Lawall Date: Sat Feb 26 17:34:38 2011 +0100 watchdog: s3c2410_wdt.c: Convert release_resource to release_region/release_mem_region Request_mem_region should be used with release_mem_region, not release_resource. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,E; @@ *x = request_mem_region(...) ... when != release_mem_region(x) when != x = E * release_resource(x); // Signed-off-by: Julia Lawall Signed-off-by: Wim Van Sebroeck Cc: stable commit cd22c0e44b105aecd78e5f9e77abab3a1b8dc00c Author: Thomas Gleixner Date: Tue Mar 29 11:36:05 2011 +0200 genirq: Fix harmless typo The late night fixup missed to convert the data type from irq_desc to irq_data, which results in a harmless but annoying warning. Signed-off-by: Thomas Gleixner commit 02aadf72fe2c83f145e3437734e66be53abae481 Author: Steffen Klassert Date: Mon Mar 28 19:48:09 2011 +0000 xfrm: Restrict extended sequence numbers to esp The IPsec extended sequence numbers are fully implemented just for esp. So restrict the usage to esp until other protocols have support too. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit e2b19125e94124daaeda1ddcf9b85b04575ad86f Author: Steffen Klassert Date: Mon Mar 28 19:47:30 2011 +0000 xfrm: Check for esn buffer len in xfrm_new_ae In xfrm_new_ae() we may overwrite the allocated esn replay state buffer with a wrong size. So check that the new size matches the original allocated size and return an error if this is not the case. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit af2f464e326ebad57284cfdecb03f1606e89bbc7 Author: Steffen Klassert Date: Mon Mar 28 19:46:39 2011 +0000 xfrm: Assign esn pointers when cloning a state When we clone a xfrm state we have to assign the replay_esn and the preplay_esn pointers to the state if we use the new replay detection method. To this end, we add a xfrm_replay_clone() function that allocates memory for the replay detection and takes over the necessary values from the original state. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 36ae0148dbb6b9e15d8f067bb7523fd2b765a6af Author: Steffen Klassert Date: Mon Mar 28 19:45:52 2011 +0000 xfrm: Move the test on replay window size into the replay check functions As it is, the replay check is just performed if the replay window of the legacy implementation is nonzero. So we move the test on a nonzero replay window inside the replay check functions to be sure we are testing for the right implementation. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 72f49050ba18959472aac723cd9d094bc3547e89 Author: Mike Frysinger Date: Sun Mar 27 22:33:13 2011 +0000 netdev: bfin_mac: document TE setting in RMII modes The current code sometimes generates build warnings due to how it checks the silicon revision, so clean it up and properly document things. Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit bc8d7da3f19191f86dcc8274cf1a3f2d6aeb0aaa Author: Balaji G Date: Sun Mar 27 17:15:19 2011 +0000 drivers net: Fix declaration ordering in inline functions. The correct usage should be "static inline void" instead of "static void inline" Signed-off-by: G.Balaji Signed-off-by: David S. Miller commit c211c9698920d2b114bd8fbf913c8bdab3918461 Author: Anton Blanchard Date: Sun Mar 27 16:50:41 2011 +0000 cxgb3: Apply interrupt coalescing settings to all queues While testing the performance of different receive interrupt coalescing settings on a single stream TCP benchmark, I noticed two very different results. With rx-usecs=50, most of the time a connection would hit 8280 Mbps but once in a while it would hit 9330 Mbps. It turns out we are only applying the interrupt coalescing settings to the first queue and whenever the rx hash would direct us onto that queue we ran faster. With this patch applied and rx-usecs=50, I get 9330 Mbps consistently. Signed-off-by: Anton Blanchard Acked-by: Divy Le Ray Signed-off-by: David S. Miller commit a715dea3c8e9ef2771c534e05ee1d36f65987e64 Author: Anton Blanchard Date: Sun Mar 27 14:57:26 2011 +0000 net: Always allocate at least 16 skb frags regardless of page size When analysing performance of the cxgb3 on a ppc64 box I noticed that we weren't doing much GRO merging. It turns out we are limited by the number of SKB frags: #define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2) With a 4kB page size we have 18 frags, but with a 64kB page size we only have 3 frags. I ran a single stream TCP bandwidth test to compare the performance of Signed-off-by: David S. Miller commit 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f Author: Martin K. Petersen Date: Mon Mar 28 20:09:12 2011 -0400 md: Fix integrity registration error when no devices are capable We incorrectly returned -EINVAL when none of the devices in the array had an integrity profile. This in turn prevented mdadm from starting the metadevice. Fix this so we only return errors on mismatched profiles and memory allocation failures. Reported-by: Giacomo Catenazzi Reported-by: Thomas Gleixner Signed-off-by: Martin K. Petersen Signed-off-by: Linus Torvalds commit 7de8e5737df31a6826015a65135ed8f0a32bb2c4 Merge: b5b4bc3 85cd6da Author: Linus Torvalds Date: Mon Mar 28 17:51:27 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: selinux: Fix regression for Xorg commit b5b4bc32b68d711f8b79a1d60e35892d761417c7 Author: Andres Salomon Date: Mon Mar 28 17:22:30 2011 -0700 ARM: mx51_efika: fix build error due to new mfd changes MFD changes in 4ec1b54c ('mfd: mfd_cell is now implicitly available to mc13xxx drivers') changed the mc13xxx_platform_data struct layout. At the time all users were changed, but this driver was introduced in another tree at the same time. This updates the mc13xxx_platform_data user, fixing a build error. Signed-off-by: Andres Salomon Signed-off-by: Linus Torvalds commit e5217fb8ae5527e95cff9474f7b3c0d8e3a35fea Merge: 5ede9dd 8ec4ad2 0ef5ca1 Author: Linus Torvalds Date: Mon Mar 28 17:39:54 2011 -0700 Merge branches 'irq-cleanup-for-linus' and 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: vlynq: Convert irq functions * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq; Fix cleanup fallout genirq: Fix typo and remove unused variable genirq: Fix new kernel-doc warnings genirq: Add setter for AFFINITY_SET in irq_data state genirq: Provide setter inline for IRQD_IRQ_INPROGRESS genirq: Remove handle_IRQ_event arm: Ns9xxx: Remove private irq flow handler powerpc: cell: Use the core flow handler genirq: Provide edge_eoi flow handler genirq: Move INPROGRESS, MASKED and DISABLED state flags to irq_data genirq: Split irq_set_affinity() so it can be called with lock held. genirq: Add chip flag for restricting cpu_on/offline calls genirq: Add chip hooks for taking CPUs on/off line. genirq: Add irq disabled flag to irq_data state genirq: Reserve the irq when calling irq_set_chip() commit 4910ac6c526d2868adcb5893e0c428473de862b5 Author: David S. Miller Date: Mon Mar 28 16:51:15 2011 -0700 ipv4: Don't ip_rt_put() an error pointer in RAW sockets. Reported-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 0ef5ca1e1f0de71300142b8f730f26ded6a0c2f3 Author: Thomas Gleixner Date: Mon Mar 28 21:59:37 2011 +0200 genirq; Fix cleanup fallout I missed the CONFIG_GENERIC_PENDING_IRQ dependency in the affinity related functions and the IRQ_LEVEL propagation into irq_data state. Did not pop up on my main test platforms. :( Signed-off-by: Thomas Gleixner Tested-by: David Daney commit 85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f Author: Stephen Smalley Date: Fri Mar 25 10:13:43 2011 -0400 selinux: Fix regression for Xorg Commit 6f5317e730505d5cbc851c435a2dfe3d5a21d343 introduced a bug in the handling of userspace object classes that is causing breakage for Xorg when XSELinux is enabled. Fix the bug by changing map_class() to return SECCLASS_NULL when the class cannot be mapped to a kernel object class. Reported-by: "Justin P. Mattock" Signed-off-by: Stephen Smalley Signed-off-by: James Morris commit 5ede9ddfba424b5dad96e7ccd55607875a64ff6c Author: Stephen Rothwell Date: Mon Mar 28 16:24:29 2011 -0700 memstick: make enable_dma less generic in r592 Fixes this build error: drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here Signed-off-by: Stephen Rothwell Cc: Andrew Morton Cc: FUJITA Tomonori Cc: Alex Dubov Acked-by: Maxim Levitsky Signed-off-by: Linus Torvalds commit c5850150d0b9ae16840c5d9846f9d5a759996a15 Merge: 243b422 0e6e847 Author: Linus Torvalds Date: Mon Mar 28 15:51:02 2011 -0700 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: stop using the page cache to back the buffer cache xfs: register the inode cache shrinker before quotachecks xfs: xfs_trans_read_buf() should return an error on failure xfs: introduce inode cluster buffer trylocks for xfs_iflush vmap: flush vmap aliases when mapping fails xfs: preallocation transactions do not need to be synchronous Fix up trivial conflicts in fs/xfs/linux-2.6/xfs_buf.c due to plug removal. commit 243b422af9ea9af4ead07a8ad54c90d4f9b6081a Author: Roland Dreier Date: Mon Mar 28 14:13:35 2011 -0700 Relax si_code check in rt_sigqueueinfo and rt_tgsigqueueinfo Commit da48524eb206 ("Prevent rt_sigqueueinfo and rt_tgsigqueueinfo from spoofing the signal code") made the check on si_code too strict. There are several legitimate places where glibc wants to queue a negative si_code different from SI_QUEUE: - This was first noticed with glibc's aio implementation, which wants to queue a signal with si_code SI_ASYNCIO; the current kernel causes glibc's tst-aio4 test to fail because rt_sigqueueinfo() fails with EPERM. - Further examination of the glibc source shows that getaddrinfo_a() wants to use SI_ASYNCNL (which the kernel does not even define). The timer_create() fallback code wants to queue signals with SI_TIMER. As suggested by Oleg Nesterov , loosen the check to forbid only the problematic SI_TKILL case. Reported-by: Klaus Dittrich Acked-by: Julien Tinnes Cc: Signed-off-by: Roland Dreier Signed-off-by: Linus Torvalds commit 5847098cd896c92819800e17e983bf6530035209 Merge: 7f5fe3e 33dc0ad Author: Linus Torvalds Date: Mon Mar 28 15:44:06 2011 -0700 Merge branch 'for-linus' of git://www.jni.nu/cris * 'for-linus' of git://www.jni.nu/cris: Correct auto-restart of syscalls via restartblock CRISv10: Fix return before mutex_unlock in pcf8563 Drop the CRISv32 version of pcf8563 commit 7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734 Merge: 212a17a b5695d0 Author: Linus Torvalds Date: Mon Mar 28 15:43:25 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6: eCryptfs: write lock requested keys eCryptfs: move ecryptfs_find_auth_tok_for_sig() call before mutex_lock eCryptfs: verify authentication tokens before their use eCryptfs: modified size of keysig in the ecryptfs_key_sig structure eCryptfs: removed num_global_auth_toks from ecryptfs_mount_crypt_stat eCryptfs: ecryptfs_keyring_auth_tok_for_sig() bug fix eCryptfs: Unlock page in write_begin error path ecryptfs: modify write path to encrypt page in writepage eCryptfs: Remove ECRYPTFS_NEW_FILE crypt stat flag eCryptfs: Remove unnecessary grow_file() function commit 212a17ab878305600e607f637d2d8a49d9f7ef25 Merge: baaca1a d9d0487 Author: Linus Torvalds Date: Mon Mar 28 15:31:05 2011 -0700 Merge branch 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (45 commits) Btrfs: fix __btrfs_map_block on 32 bit machines btrfs: fix possible deadlock by clearing __GFP_FS flag btrfs: check link counter overflow in link(2) btrfs: don't mess with i_nlink of unlocked inode in rename() Btrfs: check return value of btrfs_alloc_path() Btrfs: fix OOPS of empty filesystem after balance Btrfs: fix memory leak of empty filesystem after balance Btrfs: fix return value of setflags ioctl Btrfs: fix uncheck memory allocations btrfs: make inode ref log recovery faster Btrfs: add btrfs_trim_fs() to handle FITRIM Btrfs: adjust btrfs_discard_extent() return errors and trimmed bytes Btrfs: make btrfs_map_block() return entire free extent for each device of RAID0/1/10/DUP Btrfs: make update_reserved_bytes() public btrfs: return EXDEV when linking from different subvolumes Btrfs: Per file/directory controls for COW and compression Btrfs: add datacow flag in inode flag btrfs: use GFP_NOFS instead of GFP_KERNEL Btrfs: check return value of read_tree_block() btrfs: properly access unaligned checksum buffer ... Fix up trivial conflicts in fs/btrfs/volumes.c due to plug removal in the block layer. commit baaca1a61497d97cec595fedce03b0a23b983e64 Merge: bc5bbc4 72ed73c Author: Linus Torvalds Date: Mon Mar 28 15:16:10 2011 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (81 commits) xo15-ebook: Remove device.wakeup_count ips: use interruptible waits in ips-monitor acer-wmi: does not poll device status when WMI event is available acer-wmi: does not set persistence state by rfkill_init_sw_state platform-drivers: x86: fix common misspellings acer-wmi: use pr_ for messages asus-wmi: potential NULL dereference in show_call() asus-wmi: signedness bug in read_brightness() platform-driver-x86: samsung-laptop: make dmi_check_cb to return 1 instead of 0 platform-driver-x86: fix wrong merge for compal-laptop.c msi-laptop: use pr_ for messages Platform: add Samsung Laptop platform driver acer-wmi: Fix WMI ID acer-wmi: deactive mail led when power off msi-laptop: send out touchpad on/off key acer-wmi: set the touchpad toggle key code to KEY_TOUCHPAD_TOGGLE platform-driver-x86: intel_mid_thermal: fix unterminated platform_device_id table sony-laptop: potential null dereference sony-laptop: handle allocation failures sony-laptop: return negative on failure in sony_nc_add() ... commit bc5bbc4541c4098603edcf9b0b960a71741e79de Merge: 32836e0 fe67dfc Author: Linus Torvalds Date: Mon Mar 28 15:14:45 2011 -0700 Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: mach-ux500: configure board for the TPS61052 regulator v2 mach-ux500: provide ab8500 init vector mach-ux500: board support for AB8500 GPIO driver gpio: driver for 42 AB8500 GPIO pins commit 32836e082b25f17e7b09f11335b34b039c7568d2 Merge: 036a982 3e1d987 Author: Linus Torvalds Date: Mon Mar 28 15:08:48 2011 -0700 Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: Suspend: Fix dependency of ARCH_SUSPEND_POSSIBLE ARM: SAMSUNG: Fix CPU idmask ARM: EXYNOS4: Fix addruart macro ARM: EXYNOS4: Fix smsc9215 irq polarity on SMDKC210 ARM: EXYNOS4: Fix smsc9215 irq polarity on SMDKV310 ARM: EXYNOS4: Fix build warning on regarding SATA_AHCI_PLATFORM ARM: S5PV210: Remove duplicated inclusion ARM: S5PV210: Fix security engine interrupt names ARM: S5P64X0: Fix iodesc array size for S5P6450 commit 036a98263a30930a329e7bb184d5e77f27358e40 Merge: b34e138 60af520 Author: Linus Torvalds Date: Mon Mar 28 13:07:49 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: aesni-intel - fixed problem with packets that are not multiple of 64bytes commit b34e138e8bcbdfd8da0c4b063a689d54e9ba9f16 Merge: 445aef3 324808c Author: Linus Torvalds Date: Mon Mar 28 13:06:32 2011 -0700 Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score * 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: score: Use generic show_interrupts() score: Convert to new irq function names score: lost a semicolon in asm/irqflags.h score: Select GENERIC_HARDIRQS_NO_DEPRECATED score: Convert irq_chip to new functions commit 445aef374594207b278477dfd98fc5d1498d353a Author: Matthew Garrett Date: Mon Mar 28 12:46:02 2011 +0000 acpi: Remove sysfs_create_link from video driver The acpi video driver attempts to explicitly create a sysfs link between the acpi device and the associated PCI device. However, we're now also doing this from the backlight core, which means that we get a backtrace caused by a duplicate file. Remove the code and leave it up to the backlight core. Reported-by: Jeff Chua Signed-off-by: Matthew Garrett Acked-by: Rafael J. Wysocki Tested-by: Alessandro Suardi Signed-off-by: Linus Torvalds commit 03e4970c10151c5fb25ddd7e9a142d63c6a8d058 Merge: 1788c20 272b62c Author: Linus Torvalds Date: Mon Mar 28 13:03:31 2011 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (39 commits) Treat writes as new when holes span across page boundaries fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS. ocfs2/dlm: Move kmalloc() outside the spinlock ocfs2: Make the left masklogs compat. ocfs2: Remove masklog ML_AIO. ocfs2: Remove masklog ML_UPTODATE. ocfs2: Remove masklog ML_BH_IO. ocfs2: Remove masklog ML_JOURNAL. ocfs2: Remove masklog ML_EXPORT. ocfs2: Remove masklog ML_DCACHE. ocfs2: Remove masklog ML_NAMEI. ocfs2: Remove mlog(0) from fs/ocfs2/dir.c ocfs2: remove NAMEI from symlink.c ocfs2: Remove masklog ML_QUOTA. ocfs2: Remove mlog(0) from quota_local.c. ocfs2: Remove masklog ML_RESERVATIONS. ocfs2: Remove masklog ML_XATTR. ocfs2: Remove masklog ML_SUPER. ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c ... Fix up trivial conflict in fs/ocfs2/super.c commit a6aeddd1c4e464a2150f97ca2d1c3d68cfbd9296 Author: Thomas Gleixner Date: Mon Mar 28 20:28:56 2011 +0200 genirq: Fix typo and remove unused variable Sigh, I'm overworked. Signed-off-by: Thomas Gleixner commit 30398bf6c684a77274dbdabf7efc1f24e4a99028 Author: Randy Dunlap Date: Fri Mar 18 09:33:56 2011 -0700 genirq: Fix new kernel-doc warnings Fix new irq-related kernel-doc warnings in 2.6.38: Warning(kernel/irq/manage.c:149): No description found for parameter 'mask' Warning(kernel/irq/manage.c:149): Excess function parameter 'cpumask' description in 'irq_set_affinity' Warning(include/linux/irq.h:161): No description found for parameter 'state_use_accessors' Warning(include/linux/irq.h:161): Excess struct/union/enum/typedef member 'state_use_accessor' description in 'irq_data' Signed-off-by: Randy Dunlap LKML-Reference: <20110318093356.b939558d.randy.dunlap@oracle.com> Signed-off-by: Thomas Gleixner commit 8ec4ad2bebd1dd7e782bd1a1ac4c5e17ceb2ff81 Author: Thomas Gleixner Date: Fri Mar 25 21:56:37 2011 +0100 vlynq: Convert irq functions Convert to the new irq_chip functions and the new namespace. Signed-off-by: Thomas Gleixner Acked-by: Florian Fainelli LKML-Reference: commit 272b62c1f0f6f742046e45b50b6fec98860208a0 Author: Goldwyn Rodrigues Date: Thu Feb 17 09:44:40 2011 -0600 Treat writes as new when holes span across page boundaries When a hole spans across page boundaries, the next write forces a read of the block. This could end up reading existing garbage data from the disk in ocfs2_map_page_blocks. This leads to non-zero holes. In order to avoid this, mark the writes as new when the holes span across page boundaries. Signed-off-by: Goldwyn Rodrigues Signed-off-by: jlbec commit 99bdc3880c611c7f2061fbd5372ef81b40217e26 Merge: ed59992 b4e1b7e Author: Joel Becker Date: Mon Mar 28 09:44:26 2011 -0700 Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix commit ed59992e8d91b70053c53d846a76f7e1ac000454 Author: Rakib Mullick Date: Fri Mar 18 17:01:08 2011 +0600 fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS. When CONFIG_DEBUG_FS=y and CONFIG_OCFS2_FS_STATS=n, we get the following warning: fs/ocfs2/cluster/tcp.c:213:16: warning: ‘o2net_get_func_run_time’ defined but not used Since o2net_get_func_run_time is only called from o2net_update_recv_stats, so move it under CONFIG_OCFS2_FS_STATS. Signed-off-by: Rakib Mullick Signed-off-by: jlbec commit ee38c04b58983a236b43bae71b2415d38bceaf75 Author: Thomas Gleixner Date: Mon Mar 28 17:11:13 2011 +0200 genirq: Add setter for AFFINITY_SET in irq_data state Some archs want to prevent the default affinity being set on their chips in the reqeust_irq() path. Signed-off-by: Thomas Gleixner commit 9cff60dfc3d54b60bc069627cee5624bfaa3f823 Author: Thomas Gleixner Date: Mon Mar 28 16:41:14 2011 +0200 genirq: Provide setter inline for IRQD_IRQ_INPROGRESS Special function for demultiplexing handlers which can be disabled via disable_irq(). Signed-off-by: Thomas Gleixner commit 33b054b867b84015173a38d9cd9ff513b6498818 Author: Thomas Gleixner Date: Mon Mar 28 16:27:31 2011 +0200 genirq: Remove handle_IRQ_event Last user gone. Signed-off-by: Thomas Gleixner commit 6829310548a76d343205029bb41c14e75bf6a7fb Author: Thomas Gleixner Date: Wed Feb 2 21:41:27 2011 +0000 arm: Ns9xxx: Remove private irq flow handler handle_prio_irq is almost identical with handle_fasteoi_irq. The subtle differences are 1) The handler checks for IRQ_DISABLED after the device handler has been called. In case it's set it masks the interrupt. 2) When the handler sees IRQ_DISABLED on entry it masks the interupt in the same way as handle_fastoei_irq, but does not set the IRQ_PENDING flag. 3) Instead of gracefully handling a recursive interrupt it crashes the kernel. #1 is just relevant when a device handler calls disable_irq_nosync() and it does not matter whether we mask the interrupt right away or not. We handle lazy masking for disable_irq anyway, so there is no real reason to have this extra mask in place. #2 will prevent the resend of a pending interrupt, which can result in lost interrupts for edge type interrupts. For level type interrupts the resend is a noop in the generic code. According to the datasheet all interrupts are level type, so marking them as such will result in the exact same behaviour as the private handle_prio_irq implementation. #3 is just stupid. Crashing the kernel instead of handling a problem gracefully is just wrong. With the current semantics- all handlers run with interrupts disabled - this is even more wrong. Rename ack to eoi, remove the unused mask_ack, switch to handle_fasteoi_irq and remove the private function. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Acked-by: Uwe Kleine-Koenig Cc: linux-arm-kernel@lists.infradead.org LKML-Reference: <20110202212552.299898447@linutronix.de> commit f9ba4475f95b135e6f68e74d59bba92fd35ca835 Author: Thomas Gleixner Date: Mon Mar 28 16:23:12 2011 +0200 powerpc: cell: Use the core flow handler The core handler is a full equivalent replacement. Signed-off-by: Thomas Gleixner commit 0521c8fbb3da45c2a58cd551ca6e9644983f6028 Author: Thomas Gleixner Date: Mon Mar 28 16:13:24 2011 +0200 genirq: Provide edge_eoi flow handler This is a replacment for the cell flow handler which is in the way of cleanups. Must be selected to avoid general bloat. Signed-off-by: Thomas Gleixner commit 32f4125ebffee4f3c4dbc6a437fc656129eb9e60 Author: Thomas Gleixner Date: Mon Mar 28 14:10:52 2011 +0200 genirq: Move INPROGRESS, MASKED and DISABLED state flags to irq_data We really need these flags for some of the interrupt chips. Move it from internal state to irq_data and provide proper accessors. Signed-off-by: Thomas Gleixner Cc: David Daney commit 1788c208aab15f9d9d1d24cff0d0c64b5c73bbee Merge: 15b7cf1 a271c5a Author: Linus Torvalds Date: Mon Mar 28 07:52:58 2011 -0700 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Ensure that rpc_release_resources_task() can be called twice. NFS: Don't leak RPC clients in NFSv4 secinfo negotiation NFS: Fix a hang in the writeback path commit 15b7cf1416c0e3ae6163ade3349d717fe2729952 Author: Andres Salomon Date: Sun Mar 27 21:26:03 2011 -0700 MFD: allow cs5535-mfd to build on X86 only Stephen ran into the following build error: drivers/mfd/cs5535-mfd.c:30:22: error: asm/olpc.h: No such file or directory olpc.h exists only on x86 (and in the future, ARM). Rather than wrapping the include in an #ifdef, just change cs5535-mfd to only build on x86. Reported-by: Stephen Rothwell Signed-off-by: Andres Salomon Signed-off-by: Linus Torvalds commit 7e599e6e62759e057e902fcf9a05ba24f6155bcd Author: Linus Torvalds Date: Mon Mar 28 07:42:58 2011 -0700 drbd: fix up merge error In commit 95a0f10cddbf ("drbd: store in-core bitmap little endian, regardless of architecture") drbd had made the sane choice to use little-endian bitmap functions everywhere. However, it used the horrible old functions names from , that were never really meant to be exported. In the meantime, things got cleaned up, and in commit c4945b9ed472 ("asm-generic: rename generic little-endian bitops functions") we renamed the LE bitops to something sane, exactly so that they could be used in random code without people gouging their eyes out when seeing the crazy jumble of letters that were the old internal names. As a result the drbd thing merged cleanly (commit 8d49a77568d1: "Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block"), since there was no data conflict - but the end result obviously doesn't actually compile. Reported-and-tested-by: Ingo Molnar Cc: Jens Axboe Cc: Stephen Rothwell Signed-off-by: Linus Torvalds commit 022b483596fabb5d1320aa4b76f43a754063f37e Author: Guennadi Liakhovetski Date: Mon Mar 28 09:16:33 2011 +0200 mmc: SDHI should depend on SUPERH || ARCH_SHMOBILE Fix build breakage on platforms, not providing readsw and writesw functions, e.g., on x86(_64). Reported-by: Stephen Rothwell Signed-off-by: Guennadi Liakhovetski Signed-off-by: Chris Ball commit b554cb426a955a267dba524f98f99e29bc947643 Author: Graf Yang Date: Mon Mar 28 12:53:29 2011 +0100 NOMMU: support SMP dynamic percpu_alloc The percpu code requires more functions to be implemented in the mm core which nommu currently does not provide. So add inline implementations since these are largely meaningless on nommu systems. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger Signed-off-by: David Howells Acked-by: Greg Ungerer commit eac522ef438f8ea173569fd0469371bc5d317947 Author: David Howells Date: Mon Mar 28 12:53:29 2011 +0100 NOMMU: percpu should use is_vmalloc_addr(). per_cpu_ptr_to_phys() uses VMALLOC_START and VMALLOC_END to determine if an address is in the vmalloc() region or not. This is incorrect on NOMMU as there is no real vmalloc() capability (vmalloc() is emulated by kmalloc()). The correct way to do this is to use is_vmalloc_addr(). This encapsulates the vmalloc() region test in MMU mode and just returns 0 in NOMMU mode. On FRV in NOMMU mode, the percpu compilation fails without this patch: mm/percpu.c: In function 'per_cpu_ptr_to_phys': mm/percpu.c:1011: error: 'VMALLOC_START' undeclared (first use in this function) mm/percpu.c:1011: error: (Each undeclared identifier is reported only once mm/percpu.c:1011: error: for each function it appears in.) mm/percpu.c:1012: error: 'VMALLOC_END' undeclared (first use in this function) mm/percpu.c:1018: warning: control reaches end of non-void function Signed-off-by: David Howells commit 72ed73c3f0801e860ee27e53ab6aaf47941ba324 Merge: 883ae79 bd1573a Author: Matthew Garrett Date: Mon Mar 28 06:47:38 2011 -0400 Merge branch 'x86-platform-next' into x86-platform commit bd1573a5546b4351b5d042f1e4cd631ea67cc6b0 Author: Matthew Garrett Date: Mon Mar 28 06:40:23 2011 -0400 xo15-ebook: Remove device.wakeup_count This is handled automatically now. Signed-off-by: Matthew Garrett commit a3424216e4935221fdaa5ca3c26e024f11297164 Author: Jesse Barnes Date: Mon Mar 28 06:36:30 2011 -0400 ips: use interruptible waits in ips-monitor This is what I intended to do since: 1) the driver handles variable waits just fine, and 2) interruptible waits aren't reported as load in the load avg. Reported-and-tested-by: Andreas Hartmann Signed-off-by: Jesse Barnes Signed-off-by: Matthew Garrett commit 70a9b9047aebd53ac38837a1046da52a2f8d9636 Author: Lee, Chun-Yi Date: Mon Mar 28 06:34:13 2011 -0400 acer-wmi: does not poll device status when WMI event is available Acer WMI hotkey event's result include current device status, just need sync the status to killswitch after acer-wmi driver receive hotkey event but not always poll device status. This is good for performance. But, if use EC raw mode, Acer BIOS will not emit wmi event and leave EC to control device status. So, still startup polling job when doesn't detect WMI event GUID or user choice to use ec_raw_mode. Tested on Acer TravelMate 8572 notebook. Cc: Carlos Corbacho Cc: Matthew Garrett Cc: Dmitry Torokhov Cc: Corentin Chary Cc: Thomas Renninger Signed-off-by: Lee, Chun-Yi Signed-off-by: Matthew Garrett commit 8215af019040ce9182728afee9642d8fdeb17f59 Author: Lee, Chun-Yi Date: Mon Mar 28 16:52:02 2011 +0800 acer-wmi: does not set persistence state by rfkill_init_sw_state Acer BIOS keeps devices state when system reboot, but reset to default device states (Wlan on, Bluetooth off, wwan on) if system cold boot. That means BIOS's initial state is not always real persistence. So, removed rfkill_init_sw_state because it sets initial state to persistence then replicate to other new killswitch when rfkill-input enabled. After removed it, acer-wmi set initial soft-block state after rfkill register, and doesn't allow set_block until rfkill initial finished. Reference: bko#31002 https://bugzilla.kernel.org/show_bug.cgi?id=31002 Cc: Carlos Corbacho Cc: Matthew Garrett Cc: Dmitry Torokhov Cc: Corentin Chary Cc: Oldřich JedliÄÂka Cc: Johannes Berg Signed-off-by: Lee, Chun-Yi Signed-off-by: Matthew Garrett commit c8440336fe376036e473554c30f7266987961734 Author: Lucas De Marchi Date: Thu Mar 17 17:18:22 2011 -0300 platform-drivers: x86: fix common misspellings Signed-off-by: Lucas De Marchi Signed-off-by: Matthew Garrett commit cae157026491d2e9a789b876a367dee7b17235cb Author: Lee, Chun-Yi Date: Wed Mar 16 18:52:36 2011 +0800 acer-wmi: use pr_ for messages acer-wmi: use pr_ for messages Cc: Carlos Corbacho Cc: Matthew Garrett Cc: Corentin Chary Cc: Dmitry Torokhov Signed-off-by: Lee, Chun-Yi Signed-off-by: Matthew Garrett commit a1d6086739c5b8f23a48e02e62b0e495321a2122 Author: Dan Carpenter Date: Tue Mar 15 10:07:37 2011 +0300 asus-wmi: potential NULL dereference in show_call() In the earlier check we assumed that "obj" could be NULL. I looked at some of the other places that call evaluate_object() and they check for NULL as well. Signed-off-by: Dan Carpenter Signed-off-by: Matthew Garrett commit 0986f25fbba8827762b35222bb45d2fbb2d72fa4 Author: Dan Carpenter Date: Tue Mar 15 10:06:23 2011 +0300 asus-wmi: signedness bug in read_brightness() "err" needs to be signed for the error handling to work. Signed-off-by: Dan Carpenter Signed-off-by: Matthew Garrett commit 2783658477205b0cf31e5c02d69214e36fe59aae Author: Axel Lin Date: Mon Mar 14 18:56:18 2011 +0800 platform-driver-x86: samsung-laptop: make dmi_check_cb to return 1 instead of 0 dmi_check_system() walks the table running matching functions until someone returns non zero or we hit the end. This patch makes dmi_check_cb to return 1 so dmi_check_system() return immediately when a match is found. Signed-off-by: Axel Lin Signed-off-by: Matthew Garrett commit 0e4510f7c9708304104c07e87b7e5e78fb1716d1 Author: Axel Lin Date: Mon Mar 14 18:53:14 2011 +0800 platform-driver-x86: fix wrong merge for compal-laptop.c I found the commit 80183a4b "compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0" has wrong patch merge. The original patch change the return value for dmi_check_cb(): https://lkml.org/lkml/2010/7/2/88 But commit 80183a4b changed the return value for set_backlight_level. Signed-off-by: Axel Lin Signed-off-by: Matthew Garrett commit bbe24fee22fa045a07ff7e926589ac722c7ee78d Author: Joey Lee Date: Wed Mar 16 01:55:19 2011 -0600 msi-laptop: use pr_ for messages msi-laptop: use pr_ for messages Cc: Carlos Corbacho Cc: Matthew Garrett Cc: Dmitry Torokhov Cc: Corentin Chary Signed-off-by: Lee, Chun-Yi Signed-off-by: Matthew Garrett commit 2d70b73ae5b85c9d13f5dfbb8fc4fd5edae633dc Author: Greg Kroah-Hartman Date: Fri Mar 11 12:41:19 2011 -0500 Platform: add Samsung Laptop platform driver This adds the samsung-laptop driver to the kernel. It now supports all known Samsung laptops that use the SABI interface. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Matthew Garrett commit 298f19b2547ba11a577a15ca329daa6f4bbf5ad8 Author: Pali Rohár Date: Fri Mar 11 12:36:43 2011 -0500 acer-wmi: Fix WMI ID This patch change WMI ID to upper characters. With this patch module acer-wmi is automatically loaded when WMI ID is detected. Signed-off-by: Pali Rohár Tested-by: Pali Rohár Signed-off-by: Matthew Garrett commit 9a0b74fd873005122145364d3dfe4e1c9da1dad2 Author: Pali Rohár Date: Sat Feb 26 21:18:58 2011 +0100 acer-wmi: deactive mail led when power off This patch deactive mail led when laptop is going to hibernete/suspend or power off. After resume from hibernate/suspend correctly restore mail led state. Signed-off-by: Pali Rohár Tested-by: Pali Rohár Signed-off-by: Matthew Garrett commit 143a4c0284dc2378b3ce78866b3548d90121d843 Author: Lee, Chun-Yi Date: Mon Mar 7 15:46:28 2011 +0800 msi-laptop: send out touchpad on/off key MSI BIOS's raw behavior is send out KEY_TOUCHPAD_TOGGLE key when user pressed touchpad hotkey. Actually, we can capture the real touchpad status by read 0xE4 EC address on MSI netbook/notebook. So, add msi-laptop input device for send out KEY_TOUCHPAD_ON or KEY_TOUCHPAD_OFF key when user pressed Fn+F3 touchpad hotkey. It leave userland applications to know the real touchpad status. Tested on MSI netbook U-100, U-115, U160(N051), U160DX, N014, N034 Tested on MSI notebook CR620 Cc: Carlos Corbacho Cc: Matthew Garrett Cc: Dmitry Torokhov Cc: Corentin Chary Signed-off-by: Lee, Chun-Yi Signed-off-by: Matthew Garrett commit 8941178efad900e48e44000208513a6426c74368 Author: Lee, Chun-Yi Date: Wed Mar 2 01:07:11 2011 +0800 acer-wmi: set the touchpad toggle key code to KEY_TOUCHPAD_TOGGLE Set the touchpad toggle key code from F22 to KEY_TOUCHPAD_TOGGLE, and userspace should use udev's key re-mapping facilities while X is unable to process keycodes above 255 to adjust to the keycode. Cc: Matthew Garrett Cc: Dmitry Torokhov Cc: Corentin Chary Signed-off-by: Lee, Chun-Yi Signed-off-by: Matthew Garrett commit 47ae4352bece7b617a084770495b993fcd1a2be5 Author: Axel Lin Date: Sat Feb 26 23:03:34 2011 +0800 platform-driver-x86: intel_mid_thermal: fix unterminated platform_device_id table The platform_device_id table is supposed to be zero-terminated. Signed-off-by: Axel Lin Signed-off-by: Matthew Garrett commit 200140bdb52b259380e9082e2a4f25a4ddbb5d68 Author: Dan Carpenter Date: Sun Feb 27 17:13:25 2011 +0300 sony-laptop: potential null dereference In the original code, if "device_enum" was NULL then it would dereference it when it printed the error message. Signed-off-by: Dan Carpenter Signed-off-by: Matthew Garrett commit 31f007598cc547ba3239524470386af8ae5f1c13 Author: Dan Carpenter Date: Sat Feb 26 15:55:24 2011 +0300 sony-laptop: handle allocation failures Return -ENOMEM if kzalloc() fails. The callers already handle error returns. Signed-off-by: Dan Carpenter Signed-off-by: Matthew Garrett commit 7227dedbc22f66f1bd310c866053b08de0496e38 Author: Dan Carpenter Date: Sat Feb 26 15:54:57 2011 +0300 sony-laptop: return negative on failure in sony_nc_add() There were two places in sony_nc_add() where we returned zero on failure instead of a negative error code. Signed-off-by: Dan Carpenter Signed-off-by: Matthew Garrett commit f11113b22cd84b0adc355eaaa80be433005f5f45 Author: Dan Carpenter Date: Sat Feb 26 15:54:27 2011 +0300 sony-laptop: make a couple variables static Sparse complains that these variables should be static. Signed-off-by: Dan Carpenter Signed-off-by: Matthew Garrett commit 3b3e73f7d879f914f25605f74a71c2dad34bc329 Author: Keng-Yu Lin Date: Tue Mar 1 12:56:13 2011 +0800 eeepc-wmi: set the touchpad toggle key code to KEY_TOUCHPAD_TOGGLE Signed-off-by: Keng-Yu Lin Signed-off-by: Matthew Garrett commit 2165136585b5c7d6f118f1d90fbde550bb7de212 Author: Ike Panhc Date: Wed Feb 23 21:39:59 2011 +0800 ideapad: read brightness setting on brightness key notify BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=25922 On ideapad Y530, the brightness key notify will be blocked if the last notify is not responsed by getting the brightness value. Read value when we get the notify shall fix the problem and will not have any difference on other ideapads. Signed-off-by: Ike Panhc Signed-off-by: Matthew Garrett commit 90ba4b1bfcf71bfe5c3844ddeb474aae4453cabd Author: Randy Dunlap Date: Tue Feb 22 13:47:35 2011 -0800 eeepc-wmi: kconfig changes to fix build errors Fix eeepc-wmi build when CONFIG_HOTPLUG_PCI is not enabled: eeepc-wmi.c:(.text+0x3bc5e9): undefined reference to `pci_hp_deregister' eeepc-wmi.c:(.text+0x3bcca4): undefined reference to `__pci_hp_register' Signed-off-by: Randy Dunlap Signed-off-by: Matthew Garrett commit 5f8540094d23b8886d671ff1faf875b698e2f299 Author: Corentin Chary Date: Sat Feb 26 10:20:43 2011 +0100 eeepc-wmi: restore KEY_CAMERA_* keys lost in 190ca27 Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit e07babde13460d7b03842a6de8f22fbef93709e1 Author: Corentin Chary Date: Sat Feb 26 10:20:42 2011 +0100 asus-wmi: add hwmon interface and pwm1 Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 2f686b54fbfcd82ebfb650a5c628c1b9ba8b9863 Author: Corentin Chary Date: Sat Feb 26 10:20:41 2011 +0100 asus-wmi: add some common device ids and method ids I also found some leds ids (0x00020011-0x00020016 and 0x00040015), but since they are not really present on the notebook, I can't guess their name . Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit b229ece9911cc0b2415d3ffd55d7b2a28d30b614 Author: Corentin Chary Date: Sat Feb 26 10:20:40 2011 +0100 asus-nb-wmi: Asus Notebooks WMI Driver Introduce a new driver for Asus Notebooks shipped with a WMI device instead of the old ACPI device. The WMI device is almost the same as the one present in Eee PC, but the event guid and the keymap are different. The keymap comes from asus-laptop module. On Asus notebooks, when you call the WMI device, you always need a 64bit buffer, even if you only want to get the state of a device (tested on a G73). Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit ef343491db1770a3af5010ba007167c348cdbe1a Author: Corentin Chary Date: Sat Feb 26 10:20:39 2011 +0100 asus-wmi: allow debugfs interface to call arbitrary method Also add some # format flags to debugfs output. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 46dbca871df753ce92c321a41a8a38eba7487680 Author: Corentin Chary Date: Sat Feb 26 10:20:38 2011 +0100 asus-wmi: add calls to INIT, SPEC and SFUN on init INIT() call is needed to enable hotkeys on G73 SPEC() and SFUN() allow us to know more about available features. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 8fbea019a1a70e0fb01e0f98c963e6042fbe94ab Author: Corentin Chary Date: Sat Feb 26 10:20:37 2011 +0100 asus-wmi: fix and clean backlight code Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 1d070f89a723bd296865dd7eb61c8050763e6e3b Author: Corentin Chary Date: Sat Feb 26 10:20:36 2011 +0100 asus-wmi: try to guess the right DSTS methods This is tricky, new WMI aware notebooks seems to use 0x53545344 while Eee PCs are using 0x53544344. But there is no way to know if there is an Eee PC in that wild that is using 0x53545344 or a notebook using 0x53544344. So the driver try to guess the available DSTS method ... But most Eee PCs never return 0xFFFFFFFE when a method is not available, they return 0 instead (and that's useless). So, first, try 0x53544344 then 0x53545344. We will find a better way when we got more data. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit d33da3b6866975b17fbec67540f6153f5dcdcec7 Author: Corentin Chary Date: Sat Feb 26 10:20:35 2011 +0100 asus-wmi: factorise wmi_evaluate_method call This patch create a single function to call the WMI methods. This function handle inexistent methods (when implemented by the WMI devices, and this is not the case on Eee PCs), ACPI errors, etc.. Also pack struct bios_arg, and make sure that we always send a 64bit buffer when calling a WMI method, because this is needed on Asus notebooks. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit a75fe0d78ec00d3d5b2c42b1ee76b22e99f213d1 Author: Corentin Chary Date: Sat Feb 26 10:20:34 2011 +0100 asus-wmi: handle "unknown status" bit Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit a7ce3f041e640daf96e227d8f7ffa6b988f33025 Author: Corentin Chary Date: Sat Feb 26 10:20:33 2011 +0100 asus-wmi: introduce struct asus_rfkill First, this allow use to remove the custom asusrfkill_wlan_query, but this will also allow us to give struct asus_wmi * to get_devstate/set_devstate later. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 57ab7dae27fae6a492ec968dc543106685adcad5 Author: Corentin Chary Date: Sat Feb 26 10:20:32 2011 +0100 asus-wmi: minor cleanups Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit e12e6d94db24e9050821965aa75c95e8d2c65f10 Author: Corentin Chary Date: Sat Feb 26 10:20:31 2011 +0100 eeepc-wmi: asus generic asus-wmi.ko module New Asus notebooks are using a WMI device similar to the one used in Eee PCs. Since we don't want to load eeepc-wmi module on Asus notebooks, and we want to keep the eeepc-wmi module for backward compatibility, this patch introduce a new module, named asus-wmi, that will be used by eeepc-wmi and the new Asus Notebook WMI Driver. eeepc-wmi's input device strings (device name and phys) are kept, but rfkill and led names are changed (s/eeepc/asus/). This should not break anything since rfkill are used by type or index, not by name, and the eeepc::touchpad led wasn't working correctly before 2.6.39 anyway. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 5b799d4fb787bb94f1068352220ab033ac7969f8 Author: Corentin Chary Date: Sat Feb 26 10:20:30 2011 +0100 asus-wmi: move generic code to asus-wmi New Asus notebooks are using a WMI device similar to the one used in Eee PCs. Since we don't want to load a module named eeepc-laptop on Asus Notebooks, start by copying all the code to asus-wmi.c. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit f017fbe7993d8416824aaf079fa1e6dc88d1ba55 Author: Durgadoss R Date: Sun Feb 20 23:05:43 2011 +0530 medfield: Add Thermal Driver This is the basic thermal sensor driver for Intel MID platform using the Medfield chipset. It plugs in via the thermal drivers and provides sensor readings for the device sensors. Signed-off-by: Durgadoss R Signed-off-by: Alan Cox Signed-off-by: Matthew Garrett commit c0b9c6494498014f28dbec37fe327bf016a91356 Author: Anssi Hannula Date: Sun Feb 20 20:07:26 2011 +0200 hp-wmi: add rfkill support for wireless query 0x1b Some recent HP laptops use a new wireless query command type 0x1b. Add support for it. Tested on HP Mini 5102. Signed-off-by: Anssi Hannula Signed-off-by: Matthew Garrett commit 7cd635da42fda9272fd200121e565d116c0c65c9 Author: Anssi Hannula Date: Sun Feb 20 20:07:25 2011 +0200 hp-wmi: make rfkill initialization failure non-fatal hp_wmi_rfkill_setup cleans up after itself now, so failing completely is no longer necessary. Signed-off-by: Anssi Hannula Signed-off-by: Matthew Garrett commit 6d97db590ca2787c202cf35e76f5d24b3007bc7c Author: Anssi Hannula Date: Sun Feb 20 20:07:24 2011 +0200 hp-wmi: clear rfkill device pointers when appropriate NULLify rfkill pointers during initialization. This prevents dereference of invalid pointer in case the driver is rebound and some rfkill device isn't detected anymore. Clear them also in hp_wmi_rfkill_setup failure path so that an rfkill initialization failure doesn't need to be fatal for the whole driver. Signed-off-by: Anssi Hannula Signed-off-by: Matthew Garrett commit eceb7bdf644b418175aab1c998137e692ac98a4c Author: Anssi Hannula Date: Sun Feb 20 20:07:23 2011 +0200 hp-wmi: split rfkill initialization out of hp_wmi_bios_setup Split initialization of rfkill devices from hp_wmi_bios_setup() to hp_wmi_rfkill_setup(). This makes the code somewhat cleaner, especially with the future command 0x1b rfkill support. Signed-off-by: Anssi Hannula Signed-off-by: Matthew Garrett commit c3021ea1beeeb1aa8a92fa6946a6e25fc55f171d Author: Anssi Hannula Date: Sun Feb 20 20:07:22 2011 +0200 hp-wmi: allow setting input and output buffer sizes separately Split buffersize parameter of hp_wmi_perform_query to insize and outsize. Existing callers are changed to use the same value for insize and outsize to avoid any regressions, with the exception of hp_wmi_set_block where the output buffer is unused and therefore outsize is set to 0 (this change is not seen by BIOS code). The maximum input buffer size is kept at 4 bytes as per struct bios_args. Some commands exist that take longer buffers, but they haven't been implemented. The data portion of bios_args can be trivially made dynamically allocated later when such larger buffers become needed. Signed-off-by: Anssi Hannula Signed-off-by: Matthew Garrett commit 25bb067a08c5db70cd8bcf9e160ac81718ea075c Author: Anssi Hannula Date: Sun Feb 20 20:07:21 2011 +0200 hp-wmi: remove a variable that is never read Remove the status variable from hp_wmi_perform_query which holds the return value from wmi_evaluate_method(). It is never checked as the function bails out if the output buffer hasn't been allocated which indicates the call failed. Signed-off-by: Anssi Hannula Signed-off-by: Matthew Garrett commit 9af0e0fb70ed8e2387323c19496a7e174363f7b6 Author: Anssi Hannula Date: Sun Feb 20 20:07:20 2011 +0200 hp-wmi: check query return value in hp_wmi_perform_query Check BIOS provided return value code in hp_wmi_perform_query and print a warning on error. Printing is suppressed for HPWMI_RET_UNKNOWN_CMDTYPE which is returned when the command type is unsupported. Signed-off-by: Anssi Hannula Signed-off-by: Matthew Garrett commit 7751ab8e600f26e10c2ba12a92d48a4852a51da8 Author: Mattia Dongili Date: Sat Feb 19 11:52:32 2011 +0900 sony-laptop: implement new backlight control method Reasonably recent Vaios have a 0x12f or 0x137 handler that exposes a fine lid backlight regulation with values ranging from 0 to 255. The patch is based on findings and code from Javier Achirica and Marco Chiappero Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit bf155714013e59c299e378055d60a4adf92e79db Author: Mattia Dongili Date: Sat Feb 19 11:52:31 2011 +0900 sony-laptop: implement keyboard backlight support Recent Vaios have the opportunity to control the keyboard backlight via ACPI calls to the SNC device. Introduce two module parameters to control how keyboard backlight should be set at module loading (default to on and with 10 seconds timeout). Tested-by: Marco Chiappero Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit 2a4f0c81adcd1f812a63bc9106be2fd26f437730 Author: Mattia Dongili Date: Sat Feb 19 11:52:30 2011 +0900 sony-laptop: cache handles and report them via sysfs Avoid calling into acpi each time we need to lookup a method handle and report the available handles to ease collection of information when debugging issues. Also move initialization of the platform driver earlier to allow adding files from other setup functions. Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit 3672329c3642033286984313d05f4a5b57bd2da7 Author: Mattia Dongili Date: Sat Feb 19 11:52:29 2011 +0900 sony-laptop: remove unused Type4 define Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit d669793802be5ac105d8ecbab00404ae886d3ebe Author: Mattia Dongili Date: Sat Feb 19 11:52:28 2011 +0900 sony-laptop: use pr_ for messages Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit 4eeb50220a4efd8c33598a228d03aff203a7ad07 Author: Mattia Dongili Date: Sat Feb 19 11:52:27 2011 +0900 sony-laptop: ignore hard switch rfkill events (SPIC) There is not much use for these events in userspace and handling the events themselves seems to get in the way of the actual activation of the rf devices. The SNC device doesn't expose them already. https://bugzilla.kernel.org/show_bug.cgi?id=15303 Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit 54286fd0da36a51f4cefe669b70a284a799f3e45 Author: Mattia Dongili Date: Sat Feb 19 11:52:26 2011 +0900 sony-laptop: documentation updates Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit 56e6e716b5211f4cda8db63b9a16d083ee193480 Author: Mattia Dongili Date: Sat Feb 19 11:52:25 2011 +0900 sony-laptop: add some debug printk useful for bug reports Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit 80887757e304d1f973330d9398024cffcd82d00d Author: Randy Dunlap Date: Wed Feb 16 14:31:02 2011 -0800 platform/x86: intel_mid_powerbutton needs INPUT intel_mid_powerbtn.c uses input interfaces, so it should depend on INPUT to fix build errors when CONFIG_INPUT is not enabled: intel_mid_powerbtn.c:(.text+0x56ca8f): undefined reference to `input_event' intel_mid_powerbtn.c:(.devinit.text+0x2e7b4): undefined reference to `input_allocate_device' intel_mid_powerbtn.c:(.devinit.text+0x2e7ff): undefined reference to `input_set_capability' intel_mid_powerbtn.c:(.devinit.text+0x2e84a): undefined reference to `input_register_device' intel_mid_powerbtn.c:(.devinit.text+0x2e88b): undefined reference to `input_free_device' intel_mid_powerbtn.c:(.devexit.text+0x42f0): undefined reference to `input_unregister_device' Signed-off-by: Randy Dunlap Cc: Hong Liu Signed-off-by: Matthew Garrett commit 820787fceb3e62c29a36423eb30e2f9f198547f7 Author: Colin Ian King Date: Thu Feb 17 18:44:09 2011 +0000 Enable Dell All-In-One volume up/down keys Enable volume up and down hotkeys on WMI events GUID 284A0E6B-380E-472A-921F-E52786257FB4 and GUID 02314822-307C-4F66-bf0E-48AEAEB26CC8. Also works around a firmware bug where the _WED method should return an integer containing the key code and in fact the method returns the key code in element zero of a buffer. BugLink: http://bugs.launchpad.net/bugs/701530 BugLink: http://bugs.launchpad.net/bugs/676997 Signed-off-by: Colin Ian King Signed-off-by: Matthew Garrett commit 8eec8a1167b5912c19fec2cdad5b968dd0f8690d Author: Hong Liu Date: Mon Feb 7 14:45:55 2011 -0500 intel_mid_powerbtn: add power button driver for Medfield platform (#3) The power button is connected to MSIC on Medfield, we will get two interrupts from IOAPIC when pressing or releasing the power button. Signed-off-by: Hong Liu [Minor fixes as noted by Dmitry] Signed-off-by: Alan Cox Acked-by: Dmitry Torokhov Signed-off-by: Matthew Garrett commit e2d3d44b9a6efe4f3968252d4b680397a9640268 Author: Corentin Chary Date: Sun Feb 6 13:30:47 2011 +0100 eeepc-wmi: add camera keys These keys are supposed to be handled by any software using the camera (like webKam or cheese...). They can also be used to actually move the camera when possible. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 43815941efb1374c2f71eb1fb0a2814b049030eb Author: Corentin Chary Date: Sun Feb 6 13:28:43 2011 +0100 eeepc-wmi: reorder device ids Each device seems to be in a "group" (devid >> 16 & 0xFF). Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 4615bb661352acb7032796185c8c5573e47dfa1d Author: Corentin Chary Date: Sun Feb 6 13:28:42 2011 +0100 eeepc-wmi: add touchpad sysfs file Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 3b81cf9d558c57406b4ed9b0d2639113d1d428b6 Author: Corentin Chary Date: Sun Feb 6 13:27:31 2011 +0100 asus-laptop: remove deprecated interfaces (lcd_switch and display_get) I should have done that one year ago, so it's more than time to do it. These two features use non-standard interfaces. There are the only features that really need multiple path to guess what's the right method name on a specific laptop. Removing them allow to remove a lot of code an significantly clean the driver. This will affect the backlight code which won't be able to know if the backlight is on or off. The platform display file will also be write only (like the one in eeepc-laptop). Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit af96f87703f33a4dba4b51c7b3f0d6f874aa4853 Author: Corentin Chary Date: Sun Feb 6 13:27:30 2011 +0100 asus-laptop: let WLED alone on L1400B Asus took the DSDT from another model (L84F), made some change to make it work, but forgot to remove WLED method (the laptop doesn't have a wireless card). They even didn't change the model name. ref: https://bugzilla.kernel.org/show_bug.cgi?id=25712 Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 77ca5b0197138db1260bbbb95ce3fd015dd10437 Author: Corentin Chary Date: Sun Feb 6 13:30:48 2011 +0100 eeepc-wmi: comments keymap to clarify the meaning of some keys Found while checking PDF manuals... Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 8571d75d614702e3e0278c92892012dbf7c2e65b Author: Corentin Chary Date: Sun Feb 6 13:28:41 2011 +0100 eeepc-wmi: real touchpad led device id is 0x001000012 Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit c14d4b8ea799515cd44134b8eddd8f789f0b6286 Author: Corentin Chary Date: Sun Feb 6 13:28:40 2011 +0100 eeepc-wmi: respect wireless_hotplug setting Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit b71872650fe967eb0a38aa0d7dcbe9c60d160032 Author: Corentin Chary Date: Sun Feb 6 13:28:39 2011 +0100 eeepc-wmi: support backlight power (bl_power) attribute Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 54c799a50f58285f5f6a93d87470cba1847943a3 Author: Corentin Chary Date: Sun Feb 6 13:28:38 2011 +0100 eeepc-wmi: set the right key code for 0xe9 This key should power off the backlight, not the display, it is also used in acpi/video.c to do the same thing. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 2e9e159d8e18c37d60a7d5040314f579a40f4c63 Author: Corentin Chary Date: Sun Feb 6 13:28:37 2011 +0100 eeepc-wmi: add wimax support Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 9e1565bc390123d3c74b940ba3466faf196970ec Author: Corentin Chary Date: Sun Feb 6 13:28:36 2011 +0100 eeepc-wmi: add camera and card reader support Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit aafa719dcd0cb0c05bb0690c816b13263c8b36e6 Author: Corentin Chary Date: Sun Feb 6 13:28:35 2011 +0100 eeepc-wmi: use the presence bit correctly I checked some more DSDT, and it seems that I wasn't totally right about the meaning of DSTS return value. Bit 0 is clearly the status of the device, and I discovered that bit 16 is set when the device is present. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 33e0e6fed04dc6067562c65e3e6d551dc0eb11fc Author: Corentin Chary Date: Sun Feb 6 13:28:34 2011 +0100 eeepc-wmi: reorder defines Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit a04ce290bffe6b39edf18bac0fdb302503a53a4e Author: Corentin Chary Date: Sun Feb 6 13:28:33 2011 +0100 eeepc-wmi: switch to platform_create_bundle() This allow to remove ~30 lines of code. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 0773d7f9f1c0ad5fb86d23ad7e4ef5bfd2f48b5e Author: Corentin Chary Date: Sun Feb 6 13:28:32 2011 +0100 eeepc-wmi: add hibernate/resume callbacks Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 5c95638d115f9c6661fff254b3beb14b19f88e41 Author: Corentin Chary Date: Sun Feb 6 13:28:31 2011 +0100 eeepc-wmi: add an helper using simple return codes eeepc_wmi_get_devstate returns an acpi_status, so each call need extra logic to handle the return code. This patch add a simple getter, returning a boolean (or a negative error code). Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 7898cf1a3665d22c4d16308f73e981c6464be81b Author: Corentin Chary Date: Sun Feb 6 13:28:30 2011 +0100 eeepc-wmi: return proper error code in eeepc_rfkill_set() Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 279f8f95493c9aaa0a85520c863ccba87c4bf930 Author: Corentin Chary Date: Sun Feb 6 13:28:29 2011 +0100 eeepc-wmi: serialize access to wmi method \AMW0.WMBC, which is the main method that we use, is not reentrant. When wireless hotpluging is enabled, toggling the status of the wireless device using WMBC will trigger a notification and the notification handler need to call WMBC again to get the new status of the device, this will trigger the following error: ACPI Error (dswload-0802): [_T_0] Namespace lookup failure, AE_ALREADY_EXISTS ACPI Exception: AE_ALREADY_EXISTS, During name lookup/catalog (20100428/psloop-231) ACPI Error (psparse-0537): Method parse/execution failed [\AMW0.WMBC] (Node f7023b88), AE_ALREADY_EXISTS ACPI: Marking method WMBC as Serialized because of AE_ALREADY_EXISTS error Since there is currently no way to tell the acpi subsystem to mark a method as serialized, we do it in eeepc-wmi. Of course, we could let the first call fail, and then it would work, but it doesn't seems really clean, and it will make the first WMBC call return a random value. This patch was tested on EeePc 1000H with a RaLink RT2860 wireless card using the rt2800pci driver. rt2860sta driver seems to deadlock when we remove the pci device... Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit afa7c886578ce264d9b66d4bcb1fea51fac47925 Author: Corentin Chary Date: Sun Feb 6 13:28:28 2011 +0100 eeepc-wmi: add hotplug code for Eeepc 1000H Implement wireless like hotplug handling (code stolen from eeepc-laptop). Reminder: on some models rfkill is implemented by logically unplugging the wireless card from the PCI bus. Despite sending ACPI notifications, this does not appear to be implemented using standard ACPI hotplug - nor does the firmware provide the _OSC method required to support native PCIe hotplug. The only sensible choice appears to be to handle the hotplugging directly in the platform driver. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit bc40cce201b69ab25178565e298d9482a5876306 Author: Corentin Chary Date: Sun Feb 6 13:28:27 2011 +0100 eeepc-wmi: add wlan key found on 1015P Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 5628e5aa12d6147f4174ed7c42da146ef57fd125 Author: Corentin Chary Date: Sun Feb 6 13:28:26 2011 +0100 eeepc-wmi: reorder keymap Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 89ca11771a4b50ed616ab6c37e0ef333d02f1d47 Author: Paul Fox Date: Thu Feb 3 16:27:55 2011 +0000 OLPC XO-1.5 ebook switch driver The OLPC XO-1.5 has an ebook switch, triggered when the laptop screen is rotated then folding down, converting the device into ebook form. This switch is exposed through ACPI. Add a driver that exposes it to userspace as an input device. Signed-off-by: Daniel Drake Acked-by: Dmitry Torokhov Signed-off-by: Matthew Garrett commit d9d04879321af570ea7285c6dad92d9c3cd108a1 Author: Chris Mason Date: Sun Mar 27 21:23:21 2011 -0400 Btrfs: fix __btrfs_map_block on 32 bit machines Recent changes for discard support didn't compile, this fixes them not to try and % 64 bit numbers. Signed-off-by: Chris Mason commit 1561deda687eef0e95065f1268d680ddc5976ee7 Author: Miao Xie Date: Sun Mar 27 16:07:36 2011 +0800 btrfs: fix possible deadlock by clearing __GFP_FS flag Using the GFP_HIGHUSER_MOVABLE flag to allocate the metadata's page may cause deadlock. Task1 open() ... btrfs_search_slot() ... btrfs_cow_block() ... alloc_page() wait for reclaiming shrink_slab() ... shrink_icache_memory() ... btrfs_evict_inode() ... btrfs_search_slot() If the path is locked by task1, the deadlock happens. So the btree's page cache is different with the file's page cache, it can not allocate pages by GFP_HIGHUSER_MOVABLE flag, we must clear __GFP_FS flag in GFP_HIGHUSER_MOVABLE flag. Reported-by: Itaru Kitayama Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit c055e99eea6e4f614267632fac546e7896c0227b Author: Al Viro Date: Fri Mar 4 17:15:18 2011 +0000 btrfs: check link counter overflow in link(2) Signed-off-by: Al Viro Signed-off-by: Chris Mason commit 92986796d84ef939e304099dece32572a755b280 Author: Al Viro Date: Fri Mar 4 17:14:37 2011 +0000 btrfs: don't mess with i_nlink of unlocked inode in rename() old_inode is not locked; it's not safe to play with its link count. Instead of bumping it and calling btrfs_unlink_inode(), add a variant of the latter that does not do btrfs_drop_nlink()/ btrfs_update_inode(), call it instead of btrfs_inc_nlink()/ btrfs_unlink_inode() and do btrfs_update_inode() ourselves. Signed-off-by: Al Viro Signed-off-by: Chris Mason commit c2db1073fdf9757e6fd8b4a59d15b6ecc7a2af8a Author: Tsutomu Itoh Date: Tue Mar 1 06:48:31 2011 +0000 Btrfs: check return value of btrfs_alloc_path() Adding the check on the return value of btrfs_alloc_path() to several places. And, some of callers are modified by this change. Signed-off-by: Tsutomu Itoh Signed-off-by: Chris Mason commit c59021f846881a957ac5afe456d0f59d6a517b61 Author: liubo Date: Mon Mar 7 02:13:14 2011 +0000 Btrfs: fix OOPS of empty filesystem after balance btrfs will remove unused block groups after balance. When a empty filesystem is balanced, the block group with tag "DATA" may be dropped, and after umount and mount again, it will not find "DATA" space_info and lead to OOPS. So we initial the necessary space_infos(DATA, SYSTEM, METADATA) to avoid OOPS. Reported-by: Daniel J Blueman Signed-off-by: Liu Bo Signed-off-by: Chris Mason commit 9f7c43c96727a53bea45f7f2549d897f0a6117b8 Author: liubo Date: Mon Mar 7 02:13:33 2011 +0000 Btrfs: fix memory leak of empty filesystem after balance After Josef's patch(commit 3c14874acc71180553fb5aba528e3cf57c5b958b), btrfs will exclude super bytes when reading block groups(by marking a extent state UPTODATE). However, these bytes do not get freed while balance remove unused block groups, and we won't process those removed ones any more, when we do umount and unload the btrfs module, btrfs hits a memory leak. This patch add the missing free operation. Reproduce steps: $ mkfs.btrfs disk $ mount disk /mnt/btrfs -o loop $ btrfs filesystem balance /mnt/btrfs $ umount /mnt/btrfs $ rmmod btrfs Signed-off-by: Liu Bo Signed-off-by: Chris Mason commit 2d4e6f6ad2b9f84f568d07dae4bdbc7f48a70ad1 Author: liubo Date: Thu Feb 24 09:38:16 2011 +0000 Btrfs: fix return value of setflags ioctl setflags ioctl should return error when any checks fail. Signed-off-by: Liu Bo Reviewed-by: David Sterba Signed-off-by: Chris Mason commit dac97e516c617f9c797f64b0224050b70aea30c7 Author: Yoshinori Sano Date: Tue Feb 15 12:01:42 2011 +0000 Btrfs: fix uncheck memory allocations To make Btrfs code more robust, several return value checks where memory allocation can fail are introduced. I use BUG_ON where I don't know how to handle the error properly, which increases the number of using the notorious BUG_ON, though. Signed-off-by: Yoshinori Sano Signed-off-by: Chris Mason commit c622ae6085d0c6ad834213bbf1477eb311359078 Author: liubo Date: Sat Mar 26 08:01:12 2011 -0400 btrfs: make inode ref log recovery faster When we recover from crash via write-ahead log tree and process the inode refs, for each btrfs_inode_ref item, we will 1) check if we already have a perfect match in fs/file tree, if we have, then we're done. 2) search the corresponding back reference in fs/file tree, and check all the names in this back reference to see if they are also in the log to avoid conflict corners. 3) recover the logged inode refs to fs/file tree. In current btrfs, however, - for 2)'s check, once is enough, since the checked back reference will remain unchanged after processing all the inode refs belonged to the key. - it has no need to do another 1) between 2) and 3). I've made a small test to show how it improves, $dd if=/dev/zero of=foobar bs=4K count=1 $sync $make 100 hard links continuously, like ln foobar link_i $fsync foobar $echo b > /proc/sysrq-trigger after reboot $time mount DEV PATH without patch: real 0m0.285s user 0m0.001s sys 0m0.009s with patch: real 0m0.123s user 0m0.000s sys 0m0.010s Changelog v1->v2: - fix double free - pointed by David Sterba Changelog v2->v3: - adjust free order Signed-off-by: Liu Bo Signed-off-by: Chris Mason commit f7039b1d5c32241f87a513e33120db36bf30264d Author: Li Dongyang Date: Thu Mar 24 10:24:28 2011 +0000 Btrfs: add btrfs_trim_fs() to handle FITRIM We take an free extent out from allocator, trim it, then put it back, but before we trim the block group, we should make sure the block group is cached, so plus a little change to make cache_block_group() run without a transaction. Signed-off-by: Li Dongyang Signed-off-by: Chris Mason commit 5378e60734f5b7bfe1b43dc191aaf6131c1befe7 Author: Li Dongyang Date: Thu Mar 24 10:24:27 2011 +0000 Btrfs: adjust btrfs_discard_extent() return errors and trimmed bytes Callers of btrfs_discard_extent() should check if we are mounted with -o discard, as we want to make fitrim to work even the fs is not mounted with -o discard. Also we should use REQ_DISCARD to map the free extent to get a full mapping, last we only return errors if 1. the error is not a EOPNOTSUPP 2. no device supports discard Signed-off-by: Li Dongyang Signed-off-by: Chris Mason commit fce3bb9a1bd492793170e117c60d5718b7896af4 Author: Li Dongyang Date: Thu Mar 24 10:24:26 2011 +0000 Btrfs: make btrfs_map_block() return entire free extent for each device of RAID0/1/10/DUP btrfs_map_block() will only return a single stripe length, but we want the full extent be mapped to each disk when we are trimming the extent, so we add length to btrfs_bio_stripe and fill it if we are mapping for REQ_DISCARD. Signed-off-by: Li Dongyang Signed-off-by: Chris Mason commit b4d00d569a49fcef02195635dbf8d15904b1fb63 Author: Li Dongyang Date: Thu Mar 24 10:24:25 2011 +0000 Btrfs: make update_reserved_bytes() public Make the function public as we should update the reserved extents calculations after taking out an extent for trimming. Signed-off-by: Li Dongyang Signed-off-by: Chris Mason commit 3ab3564f018b9b265d0258e4a231794bacd5ad85 Author: Mark Fasheh Date: Tue Mar 22 17:20:26 2011 +0000 btrfs: return EXDEV when linking from different subvolumes btrfs_link returns EPERM if a cross-subvolume link is attempted. However, in this case I believe EXDEV to be the more appropriate value. >From the link(2) man page: EXDEV oldpath and newpath are not on the same mounted file system. (Linux permits a file system to be mounted at multiple points, but link() does not work across different mount points, even if the same file system is mounted on both.) This matters because an application may have different behaviors based on return codes. Signed-off-by: Mark Fasheh Signed-off-by: Chris Mason commit 75e7cb7fe0c391561bd3af36515be3f3c64a04c6 Author: Liu Bo Date: Tue Mar 22 10:12:20 2011 +0000 Btrfs: Per file/directory controls for COW and compression Data compression and data cow are controlled across the entire FS by mount options right now. ioctls are needed to set this on a per file or per directory basis. This has been proposed previously, but VFS developers wanted us to use generic ioctls rather than btrfs-specific ones. According to Chris's comment, there should be just one true compression method(probably LZO) stored in the super. However, before this, we would wait for that one method is stable enough to be adopted into the super. So I list it as a long term goal, and just store it in ram today. After applying this patch, we can use the generic "FS_IOC_SETFLAGS" ioctl to control file and directory's datacow and compression attribute. NOTE: - The compression type is selected by such rules: If we mount btrfs with compress options, ie, zlib/lzo, the type is it. Otherwise, we'll use the default compress type (zlib today). v1->v2: - rebase to the latest btrfs. v2->v3: - fix a problem, i.e. when a file is set NOCOW via mount option, then this NOCOW will be screwed by inheritance from parent directory. Signed-off-by: Liu Bo Signed-off-by: Chris Mason commit 32471f6e1983922473573da62cbee58699574aa4 Author: liubo Date: Mon Mar 21 08:54:27 2011 +0000 Btrfs: add datacow flag in inode flag For datacow control, the corresponding inode flags are needed. This is for btrfs use. v1->v2: Change FS_COW_FL to another bit due to conflict with the upstream e2fsprogs Signed-off-by: Liu Bo Signed-off-by: Chris Mason commit fc0e4a314e361af3b13d9320e92c64118f9a3e61 Author: Miao Xie Date: Thu Mar 24 11:41:21 2011 +0000 btrfs: use GFP_NOFS instead of GFP_KERNEL In the filesystem context, we must allocate memory by GFP_NOFS, or we may start another filesystem operation and make kswap thread hang up. Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit 97d9a8a420444eb5b5c071d4b3b9c4100a7ae015 Author: Tsutomu Itoh Date: Thu Mar 24 06:33:21 2011 +0000 Btrfs: check return value of read_tree_block() This patch is checking return value of read_tree_block(), and if it is NULL, error processing. Signed-off-by: Tsutomu Itoh Signed-off-by: Chris Mason commit 7e75bf3ff3a716d7b21d8fb43bf823115801c1e9 Author: David Sterba Date: Fri Mar 18 22:56:43 2011 +0000 btrfs: properly access unaligned checksum buffer On Fri, Mar 18, 2011 at 11:56:53AM -0400, Chris Mason wrote: > Thanks for fielding this one. Does put_unaligned_le32 optimize away on > platforms with efficient access? It would be great if we didn't need > the #ifdef. (quicktest: assembly output is same for put_unaligned_le32 and direct assignment on my x86_64) I was originally following examples in Documentation/unaligned-memory-access.txt. From other code it seems to me that the define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is intended for larger portions of code. Macros/wrappers for {put,get}_unaligned* are chosen via arch//include/asm/unaligned.h accordingly, therefore it's safe to use put_unaligned_le32 without the ifdef. dave Signed-off-by: Chris Mason commit db5b493ac78e46c7b6bad22cd25d8041564cd8ea Author: Tsutomu Itoh Date: Wed Mar 23 08:14:16 2011 +0000 Btrfs: cleanup some BUG_ON() This patch changes some BUG_ON() to the error return. (but, most callers still use BUG_ON()) Signed-off-by: Tsutomu Itoh Signed-off-by: Chris Mason commit 1abe9b8a138c9988ba8f7bfded6453649a31541f Author: liubo Date: Thu Mar 24 11:18:59 2011 +0000 Btrfs: add initial tracepoint support for btrfs Tracepoints can provide insight into why btrfs hits bugs and be greatly helpful for debugging, e.g dd-7822 [000] 2121.641088: btrfs_inode_request: root = 5(FS_TREE), gen = 4, ino = 256, blocks = 8, disk_i_size = 0, last_trans = 8, logged_trans = 0 dd-7822 [000] 2121.641100: btrfs_inode_new: root = 5(FS_TREE), gen = 8, ino = 257, blocks = 0, disk_i_size = 0, last_trans = 0, logged_trans = 0 btrfs-transacti-7804 [001] 2146.935420: btrfs_cow_block: root = 2(EXTENT_TREE), refs = 2, orig_buf = 29368320 (orig_level = 0), cow_buf = 29388800 (cow_level = 0) btrfs-transacti-7804 [001] 2146.935473: btrfs_cow_block: root = 1(ROOT_TREE), refs = 2, orig_buf = 29364224 (orig_level = 0), cow_buf = 29392896 (cow_level = 0) btrfs-transacti-7804 [001] 2146.972221: btrfs_transaction_commit: root = 1(ROOT_TREE), gen = 8 flush-btrfs-2-7821 [001] 2155.824210: btrfs_chunk_alloc: root = 3(CHUNK_TREE), offset = 1103101952, size = 1073741824, num_stripes = 1, sub_stripes = 0, type = DATA flush-btrfs-2-7821 [001] 2155.824241: btrfs_cow_block: root = 2(EXTENT_TREE), refs = 2, orig_buf = 29388800 (orig_level = 0), cow_buf = 29396992 (cow_level = 0) flush-btrfs-2-7821 [001] 2155.824255: btrfs_cow_block: root = 4(DEV_TREE), refs = 2, orig_buf = 29372416 (orig_level = 0), cow_buf = 29401088 (cow_level = 0) flush-btrfs-2-7821 [000] 2155.824329: btrfs_cow_block: root = 3(CHUNK_TREE), refs = 2, orig_buf = 20971520 (orig_level = 0), cow_buf = 20975616 (cow_level = 0) btrfs-endio-wri-7800 [001] 2155.898019: btrfs_cow_block: root = 5(FS_TREE), refs = 2, orig_buf = 29384704 (orig_level = 0), cow_buf = 29405184 (cow_level = 0) btrfs-endio-wri-7800 [001] 2155.898043: btrfs_cow_block: root = 7(CSUM_TREE), refs = 2, orig_buf = 29376512 (orig_level = 0), cow_buf = 29409280 (cow_level = 0) Here is what I have added: 1) ordere_extent: btrfs_ordered_extent_add btrfs_ordered_extent_remove btrfs_ordered_extent_start btrfs_ordered_extent_put These provide critical information to understand how ordered_extents are updated. 2) extent_map: btrfs_get_extent extent_map is used in both read and write cases, and it is useful for tracking how btrfs specific IO is running. 3) writepage: __extent_writepage btrfs_writepage_end_io_hook Pages are cirtical resourses and produce a lot of corner cases during writeback, so it is valuable to know how page is written to disk. 4) inode: btrfs_inode_new btrfs_inode_request btrfs_inode_evict These can show where and when a inode is created, when a inode is evicted. 5) sync: btrfs_sync_file btrfs_sync_fs These show sync arguments. 6) transaction: btrfs_transaction_commit In transaction based filesystem, it will be useful to know the generation and who does commit. 7) back reference and cow: btrfs_delayed_tree_ref btrfs_delayed_data_ref btrfs_delayed_ref_head btrfs_cow_block Btrfs natively supports back references, these tracepoints are helpful on understanding btrfs's COW mechanism. 8) chunk: btrfs_chunk_alloc btrfs_chunk_free Chunk is a link between physical offset and logical offset, and stands for space infomation in btrfs, and these are helpful on tracing space things. 9) reserved_extent: btrfs_reserved_extent_alloc btrfs_reserved_extent_free These can show how btrfs uses its space. Signed-off-by: Liu Bo Signed-off-by: Chris Mason commit 240f62c8756df285da11469259b3900f32883168 Author: Chris Mason Date: Wed Mar 23 14:54:42 2011 -0400 Btrfs: use RCU instead of a spinlock to protect the root node The pointer to the extent buffer for the root of each tree is protected by a spinlock so that we can safely read the pointer and take a reference on the extent buffer. But now that the extent buffers are freed via RCU, we can safely use rcu_read_lock instead. Signed-off-by: Chris Mason commit 3e1d9874b44212628b65ec4455d32cb4880b553f Author: Kukjin Kim Date: Fri Mar 25 20:09:26 2011 +0900 ARM: Suspend: Fix dependency of ARCH_SUSPEND_POSSIBLE The current mainline codes of ARCH_S5P64X0 and ARCH_S5P6442 can not support suspend to ram. So needs this for preventing build error on them. Cc: Russell King Cc: Rafael J. Wysocki Cc: Len Brown Signed-off-by: Kukjin Kim commit 9d5fda6656fae8004deb81e91bbd144c8743e500 Author: Kukjin Kim Date: Wed Mar 23 14:45:29 2011 +0900 ARM: SAMSUNG: Fix CPU idmask This patch fixes CPU idmask of S5P64X0 and EXYNOS4210 and its comparison method because just want to use CPU id for it. Cc: Ben Dooks Signed-off-by: Kukjin Kim commit b9ab19f936e823c31e66702ee553e4d18e910c9a Author: Thomas Abraham Date: Fri Mar 25 16:18:18 2011 +0900 ARM: EXYNOS4: Fix addruart macro Fix incorrect conditional execution of ldr instructions in addruart macro. Signed-off-by: Thomas Abraham Signed-off-by: Abhilash Kesavan Signed-off-by: Kukjin Kim commit 1af3c67212d1694977b6da47b4451a9b019e7606 Author: Jeongtae Park Date: Fri Mar 25 15:48:15 2011 +0900 ARM: EXYNOS4: Fix smsc9215 irq polarity on SMDKC210 This patch fixes smsc9215 irq ploarity configuration of SMDKC210. We can change type of EINT(5) as HIGH, but it's better to change IRQ output of smsc9215 as an active low because smsc's IRQ line has been pull-up. Signed-off-by: Jeongtae Park Signed-off-by: Kukjin Kim commit cd0527c25bfb1f30f6994744fb600c4a32ab5a4f Author: Jeongtae Park Date: Fri Mar 25 15:48:15 2011 +0900 ARM: EXYNOS4: Fix smsc9215 irq polarity on SMDKV310 This patch fixes smsc9215 irq ploarity configuration of SMDKV310. We can change type of EINT(5) as HIGH, but it's better to change IRQ output of smsc9215 as an active low because smsc's IRQ line has been pull-up. Signed-off-by: Jeongtae Park Signed-off-by: Kukjin Kim commit 94fc1d80d6df31e036f6dcc18e05b3ddb8dd790e Author: Kukjin Kim Date: Fri Mar 25 10:46:16 2011 +0900 ARM: EXYNOS4: Fix build warning on regarding SATA_AHCI_PLATFORM This patch fixes following build warnings. warning: (MACH_ARMLEX4210) selects SATA_AHCI_PLATFORM which has unmet direct dependencies (ATA) And adds EXYNOX4_DEV_AHCI for building machines which are not suppoort for AHCI feature on board. Signed-off-by: Kukjin Kim commit 768fe2c31fc48e63ff623393986eeb1ce27cc287 Author: Huang Weiyi Date: Wed Mar 23 15:29:32 2011 +0900 ARM: S5PV210: Remove duplicated inclusion Remove duplicated #include('s) in arch/arm/mach-s5pv210/mach-smdkv210.c Signed-off-by: Huang Weiyi Signed-off-by: Kukjin Kim commit 912003e8f1b23af65dd32f91c7e699c1f496b067 Author: Vladimir Zapolskiy Date: Wed Mar 23 15:08:17 2011 +0900 ARM: S5PV210: Fix security engine interrupt names This change is intended to correct security subsystem interrupt names for Samsung S5PV210 and S5PC110 SoCs. Signed-off-by: Vladimir Zapolskiy Signed-off-by: Kukjin Kim commit 3814554d11b3f677117ab048f147d207fd66f856 Author: Banajit Goswami Date: Fri Mar 18 17:15:22 2011 +0530 ARM: S5P64X0: Fix iodesc array size for S5P6450 The array size parameter of iotable_init for S5P6450 is incorrect. Fix this by passing the correct length of s5p6450_iodesc table. Signed-off-by: Banajit Goswami Signed-off-by: Kukjin Kim commit fe67dfc874da094bbbfbb73e74924d414b96105b Author: Linus Walleij Date: Mon Mar 7 11:48:15 2011 +0100 mach-ux500: configure board for the TPS61052 regulator v2 This registers the TPS61052 regulator to the ux500 MOP/HREF boards. Cc: Samuel Ortiz Cc: Liam Girdwood Cc: Mark Brown Cc: Ola Lilja Signed-off-by: Linus Walleij commit b5695d04634fa4ccca7dcbc05bb4a66522f02e0b Author: Roberto Sassu Date: Mon Mar 21 16:00:55 2011 +0100 eCryptfs: write lock requested keys A requested key is write locked in order to prevent modifications on the authentication token while it is being used. Signed-off-by: Roberto Sassu Signed-off-by: Tyler Hicks commit 950983fc04e02232e0d25717903461578a755ebb Author: Roberto Sassu Date: Mon Mar 21 16:00:54 2011 +0100 eCryptfs: move ecryptfs_find_auth_tok_for_sig() call before mutex_lock The ecryptfs_find_auth_tok_for_sig() call is moved before the mutex_lock(s->tfm_mutex) instruction in order to avoid possible deadlocks that may occur by holding the lock on the two semaphores 'key->sem' and 's->tfm_mutex' in reverse order. Signed-off-by: Roberto Sassu Signed-off-by: Tyler Hicks commit 0e1fc5ef470cc1d157005c437a434868d59fead4 Author: Roberto Sassu Date: Mon Mar 21 16:00:53 2011 +0100 eCryptfs: verify authentication tokens before their use Authentication tokens content may change if another requestor calls the update() method of the corresponding key. The new function ecryptfs_verify_auth_tok_from_key() retrieves the authentication token from the provided key and verifies if it is still valid before being used to encrypt or decrypt an eCryptfs file. Signed-off-by: Roberto Sassu [tyhicks: Minor formatting changes] Signed-off-by: Tyler Hicks commit 7762e230fd31fcc1abc03ba32ee957fadc8eafb4 Author: Roberto Sassu Date: Mon Mar 21 16:00:52 2011 +0100 eCryptfs: modified size of keysig in the ecryptfs_key_sig structure The size of the 'keysig' array is incremented of one byte in order to make room for the NULL character. The 'keysig' variable is used, in the function ecryptfs_generate_key_packet_set(), to find an authentication token with the given signature and is printed a debug message if it cannot be retrieved. Signed-off-by: Roberto Sassu Signed-off-by: Tyler Hicks commit cf35ca69131d5fc8febb74629d173e0731bf49c0 Author: Roberto Sassu Date: Mon Mar 21 16:00:51 2011 +0100 eCryptfs: removed num_global_auth_toks from ecryptfs_mount_crypt_stat This patch removes the 'num_global_auth_toks' field of the ecryptfs_mount_crypt_stat structure, used to count the number of items in the 'global_auth_tok_list' list. This variable is not needed because there are no checks based upon it. Signed-off-by: Roberto Sassu Signed-off-by: Tyler Hicks commit 1821df040ac3cd6a57518739f345da6d50ea9d3f Author: Roberto Sassu Date: Thu Mar 17 12:48:50 2011 +0100 eCryptfs: ecryptfs_keyring_auth_tok_for_sig() bug fix The pointer '(*auth_tok_key)' is set to NULL in case request_key() fails, in order to prevent its use by functions calling ecryptfs_keyring_auth_tok_for_sig(). Signed-off-by: Roberto Sassu Cc: Signed-off-by: Tyler Hicks commit 50f198ae16ac66508d4b8d5a40967a8507ad19ee Author: Tyler Hicks Date: Wed Mar 9 11:49:13 2011 -0600 eCryptfs: Unlock page in write_begin error path Unlock the page in error path of ecryptfs_write_begin(). This may happen, for example, if decryption fails while bring the page up-to-date. Cc: Signed-off-by: Tyler Hicks commit 57db4e8d73ef2b5e94a3f412108dff2576670a8a Author: Thieu Le Date: Tue Mar 8 16:26:03 2011 -0800 ecryptfs: modify write path to encrypt page in writepage Change the write path to encrypt the data only when the page is written to disk in ecryptfs_writepage. Previously, ecryptfs encrypts the page in ecryptfs_write_end which means that if there are multiple write requests to the same page, ecryptfs ends up re-encrypting that page over and over again. This patch minimizes the number of encryptions needed. Signed-off-by: Thieu Le [tyhicks: Changed NULL .drop_inode sop pointer to generic_drop_inode] Signed-off-by: Tyler Hicks commit fed8859b3ab94274c986cbdf7d27130e0545f02c Author: Tyler Hicks Date: Wed Feb 23 00:54:20 2011 -0600 eCryptfs: Remove ECRYPTFS_NEW_FILE crypt stat flag Now that grow_file() is not called in the ecryptfs_create() path, the ECRYPTFS_NEW_FILE flag is no longer needed. It helped ecryptfs_readpage() know not to decrypt zeroes that were read from the lower file in the grow_file() path. Signed-off-by: Tyler Hicks commit bd4f0fe8bb7c73c738e1e11bc90d6e2cf9c6e20e Author: Tyler Hicks Date: Wed Feb 23 00:14:19 2011 -0600 eCryptfs: Remove unnecessary grow_file() function When creating a new eCryptfs file, the crypto metadata is written out and then the lower file was being "grown" with 4 kB of encrypted zeroes. I suspect that growing the encrypted file was to prevent an information leak that the unencrypted file was empty. However, the unencrypted file size is stored, in plaintext, in the metadata so growing the file is unnecessary. Signed-off-by: Tyler Hicks commit dfa3a824de631e6833ffa9a7befc08186b027799 Author: Bengt Jonsson Date: Wed Mar 9 13:34:17 2011 +0100 mach-ux500: provide ab8500 init vector This adds an ab8500 regulator initialization vector for the HREF/MOP500 series of boards. This also sets the display regulator to be on at boot so we don't loose our splash screen when the board comes up. Signed-off-by: Bengt Jonsson Signed-off-by: Linus Walleij commit 3ef374a22bdf91fb3b4213200aadd054f81c3499 Author: Bibek Basu Date: Tue Feb 15 12:56:16 2011 +0530 mach-ux500: board support for AB8500 GPIO driver This is the board support patch for ab8500 gpio driver on mach-ux500.Patch implements 16 virtual IRQ mapped to 16 interrupt capable AB8500 GPIOs. Signed-off-by: Bibek Basu [Modify for header file placement] Signed-off-by: Linus Walleij commit 0cb3fcd72cc3e6dd88f0e769746d294e5e6bafa9 Author: Bibek Basu Date: Wed Feb 9 11:02:35 2011 +0530 gpio: driver for 42 AB8500 GPIO pins To get rid of port expanders, the free GPIOs of ab8500 can be used. There are 42 GPIO pins. Out of which 16 are interrupt capable.This patch implements 16 virtual IRQ mapped to 16 interrupt capable AB8500 GPIOs. Signed-off-by: Bibek Basu Acked-by: Grant Likely [Renamed header file as per MFD structure] Signed-off-by: Linus Walleij commit 673e63c688f43104c73aad8ea4237f7ad41fa14d Author: Stanislaw Gruszka Date: Tue Mar 22 23:54:49 2011 +0000 net: fix ethtool->set_flags not intended -EINVAL return value After commit d5dbda23804156ae6f35025ade5307a49d1db6d7 "ethtool: Add support for vlan accleration.", drivers that have NETIF_F_HW_VLAN_TX, and/or NETIF_F_HW_VLAN_RX feature, but do not allow enable/disable vlan acceleration via ethtool set_flags, always return -EINVAL from that function. Fix by returning -EINVAL only if requested features do not match current settings and can not be changed by driver. Change any driver that define ethtool->set_flags to use ethtool_invalid_flags() to avoid similar problems in the future (also on drivers that do not have the problem). Tested with modified (to reproduce this bug) myri10ge driver. Cc: stable@kernel.org # 2.6.37+ Signed-off-by: Stanislaw Gruszka Signed-off-by: David S. Miller commit b5845f9834d8f4c79d324bc59b99dbcf0a40f428 Author: Herbert Xu Date: Sun Mar 27 01:01:26 2011 +0000 mlx4_en: Fix loss of promiscuity The mlx4_en driver uses the combination stop_port/start_port in a number of places. Unfortunately that causes any promiscuous mode settings on the hardware to be lost. This patch fixes that problem. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6303e6e8da770e62a4d38f7206fe046514276d14 Author: Javier Martinez Canillas Date: Sat Mar 26 16:42:33 2011 +0000 tg3: Fix inline keyword usage The correct usage is "static inline void" not "static void inline". Signed-off-by: Javier Martinez Canillas Signed-off-by: David S. Miller commit 27fd9de8eb9bf48e4a09c8f02d13f56e9a074a1e Author: Javier Martinez Canillas Date: Sat Mar 26 16:42:31 2011 +0000 tg3: use and instead and It is proper style to include linux/foo.h instead asm/foo.h if both exist Signed-off-by: Javier Martinez Canillas Signed-off-by: David S. Miller commit 3e49e6d520401e1d25ec8d366520aad2c01adc1c Author: Cesar Eduardo Barros Date: Sat Mar 26 05:10:30 2011 +0000 net: use CHECKSUM_NONE instead of magic number Two places in the kernel were doing skb->ip_summed = 0. Change both to skb->ip_summed = CHECKSUM_NONE, which is more readable. Signed-off-by: Cesar Eduardo Barros Signed-off-by: David S. Miller commit f4e5bd4f5784c0608078805f29d4a4897ee482f7 Author: Rafael J. Wysocki Date: Sat Mar 26 01:34:06 2011 +0000 Net / jme: Do not use legacy PCI power management The jme driver uses the legacy PCI power management, so it has to do some PCI-specific things in its ->suspend() and ->resume() callbacks, which isn't necessary and should better be done by the PCI sybsystem-level power management code. It also doesn't use device wakeup flags correctly. Convert jme to the new PCI power management framework and make it let the PCI subsystem take care of all the PCI-specific aspects of device handling during system power transitions. Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit b3cd965739b8677f6e04913aa535fa156b09e73d Author: Stanislaw Gruszka Date: Fri Mar 25 01:21:51 2011 +0000 myri10ge: small rx_done refactoring Avoid theoretical race condition regarding accessing dev->features NETIF_F_LRO flag, which is illustrated below. CPU1 CPU2 myri10ge_clean_rx_done(): myri10ge_set_flags(): or myri10ge_set_rx_csum(): if (dev->features & NETIF_F_LRO) setup lro dev->features |= NETIF_F_LRO or dev->features &= ~NETIF_F_LRO; if (dev->features & NETIF_F_LRO) flush lro On the way reduce myri10ge_rx_done() number of arguments and calls by moving mgp->small_bytes check into that function. That reduce code size from: text data bss dec hex filename 36644 248 100 36992 9080 drivers/net/myri10ge/myri10ge.o to: text data bss dec hex filename 36037 247 100 36384 8e20 drivers/net/myri10ge/myri10ge.o on my i686 system, what should also make myri10ge_clean_rx_done() being faster. Signed-off-by: Stanislaw Gruszka Signed-off-by: David S. Miller commit edf947f10074fea27fdb1730524dca59355a1c40 Author: stephen hemminger Date: Thu Mar 24 13:24:01 2011 +0000 bridge: notify applications if address of bridge device changes The mac address of the bridge device may be changed when a new interface is added to the bridge. If this happens, then the bridge needs to call the network notifiers to tickle any other systems that care. Since bridge can be a module, this also means exporting the notifier function. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8628bd8af7c4c14f40f5183f80f5744c4e682439 Author: Jan Luebbe Date: Thu Mar 24 07:44:22 2011 +0000 ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo() The current handling of echoed IP timestamp options with prespecified addresses is rather broken since the 2.2.x kernels. As far as i understand it, it should behave like when originating packets. Currently it will only timestamp the next free slot if: - there is space for *two* timestamps - some random data from the echoed packet taken as an IP is *not* a local IP This first is caused by an off-by-one error. 'soffset' points to the next free slot and so we only need to have 'soffset + 7 <= optlen'. The second bug is using sptr as the start of the option, when it really is set to 'skb_network_header(skb)'. I just use dptr instead which points to the timestamp option. Finally it would only timestamp for non-local IPs, which we shouldn't do. So instead we exclude all unicast destinations, similar to what we do in ip_options_compile(). Signed-off-by: Jan Luebbe Signed-off-by: David S. Miller commit dc760b375e50a47847d4942811bd9679beeb5535 Author: Jan Altenberg Date: Sun Mar 27 18:24:10 2011 -0700 can: c_can: Fix tx_bytes accounting The current SocketCAN implementation for the Bosch c_can cell doesn't account the TX bytes correctly, because it calls c_can_inval_msg_object() (which clears the msg ctrl register) before reading the DLC value: for (/* nix */; (priv->tx_next - priv->tx_echo) > 0; priv->tx_echo++) { msg_obj_no = get_tx_echo_msg_obj(priv); c_can_inval_msg_object(dev, 0, msg_obj_no); val = c_can_read_reg32(priv, &priv->regs->txrqst1); if (!(val & (1 << msg_obj_no))) { can_get_echo_skb(dev, msg_obj_no - C_CAN_MSG_OBJ_TX_FIRST); stats->tx_bytes += priv->read_reg(priv, &priv->regs->ifregs[0].msg_cntrl) & IF_MCONT_DLC_MASK; stats->tx_packets++; } } So, we will always read 0 for the DLC value and "ifconfig" will report *0* TX Bytes. The fix is quite easy: Just move c_can_inval_msg_object() to the end of the if() statement. So: * We only call c_can_inval_msg_object() if the message was actually transmitted * We read out the DLC value _before_ clearing the msg ctrl register Signed-off-by: Jan Altenberg Acked-by: Kurt Van Dijck Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit b0052b088cf0cb688b4630c1d520c57276da71a5 Author: Marc Kleine-Budde Date: Thu Mar 24 02:34:33 2011 +0000 can: c_can_platform: fix irq check in probe This patch fixes the check in the probe function whether a IRQ was supplied to the driver. The original driver check the irq "struct resource *" against <= 0. Use "platform_get_irq" instead. Signed-off-by: Marc Kleine-Budde Cc: Bhupesh Sharma Signed-off-by: David S. Miller commit ee6f0988a69b3a81bcea0871418ecf5db332149c Author: Marc Kleine-Budde Date: Thu Mar 24 02:34:32 2011 +0000 can: c_can: disable one shot mode until driver is fixed This patch disables the one shot mode, until the driver has been fixed and tested to support it. > I'm quite sure I've seen a situation where msg_obj 17 "seemed" to be > pending, while msg_obj 18 and 19 already have been transmitted. But > in that case, I enabled ONESHOT for the can interface, which enables > the DA mode (automatic retransmission is disabled). Reported-by: Jan Altenberg Signed-off-by: Marc Kleine-Budde Signed-off-by: Kurt Van Dijck Cc: Bhupesh Sharma Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 53914b67993c724cec585863755c9ebc8446e83b Author: Oliver Hartkopp Date: Tue Mar 22 08:27:25 2011 +0000 can: make struct proto const can_ioctl is the only reason for struct proto to be non-const. script/check-patch.pl suggests struct proto be const. Setting the reference to the common can_ioctl() in all CAN protocols directly removes the need to make the struct proto writable in af_can.c Signed-off-by: Kurt Van Dijck Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller commit 3b261ade4224852ed841ecfd13876db812846e96 Author: Amerigo Wang Date: Tue Mar 22 01:59:47 2011 +0000 net: remove useless comments in net/core/dev.c The code itself can explain what it is doing, no need these comments. Signed-off-by: WANG Cong Signed-off-by: David S. Miller commit 324808c2bc190e9424200e73faab1045df9b7d2e Author: Thomas Gleixner Date: Fri Mar 25 14:16:56 2011 +0000 score: Use generic show_interrupts() Signed-off-by: Thomas Gleixner Acked-by: Chen Liqin commit 991353510e8ab5e55c5bbd058c7545f29192cddf Author: Thomas Gleixner Date: Fri Mar 25 14:16:55 2011 +0000 score: Convert to new irq function names Scripted with coccinelle. Signed-off-by: Thomas Gleixner Acked-by: Chen Liqin commit fa73c5bffbb2961ca71d88b4d925038458bc2b4c Author: Chen Liqin Date: Mon Mar 28 12:02:20 2011 +0800 score: lost a semicolon in asm/irqflags.h commit 538202b5cc7d7071bddd2a70656d57b1cbb45d0b Author: Thomas Gleixner Date: Sun Feb 6 22:23:50 2011 +0000 score: Select GENERIC_HARDIRQS_NO_DEPRECATED All chips converted and proper accessor functions used. Signed-off-by: Thomas Gleixner Acked-by: Chen Liqin commit 7182297ebba6bfe50f594f0d2753b5867ea629fe Author: Thomas Gleixner Date: Sun Feb 6 22:23:47 2011 +0000 score: Convert irq_chip to new functions Use the proper accessor functions in show_interrupts() while at it. Signed-off-by: Thomas Gleixner Acked-by: Chen Liqin commit 3a80e52486eff1221ece5902b423da59f263069d Merge: 18bcd0c 61a1674 Author: Linus Torvalds Date: Sun Mar 27 20:58:56 2011 -0700 Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tile: Use generic show_interupts() tile: Convert to new irq function names dma: Ipu: Convert interupt code commit 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 Merge: 7b724a2 a51b907 Author: Linus Torvalds Date: Sun Mar 27 20:37:50 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: Add MODULE_DEVICE_TABLE to max8997 and max8998 regulator: fix tps6524x section mismatch regulator: Remove more wm831x-specific IRQ operations regulator: add ab8500 enable and raise time delays regulator: provide consumer interface for fall/rise time regulator: add set_voltage_time_sel infrastructure regulator: initialization for ab8500 regulators regulator: add support for USB voltage regulator regulator: switch the ab3100 to use enable_time() Regulator: add suspend-finish API for regulator core. regulator: fix typo in Kconfig regulator: Convert WM831x regulators to genirq regulator: If we fail when setting up a supply say which supply commit 7b724a2260731edbddadfa08f13de5bce2e601a2 Merge: 551b0bd a45e3d6 Author: Linus Torvalds Date: Sun Mar 27 20:35:07 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: Fix yet another race in disconnection ALSA: asihpi - Update verbose debug print macros ALSA: asihpi - Improve non-busmaster adapter operation ALSA: asihpi - Support single-rate no-SRC cards ALSA: HDA: New AD1984A model for Dell Precision R5500 ALSA: vmalloc buffers should use normal mmap ALSA: hda - Fix SPDIF out regression on ALC889 ALSA: usb-audio - Support for Boss JS-8 Jam Station ALSA: usb-audio: add Cakewalk UM-1G support sound/oss/opl3: validate voice and channel indexes sound/oss: remove offset from load_patch callbacks commit 551b0bda46d4caf74755a018e2cdb1d093e000c9 Merge: 4329510 8317d51 Author: Linus Torvalds Date: Sun Mar 27 20:07:01 2011 -0700 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Clean up max8997 IRQ namespace mfd: Fold irq_set_chip/irq_set_handler mfd: Cleanup irq namespace mfd: twl6030: Cleanup interrupt handling mfd: twl4030: Cleanup interrupt handling mfd: mx8925: Remove irq_desc leftovers mfd: htc-i2cpld: Cleanup interrupt handling mfd: htc-egpio: Cleanup interrupt handling mfd: ezx-pcap: Remvove open coded irq handling mfd: 88pm860x: Remove unused irq_desc leftovers mfd: asic3: Cleanup irq handling mfd: Select MFD_CORE if TPS6105X driver is configured mfd: Add MODULE_DEVICE_TABLE to rdc321x-southbridge mfd: Add MAX8997/8966 IRQ control mfd: Constify i2c_device_id tables mfd: OLPC: Clean up names to match what OLPC actually uses mfd: Add mfd_clone_cell(), convert cs5535-mfd/olpc-xo1 to it commit 4329510c22af1d0cfcc291dc4ce6274abebfe170 Merge: 17c6dd8 3506999 Author: Linus Torvalds Date: Sun Mar 27 20:03:39 2011 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: (pmbus) Fix temperature limit register access commit 17c6dd8144924e3c71930636091704da6d043536 Merge: 34c27a4 4fa8eeb Author: Linus Torvalds Date: Sun Mar 27 20:03:12 2011 -0700 Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: hwspinlock: depend on OMAP4 ARM: OMAP2+: Fix warnings for GPMC interrupt OMAP4: PandaBoard: remove unused power regulators arm: mach-omap2: omap_l3_smx: fix irq handler setup arm: mach-omap2: devices: fix omap3_l3_init() return value commit 34c27a497ab0e9ca28eb1bd572907ba8a154ad50 Merge: 8d49a77 0b58b4e Author: Linus Torvalds Date: Sun Mar 27 20:02:45 2011 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: staging: Fix bdops->check_events() misconversion in cyasblkdev_block.c ide: ensure that we re-run the queue handler commit 8d49a77568d1105ff3e64aec484dac059f54824e Merge: 93567c4 1ddd504 Author: Linus Torvalds Date: Sun Mar 27 20:02:07 2011 -0700 Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block * 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block: (122 commits) cciss: fix lost command issue drbd: need include for bitops functions declarations Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation" cciss: fix missed command status value CMD_UNABORTABLE cciss: remove unnecessary casts cciss: Mask off error bits of c->busaddr in cmd_special_free when calling pci_free_consistent cciss: Inform controller we are using 32-bit tags. cciss: hoist tag masking out of loop cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation cciss: export resettable host attribute drbd: drop code present under #ifdef which is relevant to 2.6.28 and below drbd: Fixed handling of read errors on a 'VerifyS' node drbd: Fixed handling of read errors on a 'VerifyT' node drbd: Implemented real timeout checking for request processing time drbd: Remove unused function atodb_endio() drbd: improve log message if received sector offset exceeds local capacity drbd: kill dead code drbd: don't BUG_ON, if bio_add_page of a single page to an empty bio fails drbd: Removed left over, now wrong comments drbd: serialize admin requests for new verify run with pending bitmap io ... commit 93567c43eb2a4771b9c590435928f9b3a428e568 Merge: 1680a01 5c050fb Author: Linus Torvalds Date: Sun Mar 27 19:46:59 2011 -0700 Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 * 'docs-next' of git://git.lwn.net/linux-2.6: docs: update the development process document docs: fix dev_debug() braino in dynamic-debug-howto.txt commit 1680a013b4ef5c5a6aea239d08042652ea65e759 Merge: a17d473 a66c108 Author: Linus Torvalds Date: Sun Mar 27 19:42:12 2011 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (f71882fg) Add support for the F71889A hwmon: (f71882fg) Add support for the F81865F hwmon: (f71882fg) Document all supported devices hwmon: (f71882fg) Per-chip fan/temperature input count tables hwmon: (f71882fg) Secure chip property definition arrays commit a17d47300b4042a3893217c0c3f2d806fe1faa3b Merge: 04a6553 7bf7e37 Author: Linus Torvalds Date: Sun Mar 27 19:40:56 2011 -0700 Merge branch 'for-linus-1' of git://git.infradead.org/mtd-2.6 * 'for-linus-1' of git://git.infradead.org/mtd-2.6: (49 commits) mtd: mtdswap: fix compilation warning mtdswap: kill strict error handling option mtd: nand: enable software BCH ECC in nand simulator mtd: nand: add software BCH ECC support mtd: fix printf format warnings, mostly lack of %zd for size_t, in mtdswap mtd: sm_rtl: check kmalloc return value mtd: cfi: add support for AMIC flashes (e.g. A29L160AT) lib: add shared BCH ECC library mtd: mxc_nand: fix OOB corruption when page size > 2KiB mtd: DaVinci: Removed header file that is not required mtd: pxa3xx_nand: clean the keep configure code mtd: pxa3xx_nand: mtd scan id process could be defined by driver itself mtd: pxa3xx_nand: unify prepare command mtd: pxa3xx_nand: discard wait_for_event,write_cmd,__readid function mtd: pxa3xx_nand: rework irq logic mtd: pxa3xx_nand: make scan procedure more clear mtd: speedtest: fix integer overflow mtd: mxc_nand: fix read past buffer end mtd: omap3: nand: report corrected ecc errors jffs2: remove a trailing white space in commentaries ... commit 04a6553f0766df3f56830c89b7da2f618b7ef0b0 Author: Stephen Rothwell Date: Sat Mar 26 17:22:04 2011 +1100 apm: orphan the driver I no longer have access to any hardware that uses APM and have not provided real maintenance for several years. Hopefully someone with the hardware or energy will step forward if the driver is to be kept. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit b15194b7076d6bb7b0b6f3efcb6a103e6cbcc5db Author: Richard Weinberger Date: Sat Mar 26 20:48:57 2011 +0100 um: Add myself as co-maintainer Signed-off-by: Richard Weinberger Acked-and-appreciated-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 03b044cca18c7b3efd5a06fb5aacab5c6384c2fa Author: Randy Dunlap Date: Sat Mar 26 13:27:54 2011 -0700 docbook: fix rapidio warning Fix fsl_rio.c kernel-doc warning: no exported symbols as requested by !E are found: Warning(arch/powerpc/sysdev/fsl_rio.c): no structured comments found Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 1f524520f9002d47a6c636bb33ff483611c8913a Author: Randy Dunlap Date: Sat Mar 26 13:28:00 2011 -0700 docbook: fix broken media build DocBook/v4l/ no longer has any *.png files, so the 'cp' command fails, breaking the build. Drop the *.png cp. cp: cannot stat `linux-2.6.38-git18/Documentation/DocBook/v4l/*.png': No such file or directory Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit b6d0ad686da95fa85ce0c583ec35017bf1583563 Author: Randy Dunlap Date: Sat Mar 26 13:27:47 2011 -0700 fs: fix inode.c kernel-doc warning Fix inode.c kernel-doc fatal error: 2 comment sections have the same name: Error(fs/inode.c:1171): duplicate section name 'Note' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 6213cfe82461e39219a3b06ecf1d0679b4c0657f Author: Randy Dunlap Date: Sat Mar 26 13:27:41 2011 -0700 ipc: fix util.c kernel-doc warnings Fix ipc/util.c kernel-doc warnings: Warning(ipc/util.c:336): No description found for parameter 'ns' Warning(ipc/util.c:620): No description found for parameter 'ns' Warning(ipc/util.c:790): No description found for parameter 'ns' Signed-off-by: Randy Dunlap Reviewed-by: Jesper Juhl Signed-off-by: Linus Torvalds commit ae91dbfc9949cf042c45798557b48d3b83bc3635 Author: Randy Dunlap Date: Sat Mar 26 13:27:01 2011 -0700 mm: fix memory.c incorrect kernel-doc Fix mm/memory.c incorrect kernel-doc function notation: Warning(mm/memory.c:3718): Cannot understand * @access_remote_vm - access another process' address space on line 3718 - I thought it was a doc line Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit d7c3f8cee81f4548de0513403b74131aee655576 Author: Christoph Lameter Date: Sat Mar 26 20:57:18 2011 -0500 percpu: Omit segment prefix in the UP case for cmpxchg_double Omit the segment prefix in the UP case. GS is not used then and we will generate segfaults if cmpxchg16b is used otherwise. Signed-off-by: Christoph Lameter Signed-off-by: Linus Torvalds commit 76597cd31470fa130784c78fadb4dab2e624a723 Author: Linus Torvalds Date: Sun Mar 27 19:09:29 2011 -0700 proc: fix oops on invalid /proc//maps access When m_start returns an error, the seq_file logic will still call m_stop with that error entry, so we'd better make sure that we check it before using it as a vma. Introduced by commit ec6fd8a4355c ("report errors in /proc/*/*map* sanely"), which replaced NULL with various ERR_PTR() cases. (On ia64, you happen to get a unaligned fault instead of a page fault, since the address used is generally some random error code like -EPERM) Reported-by: Anca Emanuel Reported-by: Tony Luck Cc: Al Viro Cc: Américo Wang Cc: Stephen Wilson Signed-off-by: Linus Torvalds commit e0bccd315db0c2f919e7fcf9cb60db21d9986f52 Author: Ben Hutchings Date: Sun Mar 20 06:48:05 2011 +0000 rose: Add length checks to CALL_REQUEST parsing Define some constant offsets for CALL_REQUEST based on the description at and the definition of ROSE as using 10-digit (5-byte) addresses. Use them consistently. Validate all implicit and explicit facilities lengths. Validate the address length byte rather than either trusting or assuming its value. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit be20250c13f88375345ad99950190685eda51eb8 Author: Dan Rosenberg Date: Sat Mar 19 20:43:43 2011 +0000 ROSE: prevent heap corruption with bad facilities When parsing the FAC_NATIONAL_DIGIS facilities field, it's possible for a remote host to provide more digipeaters than expected, resulting in heap corruption. Check against ROSE_MAX_DIGIS to prevent overflows, and abort facilities parsing on failure. Additionally, when parsing the FAC_CCITT_DEST_NSAP and FAC_CCITT_SRC_NSAP facilities fields, a remote host can provide a length of less than 10, resulting in an underflow in a memcpy size, causing a kernel panic due to massive heap corruption. A length of greater than 20 results in a stack overflow of the callsign array. Abort facilities parsing on these invalid length values. Signed-off-by: Dan Rosenberg Cc: stable@kernel.org Signed-off-by: David S. Miller commit d370af0ef7951188daeb15bae75db7ba57c67846 Author: Dan Rosenberg Date: Sun Mar 20 15:32:06 2011 +0000 irda: validate peer name and attribute lengths Length fields provided by a peer for names and attributes may be longer than the destination array sizes. Validate lengths to prevent stack buffer overflows. Signed-off-by: Dan Rosenberg Cc: stable@kernel.org Signed-off-by: David S. Miller commit d50e7e3604778bfc2dc40f440e0742dbae399d54 Author: Dan Rosenberg Date: Sat Mar 19 20:14:30 2011 +0000 irda: prevent heap corruption on invalid nickname Invalid nicknames containing only spaces will result in an underflow in a memcpy size calculation, subsequently destroying the heap and panicking. v2 also catches the case where the provided nickname is longer than the buffer size, which can result in controllable heap corruption. Signed-off-by: Dan Rosenberg Cc: stable@kernel.org Signed-off-by: David S. Miller commit e433430a0ca9cc1b851a83ac3b305e955b64880a Author: Steffen Klassert Date: Tue Mar 15 21:09:32 2011 +0000 dst: Clone child entry in skb_dst_pop We clone the child entry in skb_dst_pop before we call skb_dst_drop(). Otherwise we might kill the child right before we return it to the caller. Signed-off-by: Steffen Klassert Signed-off-by: David S. Miller commit 3bc07321ccc236f693ce1b6a8786f0a2e38bb87e Author: Steffen Klassert Date: Tue Mar 15 21:08:28 2011 +0000 xfrm: Force a dst refcount before entering the xfrm type handlers Crypto requests might return asynchronous. In this case we leave the rcu protected region, so force a refcount on the skb's destination entry before we enter the xfrm type input/output handlers. This fixes a crash when a route is deleted whilst sending IPsec data that is transformed by an asynchronous algorithm. Signed-off-by: Steffen Klassert Signed-off-by: David S. Miller commit a271c5a0dea418931b6a903ef85adc30ad4c54be Author: OGAWA Hirofumi Date: Sun Mar 27 17:48:57 2011 +0200 NFS: Ensure that rpc_release_resources_task() can be called twice. BUG: atomic_dec_and_test(): -1: atomic counter underflow at: Pid: 2827, comm: mount.nfs Not tainted 2.6.38 #1 Call Trace: [] ? put_rpccred+0x44/0x14e [sunrpc] [] ? rpc_ping+0x4e/0x58 [sunrpc] [] ? rpc_create+0x481/0x4fc [sunrpc] [] ? rpcauth_lookup_credcache+0xab/0x22d [sunrpc] [] ? nfs_create_rpc_client+0xa6/0xeb [nfs] [] ? nfs4_set_client+0xc2/0x1f9 [nfs] [] ? nfs4_create_server+0xf2/0x2a6 [nfs] [] ? nfs4_remote_mount+0x4e/0x14a [nfs] [] ? vfs_kern_mount+0x6e/0x133 [] ? nfs_do_root_mount+0x76/0x95 [nfs] [] ? nfs4_try_mount+0x56/0xaf [nfs] [] ? nfs_get_sb+0x435/0x73c [nfs] [] ? vfs_kern_mount+0x99/0x133 [] ? do_kern_mount+0x48/0xd8 [] ? do_mount+0x6da/0x741 [] ? sys_mount+0x83/0xc0 [] ? system_call_fastpath+0x16/0x1b Well, so, I think this is real bug of nfs codes somewhere. With some review, the code rpc_call_sync() rpc_run_task rpc_execute() __rpc_execute() rpc_release_task() rpc_release_resources_task() put_rpccred() <= release cred rpc_put_task rpc_do_put_task() rpc_release_resources_task() put_rpccred() <= release cred again seems to be release cred unintendedly. Signed-off-by: OGAWA Hirofumi Signed-off-by: Trond Myklebust commit a0e7e3cf7932d6c77de0dc79a40dbaeb8060b544 Author: Trond Myklebust Date: Sat Mar 26 02:24:35 2011 -0400 NFS: Don't leak RPC clients in NFSv4 secinfo negotiation Signed-off-by: Trond Myklebust commit 4d65c520fb4abed970069d18c119cfe85624f46d Author: Trond Myklebust Date: Fri Mar 25 14:15:11 2011 -0400 NFS: Fix a hang in the writeback path Now that the inode scalability patches have been merged, it is no longer safe to call igrab() under the inode->i_lock. Now that we no longer call nfs_clear_request() until the nfs_page is being freed, we know that we are always holding a reference to the nfs_open_context, which again holds a reference to the path, and so the inode cannot be freed until the last nfs_page has been removed from the radix tree and freed. We can therefore skip the igrab()/iput() altogether. Signed-off-by: Trond Myklebust commit c2d0c555c22242c3a76e366074c4d83ef9fa3b8c Author: David Daney Date: Fri Mar 25 12:38:50 2011 -0700 genirq: Split irq_set_affinity() so it can be called with lock held. The .irq_cpu_online() and .irq_cpu_offline() functions may need to adjust affinity, but they are called with the descriptor lock held. Create __irq_set_affinity_locked() which is called with the lock held. Make irq_set_affinity() just a wrapper that acquires the lock. [ tglx: Changed the argument to irq_data, added a !desc check and moved the !irq_set_affinity check where it belongs ] Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Cc: ralf@linux-mips.org LKML-Reference: <1301081931-11240-4-git-send-email-ddaney@caviumnetworks.com> Signed-off-by: Thomas Gleixner commit b3d422329f2e061d66af4f933ef316e50e5edcac Author: Thomas Gleixner Date: Sun Mar 27 16:05:36 2011 +0200 genirq: Add chip flag for restricting cpu_on/offline calls Add a flag which indicates that the on/offline callback should only be called on enabled interrupts. Signed-off-by: Thomas Gleixner commit 0fdb4b259ed3e91b687ac26848202f5e7c217e62 Author: David Daney Date: Fri Mar 25 12:38:49 2011 -0700 genirq: Add chip hooks for taking CPUs on/off line. [ tglx: Removed the enabled argument as this is now available in irq_data ] Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Cc: ralf@linux-mips.org LKML-Reference: <1301081931-11240-3-git-send-email-ddaney@caviumnetworks.com> Signed-off-by: Thomas Gleixner commit 801a0e9ae36e9b487092e31699d28c0b9a21ad52 Author: Thomas Gleixner Date: Sun Mar 27 11:02:49 2011 +0200 genirq: Add irq disabled flag to irq_data state Some irq_chip implementation require to know the disabled state of the interrupt in certain callbacks. Add a state flag and accessor to irq_data. Signed-off-by: Thomas Gleixner commit d72274e5895d11570a0a4a3214a1933c86d5ccb7 Author: David Daney Date: Fri Mar 25 12:38:48 2011 -0700 genirq: Reserve the irq when calling irq_set_chip() The helper macros and functions like for_each_active_irq() don't work unless the irq is in the allocated_irqs set. In the case of !CONFIG_SPARSE_IRQ, instead of forcing all users of the irq infrastructure to explicitly call irq_reserve_irq(), do it for them. Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Cc: ralf@linux-mips.org LKML-Reference: <1301081931-11240-2-git-send-email-ddaney@caviumnetworks.com> Signed-off-by: Thomas Gleixner commit a51b907b2ecdfd3830576733810233f00dcfb2af Author: Axel Lin Date: Sat Mar 26 23:28:42 2011 +0800 regulator: Add MODULE_DEVICE_TABLE to max8997 and max8998 The device table is required to load modules based on modaliases. Signed-off-by: Axel Lin Cc: MyungJoo Ham Cc: Kyungmin Park Cc: Marek Szyprowski Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 60af520cf264ea26b2af3a6871bbd71850522aea Author: Tadeusz Struk Date: Sun Mar 13 16:56:17 2011 +0800 crypto: aesni-intel - fixed problem with packets that are not multiple of 64bytes This patch fixes problem with packets that are not multiple of 64bytes. Signed-off-by: Adrian Hoban Signed-off-by: Aidan O'Mahony Signed-off-by: Gabriele Paoloni Signed-off-by: Tadeusz Struk Signed-off-by: Herbert Xu commit 8317d5178e7491589693693e5a7f64442cf46ca2 Author: Samuel Ortiz Date: Fri Mar 25 17:56:02 2011 +0100 mfd: Clean up max8997 IRQ namespace Signed-off-by: Samuel Ortiz commit d6f7ce9f7fde069424e6400c31717ef34aab7e5f Author: Thomas Gleixner Date: Fri Mar 25 11:12:35 2011 +0000 mfd: Fold irq_set_chip/irq_set_handler Use the combined irq_set_chip_and_handler() function instead. Converted with coccinelle. Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit d5bb122165981aed327845c32a9916d1b8ae0e4b Author: Thomas Gleixner Date: Fri Mar 25 11:12:32 2011 +0000 mfd: Cleanup irq namespace Converted with coccinelle. Signed-off-by: Thomas Gleixner Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit c22435a307e00b8ae947b79a8c0d94ab0bef404c Author: Thomas Gleixner Date: Fri Mar 25 11:12:31 2011 +0000 mfd: twl6030: Cleanup interrupt handling irq_desc checking in the interrupt demux routine is totally pointless. The driver sets those lines up, so that cant go away magically. Remove the open coded handler magic and use the proper accessor. This driver needs to be converted to threaded interrupts and buslock. Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit d740f4523bb4aea24bece704c726c69094e20d00 Author: Thomas Gleixner Date: Fri Mar 25 11:12:31 2011 +0000 mfd: twl4030: Cleanup interrupt handling irq_desc checking in a function which is called with that irq descriptor locked, is pointless. Equally pointless as the irq desc check in the interrupt service routine. The driver sets those lines up, so that cant go away magically. Remove the open coded handler magic and use the proper accessor. No need to fiddle with irq_desc in the type setting function. The original value is in irq_data and the core code stores the new setting when the return value is 0. This driver needs to be converted to threaded interrupts and buslock. Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit 9d8fd10aa5843e018d456644fc1a58896d8eeaf5 Author: Thomas Gleixner Date: Fri Mar 25 11:12:30 2011 +0000 mfd: mx8925: Remove irq_desc leftovers Remove unused code. Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit 9eaee99e5a9cedcc4acb3b5507c0878352222bce Author: Thomas Gleixner Date: Fri Mar 25 11:12:29 2011 +0000 mfd: htc-i2cpld: Cleanup interrupt handling Remove the pointless irq_desc check in set_type. This function is called with that irq descriptor locked. Also remove the write back of the flow type as the core code does this already when the return value is 0. Also store the flow type in the chip data structure, so there is no need to fiddle in the irq descriptor. Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit 77eda96691f5e39973f2f2667a28e57e852f559d Author: Thomas Gleixner Date: Fri Mar 25 11:12:28 2011 +0000 mfd: htc-egpio: Cleanup interrupt handling Replace the open coded handler call with the prober accessor. Retrieve the handler data from desc. That avoids a redundant lookup in the sparse irq case. Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit 73a6839fdb7f3f5ac7bfaee0796dd7647b9c9376 Author: Thomas Gleixner Date: Fri Mar 25 11:12:27 2011 +0000 mfd: ezx-pcap: Remvove open coded irq handling There is no point in checking irq_desc here, as it _is_ available. The driver configured those lines, so they cannot go away. The home brewn disabled/note_interrupt magic can be removed as well by adding a irq_disable callback which avoids the lazy disable. That driver needs to be converted to threaded interrupts. Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit 256d0e2e4553417466ca8213b446954ff1778c2c Author: Thomas Gleixner Date: Fri Mar 25 11:12:27 2011 +0000 mfd: 88pm860x: Remove unused irq_desc leftovers Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit 52a7d60775aa447b3a3dc685b7006f7cdc7835dd Author: Thomas Gleixner Date: Fri Mar 25 11:12:26 2011 +0000 mfd: asic3: Cleanup irq handling Remove the open coded access to irq_desc and use the proper wrappers. Signed-off-by: Thomas Gleixner Signed-off-by: Samuel Ortiz commit fc498fa29c725a0f0fc5ed359db0e3ed33f4ed52 Author: Guenter Roeck Date: Thu Mar 24 12:12:47 2011 -0700 mfd: Select MFD_CORE if TPS6105X driver is configured The TPS61050/61052 driver uses MFD core code, yet does not specify the dependency in Kconfig. If it is the only MFD driver configured, compilation fails with ERROR: "mfd_add_devices" [drivers/mfd/tps6105x.ko] undefined! ERROR: "mfd_remove_devices" [drivers/mfd/tps6105x.ko] undefined! Fix the problem by adding "select MFD_CORE" to the respective Kconfig entry. Signed-off-by: Guenter Roeck Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 8537548645231424b457dd277900054c59096920 Author: Axel Lin Date: Thu Mar 24 15:04:53 2011 +0800 mfd: Add MODULE_DEVICE_TABLE to rdc321x-southbridge The device table is required to load modules based on modaliases. After adding MODULE_DEVICE_TABLE, below entry will be added to modules.pcimap: rdc321x-southbridge 0x000017f3 0x00006030 0xffffffff 0xffffffff 0x00000000 0x00000000 0x0 Signed-off-by: Axel Lin Signed-off-by: Samuel Ortiz commit 8de6bc7f6ba58dd717e4a65e3bf4a746116fb874 Author: MyungJoo Ham Date: Thu Mar 24 15:54:45 2011 +0900 mfd: Add MAX8997/8966 IRQ control This patch enables IRQ handling for MAX8997/8966 chips. Please note that Fuel-Gauge-related IRQs are not implemented in this initial release. The fuel gauge module in MAX8997 is identical to MAX17042, which is already in Linux kernel. In order to use the already-existing MAX17042 driver for fuel gauge module in MAX8997, the main interrupt handler of MAX8997 should relay related interrupts to MAX17042 driver. However, in order to do this, we need to modify MAX17042 driver as well because MAX17042 driver does not have any interrupt handlers for now. We are not going to implement this in this initial release as it is not crucial in basic operations of MAX8997. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Signed-off-by: Samuel Ortiz commit 1206552b02f725bdc603e3153b4a32403d7da9e4 Author: Axel Lin Date: Wed Mar 23 20:54:17 2011 +0800 mfd: Constify i2c_device_id tables Signed-off-by: Axel Lin Acked-by: Harald Welte Cc: Matti Aaltonen Signed-off-by: Samuel Ortiz commit adfa4bd4a8bfc53ca7370c57be240d35c2ec28e2 Author: Daniel Drake Date: Tue Mar 22 13:50:39 2011 -0700 mfd: OLPC: Clean up names to match what OLPC actually uses The cs5535-pms cell doesn't actually need to be cloned, so we can drop that and simply have the olpc-xo1.c driver use "cs5535-pms" directly. Also, rename the cs5535-acpi clones to what we actually use for the (currently out-of-tree) SCI driver. In the process, that fixes a subtle bug in olpc-xo1.c which broke powerdown on XO-1s.. olpc-xo1-ac-acpi was a typo, not something that actually existed. Signed-off-by: Daniel Drake Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit fa1df691688f34cbcd5bf77bd084bbe47e9d6bfe Author: Andres Salomon Date: Mon Mar 21 19:19:35 2011 -0700 mfd: Add mfd_clone_cell(), convert cs5535-mfd/olpc-xo1 to it Replace mfd_shared_platform_driver_register with mfd_clone_cell. The former was called by an mfd client, and registered both a platform driver and device. The latter is called by an mfd driver, and registers only a platform device. The downside of this is that mfd drivers need to be modified whenever new clients are added that share a cell; the upside is that it fits Linux's driver model better. It's also simpler. This also converts cs5535-mfd/olpc-xo1 from the old API. cs5535-mfd now creates the olpc-xo1-{acpi,pms} devices, while olpc-xo1 binds to them via platform drivers. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit cba179aec779b364a683906b99e23014c7652e8e Author: Simon Horman Date: Thu Mar 24 09:48:36 2011 +0100 mmc: tmio_mmc: Move some defines into a shared header Also add TMIO_BBS. This allows these defines to also be used by zboot. Cc: Guennadi Liakhovetski Signed-off-by: Simon Horman Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 0b58b4e3e711aed17aa26fafd01be137f6a1ab2e Author: Tejun Heo Date: Sat Mar 26 19:52:59 2011 +0100 staging: Fix bdops->check_events() misconversion in cyasblkdev_block.c Commit cafb0bfca1 (staging: Convert to bdops->check_events()) incorrectly set bd->user_disk_0->events while initializing bd->user_disk_1. Fix it. The problem was spotted by Milton's suspect code pattern detector. Signed-off-by: Tejun Heo Reported-by: Milton Miller Signed-off-by: Jens Axboe commit 9ced0b95b3993660e7990cf6bf68c1a80f31544e Author: Jens Axboe Date: Sat Mar 26 19:49:54 2011 +0100 ide: ensure that we re-run the queue handler The conversion to blk_delay_queue() missed parts of IDE. Add a blk_delay_queue() to ensure that the request handler gets reinvoked when it needs to. Note that in all but one place the old plug re-run delay of 3 msecs is used, even though it probably could be shorter for performance reasons in some of those cases. Reported-by: Geert Uytterhoeven Signed-off-by: Jens Axboe commit 3506999e2fd1eb7ed7375eaa67dcc1d1d60e8ccd Author: Guenter Roeck Date: Mon Mar 21 21:31:00 2011 -0700 hwmon: (pmbus) Fix temperature limit register access Commit 8677011 added auto-update to temperature limit registers. Unfortunately, the update flag is also used to determine if an attribute is writable, which results in read-only temperature limit registers. To fix the problem, pass 'readonly' as separate flag to the function used to add sensor attributes. Signed-off-by: Guenter Roeck commit 5362b09849508db94a15f3f6996427aab248320a Author: Randy Dunlap Date: Thu Mar 24 13:30:59 2011 -0700 regulator: fix tps6524x section mismatch Acked-by: Mark Brown Fix section mismatch that is caused by init code calling exit code: pmic_remove() cannot be marked as __devexit. WARNING: drivers/regulator/tps6524x-regulator.o(.devinit.text+0x205): Section mismatch in reference from the function pmic_probe() to the function .devexit.text:pmic_remove() The function __devinit pmic_probe() references a function __devexit pmic_remove(). This is often seen when error handling in the init function uses functionality in the exit path. The fix is often to remove the __devexit annotation of pmic_remove() so it may be used outside an exit section. Signed-off-by: Randy Dunlap Cc: Liam Girdwood Cc: Mark Brown Cc: Cyril Chemparathy Signed-off-by: Liam Girdwood commit 69952369ed2367bae0ae207a6e380ed40cdbc414 Author: Mark Brown Date: Fri Mar 18 12:43:35 2011 +0000 regulator: Remove more wm831x-specific IRQ operations These are the last users in the tree. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 42ab616afe8844261828395cc2e4708c867412c2 Author: Linus Walleij Date: Thu Mar 17 13:25:02 2011 +0100 regulator: add ab8500 enable and raise time delays This uses the new infrastructure to provide proper delays when enabling or setting the voltage of one specific regulator. Cc: Bengt Jonsson Signed-off-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 88cd222b259d62148ab8c82398498b1a01314476 Author: Linus Walleij Date: Thu Mar 17 13:24:52 2011 +0100 regulator: provide consumer interface for fall/rise time This exposes the functionality for rise/fall fime when setting voltage to the consumers. Cc: Bengt Jonsson Signed-off-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 77af1b2641faf45788a0d480db94082ebee931dc Author: Linus Walleij Date: Thu Mar 17 13:24:36 2011 +0100 regulator: add set_voltage_time_sel infrastructure This makes it possible to set the stabilization time for voltage regulators in the same manner as enable_time(). The interface only supports regulators that implements fixed selectors. Cc: Bengt Jonsson Signed-off-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 79568b941277b5986a8a7f0fb8578b2ccfc3e87e Author: Bengt Jonsson Date: Fri Mar 11 11:54:46 2011 +0100 regulator: initialization for ab8500 regulators The regulators on the AB8500 have a lot of custom hardware control settings pertaining to 8 external signals, settings which are board-specific and need be provided from the platform at startup. Initialization added for regulators Vana, VextSupply1, VextSupply2, VextSupply3, Vaux1, Vaux2, Vaux3, VTVout, Vintcore12, Vaudio, Vdmic, Vamic1, Vamic2, VrefDDR. Signed-off-by: Bengt Jonsson Reviewed-by: Rickard Andersson Reviewed-by: Jonas Aberg Signed-off-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit ea05ef31f2aa98b25d14222300dc9c1d1eb59e41 Author: Bengt Jonsson Date: Thu Mar 10 14:43:31 2011 +0100 regulator: add support for USB voltage regulator Signed-off-by: Bengt Jonsson Signed-off-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 19c98825941cb10b59c9953665fc4495bc82c0ae Author: Linus Walleij Date: Fri Mar 11 16:26:18 2011 +0100 regulator: switch the ab3100 to use enable_time() Acked-by: Mark Brown This switches the ab3100 core to use the enable_time() infrastructure from the regulator core. Cc: Mattias Wallin Signed-off-by: Linus Walleij Signed-off-by: Liam Girdwood commit 7a32b589a9c856493bccb02db55047edc04eee7b Author: MyungJoo Ham Date: Fri Mar 11 10:13:59 2011 +0900 Regulator: add suspend-finish API for regulator core. The regulator core had suspend-prepare that turns off the regulators when entering a system-wide suspend. However, it did not have suspend-finish that pairs with suspend-prepare and the regulator core has assumed that the regulator devices and their drivers support autonomous recover at resume. This patch adds regulator_suspend_finish that pairs with the previously-existed regulator_suspend_prepare. The function regulator_suspend_finish turns on the regulators that have always_on set or positive use_count so that we can reset the regulator states appropriately at resume. In regulator_suspend_finish, if has_full_constraints, it disables unnecessary regulators. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Acked-by: Mark Brown -- Updates v3 comments corrected (Thanks to Igor) v2 disable unnecessary regulators (Thanks to Mark) Signed-off-by: Liam Girdwood commit fb7c18cac8608983168a7f4f55193cea190c83c8 Author: Igor Grinberg Date: Tue Mar 1 11:54:44 2011 +0200 regulator: fix typo in Kconfig Fix typo: s/TPS695x0/TPS659x0/ Signed-off-by: Igor Grinberg Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit dfda9c27ba15330f37453c389d775ecf9e981d05 Author: Mark Brown Date: Tue Mar 1 16:50:43 2011 +0000 regulator: Convert WM831x regulators to genirq Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 23c2f041efa891e6ec0706dc9ad4f776a9aa8c14 Author: Mark Brown Date: Thu Feb 24 17:39:09 2011 +0000 regulator: If we fail when setting up a supply say which supply Makes it a bit easier to identify if it's a problem with the supplies, the usual error would be omitting the supply name entirely. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit a66c10887ad2a99e172111cc94087ba4bed8fa92 Author: Hans de Goede Date: Sat Mar 26 10:45:02 2011 +0100 hwmon: (f71882fg) Add support for the F71889A Signed-off-by: Hans de Goede Acked-by: Guenter Roeck Signed-off-by: Jean Delvare commit 383586b12d89ba4297c49898645658cdb324b918 Author: Jean Delvare Date: Sat Mar 26 10:45:02 2011 +0100 hwmon: (f71882fg) Add support for the F81865F Add support for the Fintek F81865F. It's essentially compatible with the F71882FG, but has fewer inputs: 7 voltage, 2 temperature and 2 fan inputs only. Signed-off-by: Jean Delvare Acked-by: Hans de Goede Acked-by: Guenter Roeck commit 5d7f77bf66bfa986754b3e12073bef0ab8cd61bd Author: Jean Delvare Date: Sat Mar 26 10:45:02 2011 +0100 hwmon: (f71882fg) Document all supported devices The list of supported devices was not always well documented in all places. Clarify and list all devices in documentation, Kconfig and the driver itself. Signed-off-by: Jean Delvare Acked-by: Hans de Goede Acked-by: Guenter Roeck commit f27def07bfb296d5eb441cd5777d351c7afcb4a1 Author: Jean Delvare Date: Sat Mar 26 10:45:01 2011 +0100 hwmon: (f71882fg) Per-chip fan/temperature input count tables Use tables to list the count of fan and temperature inputs for all supported chips, almost similar to (but more simple than) what is already done for voltage inputs. This avoids repeating the same tests in different functions, and will make it easier to add support for chips with a different count of fan or temperature inputs. Signed-off-by: Jean Delvare Acked-by: Hans de Goede Acked-by: Guenter Roeck commit 2740c60c4ab9a8c6169d7925014f57440361f698 Author: Jean Delvare Date: Sat Mar 26 10:45:01 2011 +0100 hwmon: (f71882fg) Secure chip property definition arrays Using C99-style array initialization will ensure definitions won't drift if the chips enum gets new values added. Signed-off-by: Jean Delvare Acked-by: Hans de Goede Acked-by: Guenter Roeck commit 16c29dafcc86024048f1dbb8349d31cb22c7c55a Merge: dc50edd d47d81c Author: Linus Torvalds Date: Fri Mar 25 21:07:59 2011 -0700 Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: Introduce ARCH_NO_SYSDEV_OPS config option (v2) cpufreq: Use syscore_ops for boot CPU suspend/resume (v2) KVM: Use syscore_ops instead of sysdev class and sysdev PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev timekeeping: Use syscore_ops instead of sysdev class and sysdev x86: Use syscore_ops instead of sysdev classes and sysdevs commit dc50eddb2f3a0dff365f093b2a93fb4ab4dd4389 Merge: 9f34217 cf55bb2 Author: Linus Torvalds Date: Fri Mar 25 21:06:37 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/nes: Fix test of uninitialized netdev commit 9f34217c846a96dea03f4418e2f27423658d3542 Merge: 95e14ed 3703b2c Author: Linus Torvalds Date: Fri Mar 25 21:06:13 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (55 commits) [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module [SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion [SCSI] Revert "[SCSI] Retrieve the Caching mode page" [SCSI] bnx2fc: IO completion not processed due to missed wakeup [SCSI] qla4xxx: Update driver version to 5.02.00-k6 [SCSI] qla4xxx: masking required bits of add_fw_options during initialization [SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices [SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param [SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter [SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed [SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter [SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN [SCSI] qla4xxx: cleanup DDB relogin logic during initialization [SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed [SCSI] qla4xxx: Do not send mbox command if FW is in failed state [SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list() [SCSI] ses: add subenclosure support [SCSI] bnx2fc: Bump version to 1.0.1 [SCSI] bnx2fc: Remove unnecessary module state checks [SCSI] bnx2fc: Fix MTU issue by using static MTU ... commit 95e14ed7fc4b2db62eb597a70850a0fede48b78a Merge: 00a2470 0d3db28 Author: Linus Torvalds Date: Fri Mar 25 21:04:56 2011 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: kdb: add usage string of 'per_cpu' command kgdb,x86_64: fix compile warning found with sparse kdb: code cleanup to use macro instead of value kgdboc,kgdbts: strlen() doesn't count the terminator commit 00a2470546dd8427325636a711a42c934135dbf5 Merge: 5aafdea 6df59a8 Author: Linus Torvalds Date: Fri Mar 25 21:02:22 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits) route: Take the right src and dst addresses in ip_route_newports ipv4: Fix nexthop caching wrt. scoping. ipv4: Invalidate nexthop cache nh_saddr more correctly. net: fix pch_gbe section mismatch warning ipv4: fix fib metrics mlx4_en: Removing HW info from ethtool -i report. net_sched: fix THROTTLED/RUNNING race drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region bonding: fix rx_handler locking myri10ge: fix rmmod crash mlx4_en: updated driver version to 1.5.4.1 mlx4_en: Using blue flame support mlx4_core: reserve UARs for userspace consumers mlx4_core: maintain available field in bitmap allocator mlx4: Add blue flame support for kernel consumers mlx4_en: Enabling new steering mlx4: Add support for promiscuous mode in the new steering model. mlx4: generalization of multicast steering. mlx4_en: Reporting HW revision in ethtool -i ... commit 5aafdea448fb86412a6f8e46df518c1545d32436 Merge: 56a9ccb eca6731 Author: Linus Torvalds Date: Fri Mar 25 21:01:43 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: Disable ASPM when _OSC control is not granted for PCIe services PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs PCI: PCIe links may not get configured for ASPM under POWERSAVE mode PCI/ACPI: Report ASPM support to BIOS if not disabled from command line commit 56a9ccb7ba5ffd5f285e3a9628cb446192c8639c Merge: 44bbd7a 909a78b Author: Linus Torvalds Date: Fri Mar 25 21:00:29 2011 -0700 Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: (30 commits) bq20z75: Fix time and temp units bq20z75: Fix issues with present and suspend z2_battery: Fix count of properties s3c_adc_battery: Fix method names when PM not set z2_battery: Add MODULE_DEVICE_TABLE ds2782_battery: Add MODULE_DEVICE_TABLE bq20z75: Add MODULE_DEVICE_TABLE power_supply: Update power_supply_is_watt_property bq20z75: Add i2c retry mechanism bq20z75: Add optional battery detect gpio twl4030_charger: Make the driver atomic notifier safe bq27x00: Use single i2c_transfer call for property read bq27x00: Cleanup bq27x00_i2c_read bq27x00: Minor cleanups bq27x00: Give more specific reports on battery status bq27x00: Add MODULE_DEVICE_TABLE bq27x00: Add new properties bq27x00: Poll battery state bq27x00: Cache battery registers bq27x00: Add bq27000 support ... commit 44bbd7ac2658eb1118342493026ef141e259b739 Merge: 24c6d02 2991520 Author: Linus Torvalds Date: Fri Mar 25 20:51:44 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm stripe: implement merge method dm mpath: allow table load with no priority groups dm mpath: fail message ioctl if specified path is not valid dm ioctl: add flag to wipe buffers for secure data dm ioctl: prepare for crypt key wiping dm crypt: wipe keys string immediately after key is set dm: add flakey target dm: fix opening log and cow devices for read only tables commit 24c6d02fe8c34bc958aa4c464efc1cc10d43e29d Merge: 0dd61be a0fa220 Author: Linus Torvalds Date: Fri Mar 25 20:50:12 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: tsc2005 - fix locking issue Input: tsc2005 - use relative jiffies to schedule the watchdog Input: tsc2005 - driver should depend on GENERIC_HARDIRQS commit 1fbc78439291627642517f15b9b91f3125588143 Author: Julian Anastasov Date: Fri Mar 25 20:33:23 2011 -0700 ipv4: do not ignore route errors The "ipv4: Inline fib_semantic_match into check_leaf" change forgets to return the route errors. check_leaf should return the same results as fib_table_lookup. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit 0dd61be7ec1be1b6820af978f901b9ae2c244dc6 Merge: 8dd9026 ab7798f Author: Linus Torvalds Date: Fri Mar 25 20:24:05 2011 -0700 Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (23 commits) genirq: Expand generic show_interrupts() gpio: Fold irq_set_chip/irq_set_handler to irq_set_chip_and_handler gpio: Cleanup genirq namespace arm: ep93xx: Add basic interrupt info arm/gpio: Remove three copies of broken and racy debug code xtensa: Use generic show_interrupts() xtensa: Convert genirq namespace xtensa: Use generic IRQ Kconfig and set GENERIC_HARDIRQS_NO_DEPRECATED xtensa: Convert s6000 gpio irq_chip to new functions xtensa: Convert main irq_chip to new functions um: Use generic show_interrupts() um: Convert genirq namespace m32r: Use generic show_interrupts() m32r: Convert genirq namespace h8300: Use generic show_interrupts() h8300: Convert genirq namespace avr32: Cleanup eic_set_irq_type() avr32: Use generic show_interrupts() avr: Cleanup genirq namespace avr32: Use generic IRQ config, enable GENERIC_HARDIRQS_NO_DEPRECATED ... Fix up trivial conflict in drivers/gpio/timbgpio.c commit 8dd90265ac0754da0df47d9c597f25187bb1c947 Merge: 2a20b02 1232d61 Author: Linus Torvalds Date: Fri Mar 25 17:59:38 2011 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched, doc: Update sched-design-CFS.txt sched: Remove unused 'rq' variable and cpu_rq() call from alloc_fair_sched_group() sched.h: Fix a typo ("its") sched: Fix yield_to kernel-doc commit 2a20b02c055a14eb60ac8da737d79dc940bb9ee0 Merge: 839767e 45daae5 Author: Linus Torvalds Date: Fri Mar 25 17:53:09 2011 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf, x86: Complain louder about BIOSen corrupting CPU/PMU state and continue perf, x86: P4 PMU - Read proper MSR register to catch unflagged overflows perf symbols: Look at .dynsym again if .symtab not found perf build-id: Add quirk to deal with perf.data file format breakage perf session: Pass evsel in event_ops->sample() perf: Better fit max unprivileged mlock pages for tools needs perf_events: Fix stale ->cgrp pointer in update_cgrp_time_from_cpuctx() perf top: Fix uninitialized 'counter' variable tracing: Fix set_ftrace_filter probe function display perf, x86: Fix Intel fixed counters base initialization commit 839767e79e7bdf06f241a47701f0f64b8e2d3f61 Merge: 94df491 a2e8461 Author: Linus Torvalds Date: Fri Mar 25 17:52:53 2011 -0700 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Provide locked setter for chip, handler, name genirq: Provide a lockdep helper genirq; Remove the last leftovers of the old sparse irq code commit 94df491c4a01b39d81279a68386158eb02656712 Merge: 26ff680 2909620 Author: Linus Torvalds Date: Fri Mar 25 17:52:22 2011 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Fix WARN_ON() test for UP WARN_ON_SMP(): Allow use in if() statements on UP x86, dumpstack: Use %pB format specifier for stack trace vsprintf: Introduce %pB format specifier lockdep: Remove unused 'factor' variable from lockdep_stats_show() commit 26ff6801f751cd47e44c2e9507ec08b447f2d2b9 Merge: ffbf0ab 07611db Author: Linus Torvalds Date: Fri Mar 25 17:51:51 2011 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional x86: DT: Fix return condition in irq_create_of_mapping() x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context commit ffbf0ab1a648b867ce953cc43557090f679bb9c1 Merge: 73939bb 66d857b Author: Linus Torvalds Date: Fri Mar 25 17:47:58 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: merge m68k and m68knommu arch directories commit 73939bb56acef1c9e776a10f0aeea0456d6815f6 Merge: 7c8d891 1c833bc Author: Linus Torvalds Date: Fri Mar 25 17:47:38 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc32: Fix multiple RTC detections on SUN4D commit 7c8d891c2c7714965db1685289787b0c526f9c42 Merge: 62d0086 54eaae3 Author: Linus Torvalds Date: Fri Mar 25 17:47:04 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] cmpxchg: implement cmpxchg64() [S390] xchg/cmpxchg: move to own header file [S390] ccwgroup_driver: remove duplicate members [S390] ccw_bus_type: make it static [S390] ccw_driver: remove duplicate members [S390] qdio: prevent handling of buffers if count is zero [S390] setup: register bss section as resource [S390] setup: simplify setup_resources() [S390] wire up sys_syncfs [S390] wire up sys_clock_adjtime [S390] wire up sys_open_by_handle_at [S390] wire up sys_name_to_handle_at [S390] oprofile: disable hw sampling for CONFIG_32BIT [S390] early: limit savesys cmd string handling [S390] early: Fix possible overlapping data buffer commit 62d00867514ae1c81ab5e809e189ca159536daee Merge: be4d250 c8fb402 Author: Linus Torvalds Date: Fri Mar 25 17:46:34 2011 -0700 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (49 commits) MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board MIPS: JZ4740: qi_lb60: Add gpio-charger device MIPS: Wire up syncfs(2). MIPS: Hook up name_to_handle_at, open_by_handle_at and clock_adjtime syscalls. MIPS: VR41xx: Convert to new irq_chip functions MIPS: TXx9: Convert to new irq_chip functions MIPS: SNI: Convert to new irq_chip functions MIPS: Sibyte: Convert to new irq_chip functions MIPS: IP32: Convert to new irq_chip functions MIPS: IP27: Convert to new irq_chip functions MIPS: IP22/IP28: Convert to new irq_chip functions MIPS: RB532: Convert to new irq_chip functions MIPS: PowerTV: Convert to new irq_chip functions MIPS: PNX8550: Convert to new irq_chip functions MIPS: PNX83xx: Convert to new irq_chip functions MIPS: msp71xx: Convert to new irq_chip functions MIPS: Loongson: Convert to new irq_chip functions MIPS: Use generic show_interrupts() MIPS: SMTC: Cleanup the hook mess and use irq_data MIPS: SMTC: Use irq_data in smtc_forward_irq() ... commit be4d250ab41e13f8f945be6896695e870b38ba31 Author: Xiaotian Feng Date: Fri Mar 25 01:57:01 2011 -0700 ipcns: fix use after free in free_ipc_ns() commit b515498 ("userns: add a user namespace owner of ipc ns") added a user namespace owner of ipc ns, but it also introduced a use after free in free_ipc_ns(). Signed-off-by: Xiaotian Feng Acked-by: "Serge E. Hallyn" Acked-by: David Howells Cc: "Eric W. Biederman" Cc: Daniel Lezcano Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c03e3126e4f9535f4983d727f036440255c43c82 Author: Rakib Mullick Date: Fri Mar 25 01:57:01 2011 -0700 codafs: fix build break when CONFIG_PROC_SYSCTL=n Commit 0bc825d240ab ("codafs: fix compile warning when CONFIG_SYSCTL=n") introduces build breakage, when CONFIG_PROC_SYSCTL=n and CONFIG_CODA_FS=y: fs/built-in.o: In function `init_coda': psdev.c:(.init.text+0xc02): undefined reference to `coda_sysctl_init' psdev.c:(.init.text+0xc7c): undefined reference to `coda_sysctl_clean' fs/built-in.o: In function `exit_coda': psdev.c:(.exit.text+0xa9): undefined reference to `coda_sysctl_clean' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Rakib Mullick Reported-by: Ingo Molnar Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9263412501022fecef844907129ee2513b5a89de Author: Maxim Levitsky Date: Fri Mar 25 01:56:59 2011 -0700 memstick: add driver for Ricoh R5C592 card reader Signed-off-by: Maxim Levitsky Acked-by: Alex Dubov Cc: FUJITA Tomonori Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0da7aa1a2d8fcafe271a7077599253c8ed94bb2 Author: Josef Bacik Date: Tue Mar 22 11:05:07 2011 -0400 Btrfs: mark the bio with an error if we have a failure in dio I noticed that dio_end_io calls the appropriate endio function with an error, but the endio functions don't actually do anything with that error, they assume that if there was an error then the bio will not be uptodate. So if we had checksum failures we would never pass back EIO. So if there is an error in our endio functions make sure to clear the uptodate flag on the bio. Thanks, Signed-off-by: Josef Bacik commit 98bc3149fad639c8f50c7110b961a2a2fe085eed Author: Josef Bacik Date: Tue Mar 22 11:00:46 2011 -0400 Btrfs: don't allocate dip->csums when doing writes When doing direct writes we store the checksums in the ordered sum stuff in the ordered extent for writing them when the write completes, so we don't even use the dip->csums array. So if we're writing, don't bother allocating dip->csums since we won't use it anyway. Thanks, Signed-off-by: Josef Bacik commit 4e69b598f6cfb0940b75abf7e179d6020e94ad1e Author: Josef Bacik Date: Mon Mar 21 10:11:24 2011 -0400 Btrfs: cleanup how we setup free space clusters This patch makes the free space cluster refilling code a little easier to understand, and fixes some things with the bitmap part of it. Currently we either want to refill a cluster with 1) All normal extent entries (those without bitmaps) 2) A bitmap entry with enough space The current code has this ugly jump around logic that will first try and fill up the cluster with extent entries and then if it can't do that it will try and find a bitmap to use. So instead split this out into two functions, one that tries to find only normal entries, and one that tries to find bitmaps. This also fixes a suboptimal thing we would do with bitmaps. If we used a bitmap we would just tell the cluster that we were pointing at a bitmap and it would do the tree search in the block group for that entry every time we tried to make an allocation. Instead of doing that now we just add it to the clusters group. I tested this with my ENOSPC tests and xfstests and it survived. Signed-off-by: Josef Bacik commit 0e6e847ffe37436e331c132639f9f872febce82e Author: Dave Chinner Date: Sat Mar 26 09:16:45 2011 +1100 xfs: stop using the page cache to back the buffer cache Now that the buffer cache has it's own LRU, we do not need to use the page cache to provide persistent caching and reclaim infrastructure. Convert the buffer cache to use alloc_pages() instead of the page cache. This will remove all the overhead of page cache management from setup and teardown of the buffers, as well as needing to mark pages accessed as we find buffers in the buffer cache. By avoiding the page cache, we also remove the need to keep state in the page_private(page) field for persistant storage across buffer free/buffer rebuild and so all that code can be removed. This also fixes the long-standing problem of not having enough bits in the page_private field to track all the state needed for a 512 sector/64k page setup. It also removes the need for page locking during reads as the pages are unique to the buffer and nobody else will be attempting to access them. Finally, it removes the buftarg address space lock as a point of global contention on workloads that allocate and free buffers quickly such as when creating or removing large numbers of inodes in parallel. This remove the 16TB limit on filesystem size on 32 bit machines as the page index (32 bit) is no longer used for lookups of metadata buffers - the buffer cache is now solely indexed by disk address which is stored in a 64 bit field in the buffer. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder commit 704b2907c2d47ceb187c0e25a6bbc2174b198f2f Author: Dave Chinner Date: Sat Mar 26 09:14:57 2011 +1100 xfs: register the inode cache shrinker before quotachecks During mount, we can do a quotacheck that involves a bulkstat pass on all inodes. If there are more inodes in the filesystem than can be held in memory, we require the inode cache shrinker to run to ensure that we don't run out of memory. Unfortunately, the inode cache shrinker is not registered until we get to the end of the superblock setup process, which is after a quotacheck is run if it is needed. Hence we need to register the inode cache shrinker earlier in the mount process so that we don't OOM during mount. This requires that we also initialise the syncd work before we register the shrinker, so we nee dto juggle that around as well. While there, make sure that we have set up the block sizes in the VFS superblock correctly before the quotacheck is run so that any inodes that are cached as a result of the quotacheck have their block size fields set up correctly. Cc: stable@kernel.org Signed-off-by: Dave Chinner Reviewed-by: Alex Elder commit 7401aafd5019d32a888e5f27332cf580945574bf Author: Dave Chinner Date: Sat Mar 26 09:14:44 2011 +1100 xfs: xfs_trans_read_buf() should return an error on failure When inside a transaction and we fail to read a buffer, xfs_trans_read_buf returns a null buffer pointer and no error. xfs_do_da_buf() checks the error return, but not the buffer, and as a result this read failure condition causes a panic when it attempts to dereference the non-existant buffer. Make xfs_trans_read_buf() return the same error for this situation regardless of whether it is in a transaction or not. This means every caller does not need to check both the error return and the buffer before proceeding to use the buffer. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder commit 1bfd8d04190c615bb8d1d98188dead0c09702208 Author: Dave Chinner Date: Sat Mar 26 09:13:55 2011 +1100 xfs: introduce inode cluster buffer trylocks for xfs_iflush There is an ABBA deadlock between synchronous inode flushing in xfs_reclaim_inode and xfs_icluster_free. xfs_icluster_free locks the buffer, then takes inode ilocks, whilst synchronous reclaim takes the ilock followed by the buffer lock in xfs_iflush(). To avoid this deadlock, separate the inode cluster buffer locking semantics from the synchronous inode flush semantics, allowing callers to attempt to lock the buffer but still issue synchronous IO if it can get the buffer. This requires xfs_iflush() calls that currently use non-blocking semantics to pass SYNC_TRYLOCK rather than 0 as the flags parameter. This allows xfs_reclaim_inode to avoid the deadlock on the buffer lock and detect the failure so that it can drop the inode ilock and restart the reclaim attempt on the inode. This allows xfs_ifree_cluster to obtain the inode lock, mark the inode stale and release it and hence defuse the deadlock situation. It also has the pleasant side effect of avoiding IO in xfs_reclaim_inode when it tries to next reclaim the inode as it is now marked stale. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Reviewed-by: Alex Elder commit a19fb380961f209a3a406443686647bcd01bb9a6 Author: Dave Chinner Date: Sat Mar 26 09:13:42 2011 +1100 vmap: flush vmap aliases when mapping fails On 32 bit systems, vmalloc space is limited and XFS can chew through it quickly as the vmalloc space is lazily freed. This can result in failure to map buffers, even when there is apparently large amounts of vmalloc space available. Hence, if we fail to map a buffer, purge the aliases that have not yet been freed to hopefuly free up enough vmalloc space to allow a retry to succeed. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Reviewed-by: Alex Elder commit 8287889742940cf3c416e755322090d09f2829be Author: Dave Chinner Date: Sat Mar 26 09:13:08 2011 +1100 xfs: preallocation transactions do not need to be synchronous Preallocation and hole punch transactions are currently synchronous and this is causing performance problems in some cases. The transactions don't need to be synchronous as we don't need to guarantee the preallocation is persistent on disk until a fdatasync, fsync, sync operation occurs. If the file is opened O_SYNC or O_DATASYNC, only then should the transaction be issued synchronously. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Reviewed-by: Alex Elder commit 61a167419b318373d414d0edf109fe02b4f96d49 Author: Thomas Gleixner Date: Fri Mar 25 14:21:17 2011 +0000 tile: Use generic show_interupts() Signed-off-by: Thomas Gleixner Acked-by: Chris Metcalf LKML-Reference: <20110325142049.536190130@linutronix.de> commit 1919d641e69eff2d1443e1ca9430f394f2e78699 Author: Thomas Gleixner Date: Fri Mar 25 14:21:16 2011 +0000 tile: Convert to new irq function names Converted with coccinelle. Signed-off-by: Thomas Gleixner Acked-by: Chris Metcalf LKML-Reference: <20110325142049.441954268@linutronix.de> commit 0d3db28daed2529ab90933a3aaaaf46446fdfda8 Author: Namhyung Kim Date: Mon Mar 15 07:28:00 2010 -0500 kdb: add usage string of 'per_cpu' command Signed-off-by: Namhyung Kim Signed-off-by: Jason Wessel commit 21431c2900a0b669080b5bfaae2a7d9d9c026e9b Author: Jason Wessel Date: Mon Mar 15 07:28:00 2010 -0500 kgdb,x86_64: fix compile warning found with sparse Fix sparse warning: arch/x86/kernel/kgdb.c:123:9: warning: switch with no cases Reported-by: Namhyung Kim Signed-off-by: Jason Wessel commit 27029c339b1beebe79bb4e64422ad1bb8d0b6440 Author: Jovi Zhang Date: Mon Mar 15 07:28:00 2010 -0500 kdb: code cleanup to use macro instead of value It's better to use macro KDB_BASE_CMD_MAX instead of 50 Signed-off-by: Jovi Zhang Signed-off-by: Jason Wessel commit adb4b83c12f9d966ea3478aa14c60511467c9916 Author: Dan Carpenter Date: Mon Mar 15 07:28:00 2010 -0500 kgdboc,kgdbts: strlen() doesn't count the terminator This is an off by one because strlen() doesn't count the null terminator. We strcpy() these strings into an array of size MAX_CONFIG_LEN. Signed-off-by: Dan Carpenter Signed-off-by: Jason Wessel commit 6a03513825db4db57fa93821a0c04dbbb39a68e6 Author: Thomas Gleixner Date: Fri Mar 25 12:21:38 2011 +0100 dma: Ipu: Convert interupt code Convert to the new irq chip functions and cleanup the name space. [ Guennadi reported: irq_data_get_chip_data is undefined. Yes, I screwed up. it needs to be irq_data_get_irq_chip_data ] Signed-off-by: Thomas Gleixner Tested-by: Guennadi Liakhovetski Cc: Dan Williams LKML-Reference: commit 5c050fb96380a87a85aad9084b68fdcd2b84c193 Author: Jonathan Corbet Date: Fri Mar 25 12:17:53 2011 -0600 docs: update the development process document Here's a set of changes updating Documentation/development-process. I have update kernel releases and relevant statistics, added information for a couple of tools, zapped some trailing white space, and generally tried to make it more closely match the current state of affairs. [Typo fixes from Joe Perches and Nicolas Kaiser incorporated] Signed-off-by: Jonathan Corbet Acked-by: Greg KH Cc: Randy Dunlap commit a45e3d6b13e97506b616980c0f122c3389bcefa4 Author: Takashi Iwai Date: Thu Mar 24 09:50:15 2011 +0100 ALSA: Fix yet another race in disconnection This patch fixes a race between snd_card_file_remove() and snd_card_disconnect(). When the card is added to shutdown_files list in snd_card_disconnect(), but it's freed in snd_card_file_remove() at the same time, the shutdown_files list gets corrupted. The list member must be freed in snd_card_file_remove() as well. Reported-and-tested-by: Russ Dill Cc: Signed-off-by: Takashi Iwai commit c8fb4022cf61a0462ad01525e0b3dd00410e9eac Author: Lars-Peter Clausen Date: Tue Feb 8 03:43:54 2011 +0100 MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board The jz4740 nand driver now requires that the ecc offsets are set. Signed-off-by: Lars-Peter Clausen Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/2058/ Signed-off-by: Ralf Baechle commit 0b4cf1813f54d708b18c639260fc13dc3d922e96 Author: Lars-Peter Clausen Date: Tue Feb 8 03:43:53 2011 +0100 MIPS: JZ4740: qi_lb60: Add gpio-charger device Register the gpio-charger device which reports whether device is currently charging or not. Signed-off-by: Lars-Peter Clausen Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/2059/ Signed-off-by: Ralf Baechle commit 1bbf28756149a0aa0e3c8a74cea9bbe715639027 Author: Ralf Baechle Date: Fri Mar 25 18:45:20 2011 +0100 MIPS: Wire up syncfs(2). Signed-off-by: Ralf Baechle commit 84ed94323e67c9f99606fb24e8c746a0d62ab95a Author: David Daney Date: Fri Mar 18 10:37:23 2011 -0700 MIPS: Hook up name_to_handle_at, open_by_handle_at and clock_adjtime syscalls. These system calls we recently added. 32-bit ABIs need compat handling for sys_clock_adjtime(). o32 also needs compat handling for sys_open_by_handle_at(); Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2165/ Signed-off-by: Ralf Baechle commit fbaa4e2a19a4b85b38464cf2683e4d275b4d970c Author: Thomas Gleixner Date: Wed Mar 23 21:09:17 2011 +0000 MIPS: VR41xx: Convert to new irq_chip functions And cleanup direct access to irq_desc[]. Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2208/ Patchwork: https://patchwork.linux-mips.org/patch/2209/ Signed-off-by: Ralf Baechle commit d7ae7c7137868fca5a18954f4d70d525f38867c9 Author: Thomas Gleixner Date: Wed Mar 23 21:09:16 2011 +0000 MIPS: TXx9: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2207/ Signed-off-by: Ralf Baechle commit 0b888c7f3a0396cfe59116575a35cdcd166fd515 Author: Thomas Gleixner Date: Wed Mar 23 21:09:15 2011 +0000 MIPS: SNI: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2206/ Signed-off-by: Ralf Baechle commit d6d5d5c4afd4c8bb4c5e3753a2141e9c3a874629 Author: Thomas Gleixner Date: Wed Mar 23 21:09:14 2011 +0000 MIPS: Sibyte: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2205/ Signed-off-by: Ralf Baechle commit 4d2796f83600bbba8e7170e847226c377c0305af Author: Thomas Gleixner Date: Wed Mar 23 21:09:13 2011 +0000 MIPS: IP32: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2204/ Signed-off-by: Ralf Baechle commit 301218df9c07e675e1c5497c818df13bb7fc38b1 Author: Thomas Gleixner Date: Wed Mar 23 21:09:12 2011 +0000 MIPS: IP27: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2203/ Signed-off-by: Ralf Baechle commit 9458ea567a72ebd3852c2d764d32c0f2fb61d0df Author: Thomas Gleixner Date: Wed Mar 23 21:09:11 2011 +0000 MIPS: IP22/IP28: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2202/ Signed-off-by: Ralf Baechle commit efb02da52fe20172acb13f82f12ba36bed690bdc Author: Thomas Gleixner Date: Wed Mar 23 21:09:10 2011 +0000 MIPS: RB532: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2201/ Signed-off-by: Ralf Baechle commit 2f8d36e7112e79ea5e325463f18386e83b5c447c Author: Thomas Gleixner Date: Wed Mar 23 21:09:09 2011 +0000 MIPS: PowerTV: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2200/ Signed-off-by: Ralf Baechle commit 0007b9bdbef801a4f177899fa557997d2f06c36d Author: Thomas Gleixner Date: Wed Mar 23 21:09:09 2011 +0000 MIPS: PNX8550: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2199/ Signed-off-by: Ralf Baechle commit 8fcc34e5ce0a94157349db5a060fbd3656100c6b Author: Thomas Gleixner Date: Wed Mar 23 21:09:08 2011 +0000 MIPS: PNX83xx: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2198/ Signed-off-by: Ralf Baechle commit d7881fbdf866d7d0fc3fd65805b47a837217ba2b Author: Thomas Gleixner Date: Wed Mar 23 21:09:06 2011 +0000 MIPS: msp71xx: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2197/ Signed-off-by: Ralf Baechle commit 7ec8af9e3441478472954c43462376dd83302e00 Author: Thomas Gleixner Date: Wed Mar 23 21:09:06 2011 +0000 MIPS: Loongson: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2196/ Signed-off-by: Ralf Baechle commit f8396c17097db5fa6442533000e3e6d30d16dc5d Author: Thomas Gleixner Date: Wed Mar 23 21:09:05 2011 +0000 MIPS: Use generic show_interrupts() Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2195/ Signed-off-by: Ralf Baechle commit 930cd54b3bd78e52991a89b39b5ef58355ad2b6d Author: Thomas Gleixner Date: Wed Mar 23 21:09:04 2011 +0000 MIPS: SMTC: Cleanup the hook mess and use irq_data Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2194/ Signed-off-by: Ralf Baechle commit 2a2b2212986a4072d11e521a63672e3219173437 Author: Thomas Gleixner Date: Wed Mar 23 21:09:03 2011 +0000 MIPS: SMTC: Use irq_data in smtc_forward_irq() Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2193/ Signed-off-by: Ralf Baechle commit 0e9c4ec61a80a2058a600c9ac8ad3b15574b1201 Author: Thomas Gleixner Date: Wed Mar 23 21:09:02 2011 +0000 MIPS: TXx9: Convert core to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2192/ Signed-off-by: Ralf Baechle commit a93951c459f49ef30eef88569aa159d6451b400f Author: Thomas Gleixner Date: Wed Mar 23 21:09:02 2011 +0000 MIPS: irq_cpu: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2191/ Signed-off-by: Ralf Baechle commit 5b3a374109f844ab7307ce3486749a1b69a7b3a7 Author: Thomas Gleixner Date: Wed Mar 23 21:09:01 2011 +0000 MIPS: RM9000: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2190/ Signed-off-by: Ralf Baechle commit e059852acaf4c2e2f2de6fa90d18946ea6b5bdb4 Author: Thomas Gleixner Date: Wed Mar 23 21:09:00 2011 +0000 MIPS: rm7000: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2189/ Signed-off-by: Ralf Baechle commit e15883da8a8b83c73bf1ba030cddeb2cfd92a555 Author: Thomas Gleixner Date: Wed Mar 23 21:08:59 2011 +0000 MIPS: MSC01: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2188/ Signed-off-by: Ralf Baechle commit aa400ae5ecaeab00336fdedf51f58c017e5f2274 Author: Thomas Gleixner Date: Wed Mar 23 21:08:59 2011 +0000 MIPS: GT641xx: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2187/ Signed-off-by: Ralf Baechle commit 161d049e8c6435284a792cbd00d420a506edd2cb Author: Thomas Gleixner Date: Wed Mar 23 21:08:58 2011 +0000 MIPS: GIC: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2186/ Signed-off-by: Ralf Baechle commit 7c8d948f1633da5ff81e4f5b31ef237d74c40127 Author: Thomas Gleixner Date: Wed Mar 23 21:08:57 2011 +0000 MIPS: i8259: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2185/ Signed-off-by: Ralf Baechle commit 9fcecaf02dbde08337323bcca7917ec0baad0cc2 Author: Thomas Gleixner Date: Wed Mar 23 21:08:56 2011 +0000 MIPS: LASAt: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2184/ Signed-off-by: Ralf Baechle commit fe92a238263991c81e0910e0b2f56ed969ec160d Author: Lars-Peter Clausen Date: Wed Mar 23 21:08:55 2011 +0000 MIPS: JZ4740: Cleanup the mechanical irq_chip conversion The conversion did not make use of the new chip flag which signals the core code to mask the chip before calling the set_type callback. Sigh. Use the new lockdep helper as well. Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2183/ Signed-off-by: Ralf Baechle commit cd11d14de91809ff3a150f823965a5b4209cad84 Author: Lars-Peter Clausen Date: Wed Mar 23 21:08:54 2011 +0000 MIPS: JZ4740: GPIO: Use shared irq chip for all gpios Currently there is one irq_chip per gpio_chip with the only difference being the name. Since the information whether the irq belong to GPIO bank A, B, C or D is not that important rewrite the code to simply use a single irq_chip for all gpio_chips. Signed-off-by: Lars-Peter Clausen Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2182/ Signed-off-by: Ralf Baechle commit 42b64f388c171a7a1a8962d93d9bae2c04da7738 Author: Thomas Gleixner Date: Wed Mar 23 21:08:53 2011 +0000 MIPS: JZ4740: Convert to new irq functions Convert the JZ4740 intc and gpio irq chips to use newstyle irq functions. Signed-off-by: Lars-Peter Clausen Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2181/ Signed-off-by: Ralf Baechle commit db00bed4baa8951b579519e90d8d7f215db2827a Author: Thomas Gleixner Date: Wed Mar 23 21:08:52 2011 +0000 MIPS: JAZZ: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2180/ Signed-off-by: Ralf Baechle commit 90a568f7bb9eab60958d47903f4c655cd9935148 Author: Thomas Gleixner Date: Wed Mar 23 21:08:51 2011 +0000 MIPS: EMMA: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2179/ Signed-off-by: Ralf Baechle commit 009c200a66a27c34c92ad02ac8c9758e6d0e34e3 Author: Thomas Gleixner Date: Wed Mar 23 21:08:51 2011 +0000 MIPS: DEC: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2178/ Signed-off-by: Ralf Baechle commit 93f293610446f10fd13de9f18b4d0300f0d89279 Author: Thomas Gleixner Date: Wed Mar 23 21:08:47 2011 +0000 MIPS: bcm63xx: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2176/ Signed-off-by: Ralf Baechle commit 3fb8818bd2ed2030f00678da090adff36739bf20 Author: Thomas Gleixner Date: Wed Mar 23 21:08:47 2011 +0000 MIPS: ath79: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2175/ Signed-off-by: Ralf Baechle commit 41d735e8705c5a2cffe64bc56624a4bb0519c1da Author: Thomas Gleixner Date: Wed Mar 23 21:08:46 2011 +0000 MIPS: AR7: Convert to new irq_chip functions Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2174/ Signed-off-by: Ralf Baechle commit d24c1a26ca952264d92ccf6acafe38912e05b1f8 Author: Thomas Gleixner Date: Wed Mar 23 21:08:44 2011 +0000 MIPS: Alchemy: Convert to new irq chip functions Fix the deadlock in set_type() while at it: The code called set_irq_chip_and_handler_name() resp. set_irq_chip() from the set_type() callback. That only works on UP and lock debugging disabled. Otherwise it would dead lock on desc->lock. __irq_set_chip_handler_name_locked() avoids that. Signed-off-by: Thomas Gleixner To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2173/ Signed-off-by: Ralf Baechle commit 786a5e02802a02c6e0bd132f4fc188a5854ab41f Author: Anoop P A Date: Tue Jan 25 13:53:17 2011 +0530 MIPS: MSP71xx: Add CPU feature override file. Signed-off-by: Anoop P A To: linux-mips@linux-mips.org To: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/2045/ Signed-off-by: Ralf Baechle commit ec9ac747be8c42a653468295162cbc02d0a8a8a6 Author: Anoop P A Date: Tue Jan 25 23:24:09 2011 +0530 MIPS: MSP71xx: Platform support for On-chip MSP ethernet devices. Some of MSP family SoC's come with legacy 100Mbps mspeth while some comes with newer Gigabit TSMAC.Following patch adds platform support for both types of MAC's. If TSMAC is not selected assume platform having legacy mspeth. Add gpio_macros as well which is required for resetting the PHY. [Ralf: Killed all typedefs.] Signed-off-by: Anoop P A To: linux-mips@linux-mips.org To: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/2048/ Signed-off-by: Ralf Baechle commit 5027070b3ca2eb90adbf40c2d67f792818ae9077 Author: Anoop P A Date: Tue Jan 25 13:52:05 2011 +0530 MIPS: MSP71xx: Platform support for MSP on-chip USB controller. Signed-off-by: Anoop P A To: linux-mips@linux-mips.org To: linux-kernel@vger.kernel.org Cc: Anoop P A Patchwork: https://patchwork.linux-mips.org/patch/2043/ Signed-off-by: Ralf Baechle commit 088f3876fc9234feca0cdfdf710b8fafa87bfce1 Author: Anoop P A Date: Tue Jan 25 13:51:03 2011 +0530 MIPS: MSP71xx: Add VSMP/SMTC support. [Ralf: Fixed more checkpatch assertions and inclusion of unnecessary header .] Signed-off-by: Anoop P A To: linux-mips@linux-mips.org To: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/2042/ Signed-off-by: Ralf Baechle commit 92592c9ccac9ab9c652533e08d0daad06f1dc501 Author: Anoop P A Date: Tue Jan 25 13:50:10 2011 +0530 MIPS: MSP71xx: Add vectored interrupt support. This patch will add vectored interrupt setups required for MIPS MT modes. irq_cic has been restructured and moved per irq handler to different file. irq_cic has been re wrote to support mips MT modes ( VSMP / SMTC ) [Ralf: fixed some more checkpatch warnings.] Signed-off-by: Anoop P A To: linux-mips@linux-mips.org To: linux-kernel@vger.kernel.org To: dhowells@redhat.com Patchwork: https://patchwork.linux-mips.org/patch/2041/ Signed-off-by: Ralf Baechle commit 3b042d0830463056a669a12362c940a94f7e3cd7 Author: Anoop P A Date: Tue Jan 25 23:38:16 2011 +0530 MIPS: MSP71xx: Set up MSP VPE1 timer. VPE1 timer will be required for VSMP / SMTC. [Ralf: Fixed a bunch of issues raised by checkpatch.] Signed-off-by: Anoop P A Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/2049/ Signed-off-by: Ralf Baechle commit 1685f3b158a244d4f6e205e67c84483fffcb2d9f Author: Ralf Baechle Date: Fri Mar 25 18:45:13 2011 +0100 MIPS: SMTC: Move declaration of smtc_init_secondary to . Signed-off-by: Ralf Baechle commit f9b08d9c606498584e1fb05ab95a575e52f0f8e2 Author: Ralf Baechle Date: Fri Mar 25 18:45:13 2011 +0100 MIPS: Remove useless initialization. Signed-off-by: Ralf Baechle commit 756cca61a7faddcafa582d683b46f32280eda948 Author: Ralf Baechle Date: Fri Mar 25 18:45:13 2011 +0100 MIPS: Microoptimize arch_{read,write}_lock Signed-off-by: Ralf Baechle commit 4bafad922ab480d5f86052e679abf5c3ca6dbfa7 Author: FUJITA Tomonori Date: Fri Sep 3 09:49:12 2010 +0900 MIPS: Enable ARCH_DMA_ADDR_T_64BIT if (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT Signed-off-by: FUJITA Tomonori To: akpm@linux-foundation.org Cc: linux-mips@linux-mips.org Cc: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/1566/ Signed-off-by: Ralf Baechle commit 40471856f2e38e9bfa8d605295e8234421110dd6 Merge: ae005cb 0acd220 Author: Linus Torvalds Date: Fri Mar 25 10:03:28 2011 -0700 Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (28 commits) Cleanup XDR parsing for LAYOUTGET, GETDEVICEINFO NFSv4.1 convert layoutcommit sync to boolean NFSv4.1 pnfs_layoutcommit_inode fixes NFS: Determine initial mount security NFS: use secinfo when crossing mountpoints NFS: Add secinfo procedure NFS: lookup supports alternate client NFS: convert call_sync() to a function NFSv4.1 remove temp code that prevented ds commits NFSv4.1: layoutcommit NFSv4.1: filelayout driver specific code for COMMIT NFSv4.1: remove GETATTR from ds commits NFSv4.1: add generic layer hooks for pnfs COMMIT NFSv4.1: alloc and free commit_buckets NFSv4.1: shift filelayout_free_lseg NFSv4.1: pull out code from nfs_commit_release NFSv4.1: pull error handling out of nfs_commit_list NFSv4.1: add callback to nfs4_commit_done NFSv4.1: rearrange nfs_commit_rpcsetup NFSv4.1: don't send COMMIT to ds for data sync writes ... commit ae005cbed12d0b340b04b59d6f5c56e710b3895d Merge: 3961cdf 0ba0851 Author: Linus Torvalds Date: Fri Mar 25 09:57:40 2011 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (43 commits) ext4: fix a BUG in mb_mark_used during trim. ext4: unused variables cleanup in fs/ext4/extents.c ext4: remove redundant set_buffer_mapped() in ext4_da_get_block_prep() ext4: add more tracepoints and use dev_t in the trace buffer ext4: don't kfree uninitialized s_group_info members ext4: add missing space in printk's in __ext4_grp_locked_error() ext4: add FITRIM to compat_ioctl. ext4: handle errors in ext4_clear_blocks() ext4: unify the ext4_handle_release_buffer() api ext4: handle errors in ext4_rename jbd2: add COW fields to struct jbd2_journal_handle jbd2: add the b_cow_tid field to journal_head struct ext4: Initialize fsync transaction ids in ext4_new_inode() ext4: Use single thread to perform DIO unwritten convertion ext4: optimize ext4_bio_write_page() when no extent conversion is needed ext4: skip orphan cleanup if fs has unknown ROCOMPAT features ext4: use the nblocks arg to ext4_truncate_restart_trans() ext4: fix missing iput of root inode for some mount error paths ext4: make FIEMAP and delayed allocation play well together ext4: suppress verbose debugging information if malloc-debug is off ... Fi up conflicts in fs/ext4/super.c due to workqueue changes commit 9cad7962704d617ab1e4ae304baaaa22d727932b Author: Jonathan Corbet Date: Fri Mar 25 10:42:17 2011 -0600 docs: fix dev_debug() braino in dynamic-debug-howto.txt While looking at dynamic-debug-howto.txt, I noticed that it references dev_debug() (which doesn't exist) instead of dev_dbg() (which does exist). I'm lazy, so I choose to fix the document rather than changing every dev_dbg() call. Signed-off-by: Jonathan Corbet commit 3961cdf85b749f6bab50ad31ee97e9277e7a3b70 Merge: d39dd11 ad3d9d7 Author: Linus Torvalds Date: Fri Mar 25 09:36:35 2011 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: fix issue with calling blk_stop_queue() from the request_fn handler block: fix bug with inserting flush requests as sort/merge commit ab7798ffcf98b11a9525cf65bacdae3fd58d357f Author: Thomas Gleixner Date: Fri Mar 25 16:48:50 2011 +0100 genirq: Expand generic show_interrupts() Some archs want to print extra information for certain irq_chips which is per irq and not per chip. Allow them to provide a chip callback to print the chip name and the extra information. PowerPC wants to print the LEVEL/EDGE type information. Make it configurable. Signed-off-by: Thomas Gleixner commit ad3d9d7ede04a9c71be7a9fe1a23961817f371f7 Author: Jens Axboe Date: Fri Mar 25 16:58:59 2011 +0100 block: fix issue with calling blk_stop_queue() from the request_fn handler When the queue work handler was converted to delayed work, the stopping was inadvertently made sync as well. Change this back to being async stop, using __cancel_delayed_work() instead of cancel_delayed_work(). Reported-by: Jeremy Fitzhardinge Reported-by: Chris Mason Signed-off-by: Jens Axboe commit 401a18e92ce32cd0ddfa5738899ca2b8114f2bbf Author: Jens Axboe Date: Fri Mar 25 16:57:52 2011 +0100 block: fix bug with inserting flush requests as sort/merge With the introduction of the on-stack plugging, we would assume that any request being inserted was a normal file system request. As flush/fua requires a special insert mode, this caused problems. Fix this up by checking for this in flush_plug_list() and use the appropriate insert mechanism. Big thanks goes to Markus Tripplesdorf for tirelessly testing patches, and to Sergey Senozhatsky for helping find the real issue. Reported-by: Markus Tripplesdorf Signed-off-by: Jens Axboe commit 7bf7e370d5919112c223a269462cd0b546903829 Merge: 68b1a1e d39dd11 Author: Artem Bityutskiy Date: Fri Mar 25 17:41:20 2011 +0200 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits) [media] rc: update for bitop name changes fs: simplify iget & friends fs: pull inode->i_lock up out of writeback_single_inode fs: rename inode_lock to inode_hash_lock fs: move i_wb_list out from under inode_lock fs: move i_sb_list out from under inode_lock fs: remove inode_lock from iput_final and prune_icache fs: Lock the inode LRU list separately fs: factor inode disposal fs: protect inode->i_state with inode->i_lock lib, arch: add filter argument to show_mem and fix private implementations SLUB: Write to per cpu data when allocating it slub: Fix debugobjects with lockless fastpath autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd() autofs4 - remove autofs4_lock autofs4 - fix d_manage() return on rcu-walk autofs4 - fix autofs4_expire_indirect() traversal autofs4 - fix dentry leak in autofs4_expire_direct() autofs4 - reinstate last used update on access vfs - check non-mountpoint dentry might block in __follow_mount_rcu() ... NOTE! This merge commit was created to fix compilation error. The block tree was merged upstream and removed the 'elv_queue_empty()' function which the new 'mtdswap' driver is using. So a simple merge of the mtd tree with upstream does not compile. And the mtd tree has already be published, so re-basing it is not an option. To fix this unfortunate situation, I had to merge upstream into the mtd-2.6.git tree without committing, put the fixup patch on top of this, and then commit this. The result is that we do not have commits which do not compile. In other words, this merge commit "merges" 3 things: the MTD tree, the upstream tree, and the fixup patch. commit 68b1a1e786f29c900fa1c516a402e24f0ece622a Author: Artem Bityutskiy Date: Fri Mar 25 17:10:16 2011 +0200 mtd: mtdswap: fix compilation warning Fix the following compilation warning: drivers/mtd/mtdswap.c: In function ‘mtdswap_pick_gc_eblk’: drivers/mtd/mtdswap.c:859: warning: ‘idx’ may be used uninitialized in this function drivers/mtd/mtdswap.c:859: note: ‘idx’ was declared here Initialize idx to -1 because this value means "no tree choosen". Signed-off-by: Artem Bityutskiy commit e21fa86ad0ffa2c292b104ea19bdaa46ceab7105 Author: Yang Ruirui Date: Mon Mar 14 09:50:56 2011 +0800 mtdswap: kill strict error handling option As Artem Bityutskiy suggested: this option is controversial, as we do not really have any prove it is useful. And it is too much to have it as a config parameter. So, better kill it and let the real mtdswap users decide whether it is needed or not. Signed-off-by: Yang Ruirui Signed-off-by: Artem Bityutskiy commit 5fd0157901d5a8f497f3d3b95cb4beebf1641d1b Author: Guennadi Liakhovetski Date: Wed Mar 9 14:45:44 2011 +0100 mmc: tmio: support aggressive clock gating Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit a7edbe399b40fb82ccd11216fd88d24e428025c5 Author: Guennadi Liakhovetski Date: Wed Mar 9 14:38:58 2011 +0100 mmc: tmio: fix power-mode interpretation The power-mode sequence on MMC is MMC_POWER_OFF -> MMC_POWER_UP -> MMC_POWER_ON and not MMC_POWER_ON -> MMC_POWER_UP, as the driver currently is implying. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit d9b03421775d5cf8b4d5518a3e80b28cf3f999ce Author: Guennadi Liakhovetski Date: Thu Mar 10 18:43:07 2011 +0100 mmc: tmio: remove work-around for unmasked SDIO interrupts SDIO IRQs got unmasked on sh-mobile while writing to the CTL_CLK_AND_WAIT_CTL register, because that register at address 0x138 is not implemented on those SoCs and writes to it overwrite the register at address 0x38: CTL_SDIO_IRQ_MASK. Previous patches eliminated access to register above 0xff on sh-mobile, so that this work-around isn't needed anymore. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit d80e9221742235ebfcbe85e3899603ab2b716749 Author: Guennadi Liakhovetski Date: Wed Mar 9 13:42:42 2011 +0100 sh: fix SDHI IO address-range SDHI registers occupy only a 0x100 byte large window, not 0x200 byte. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 31d31fe76859653172120b5f8f7440f2a0694de9 Author: Guennadi Liakhovetski Date: Wed Mar 9 13:09:27 2011 +0100 ARM: mach-shmobile: fix SDHI IO address-range SDHI registers occupy only a 0x100 byte large window, not 0x200 byte. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 69d1fe18e92afb4687605a1ab2ec73fbc3bae344 Author: Guennadi Liakhovetski Date: Wed Mar 9 17:28:55 2011 +0100 mmc: tmio: only access registers above 0xff, if available Not all tmio implementations have registers above oxff. Accessing them on thise platforms is dangerous. In some cases it leads to address wrapping to addresses below 0x100, which corrupts random unrelated registers. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 52c6182a47fa66ad5f2647a831efa99c05b0a54e Author: Guennadi Liakhovetski Date: Wed Mar 9 11:33:35 2011 +0100 mfd: remove now redundant sh_mobile_sdhi.h header Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Acked-by: Samuel Ortiz Signed-off-by: Chris Ball commit 960b9e7ec651f381f639aafcca483d704b2cc3b0 Author: Guennadi Liakhovetski Date: Wed Mar 9 11:29:48 2011 +0100 sh: convert boards to use linux/mmc/sh_mobile_sdhi.h Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 17e75d82518ac3146966b64adc109344fcc80f8a Author: Guennadi Liakhovetski Date: Wed Mar 9 11:27:56 2011 +0100 ARM: mach-shmobile: convert boards to use linux/mmc/sh_mobile_sdhi.h Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 42051e8a7bce76ebd3cd201704ee2427120636e1 Author: Guennadi Liakhovetski Date: Mon Mar 14 09:52:33 2011 +0100 mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver On sh-mobile platforms the SDHI driver was using the tmio_mmc SD/SDIO MFD cell driver. Now that the tmio_mmc driver has been split into a core and a separate MFD glue, we can support SDHI natively without the need to emulate an MFD controller. This also allows to support systems with an on-SoC SDHI controller and a separate MFD with a TMIO core. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 4fbc5ece430bc2890edc90a112c742844130f943 Author: Guennadi Liakhovetski Date: Wed Mar 9 13:44:29 2011 +0100 sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD The CONFIG_MFD_SH_MOBILE_SDHI Kconfig symbol is going to disappear soon, switch ecovec to using CONFIG_MMC_TMIO(_MODULE). Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit b6147490e6aac82fa2f4b9d7fce925d9891ebe8f Author: Guennadi Liakhovetski Date: Wed Mar 23 12:42:44 2011 +0100 mmc: tmio: split core functionality, DMA and MFD glue TMIO MMC chips contain an SD / SDIO IP core from Panasonic, similar to the one, used in MN5774 and other MN57xx controllers. These IP cores are included in many multifunction devices, in sh-mobile chips from Renesas, in the latter case they can also use DMA. Some sh-mobile implementations also have some other specialities, that MFD-based solutions don't have. This makes supporting all these features in a monolithic driver inconveniet and error-prone. This patch splits the driver into 3 parts: the core, the MFD glue and the DMA support. In case of a modular build, two modules will be built: mmc_tmio_core and mmc_tmio. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 5f52c3552946eafa13f89c949449d16ce2b58b24 Author: Guennadi Liakhovetski Date: Mon Mar 7 11:33:11 2011 +0100 mmc: tmio: use PIO for short transfers This patch allows transferring of some requests in PIO and some in DMA mode and defaults to using DMA only for transfers longer than 8 bytes. This is especially useful with SDIO, which can have lots of 2- and 4-byte transfers, creating unnecessary high overhead, when executed in DMA. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 51fc7b2ce74d31b7d9a6bd3c57bf6c1cc77e837d Author: Guennadi Liakhovetski Date: Fri Mar 4 09:56:21 2011 +0100 mmc: tmio-mmc: Improve DMA stability on sh-mobile On some SDHI tmio implementations the order of DMA and command completion interrupts swaps, which leads to malfunction. This patch postpones DMA activation until the MMC command completion IRQ time. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Chris Ball commit 4f665cb614b8a258b507cc47753dd3f7dd45aac6 Author: Yoshihiro Shimoda Date: Fri Mar 25 15:06:19 2011 +0900 mmc: fix mmc_app_send_scr() for dma transfer This patch is based on the commit "af51715079e7fb6b290e1881d63d815dc4de5011": * Bugfix to that mmc_send_cxd_data() code: dma-to-stack is unsafe/nonportable, so kmalloc a bounce buffer instead. The driver may invalidate the mmc_card->csd when host driver uses dma. So this subroutine also needs a kmalloc buffer. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Chris Ball commit 58ac8177cebb890ba980cdace36457e0fe1e62af Author: Richard Zhu Date: Mon Mar 21 13:22:16 2011 +0800 mmc: sdhci-esdhc: enable esdhc on imx53 Fix the NO INT in the Multi-BLK IO in SD/MMC, and Multi-BLK read in SDIO on imx53. The CMDTYPE of the CMD register (offset 0xE) should be set to "11" when the STOP CMD12 is issued on imx53 to abort one open ended multi-blk IO. Otherwise the TC INT wouldn't be generated. In exact block transfer, the controller doesn't complete the operations automatically as required at the end of the transfer and remains on hold if the abort command is not sent on imx53. As a result, the TC flag is not asserted and SW receives timeout exception. Set bit1 of Vendor Spec register to fix it. Signed-off-by: Richard Zhu Signed-off-by: Richard Zhao Reviewed-by: Wolfram Sang Signed-off-by: Chris Ball commit e149860d16d96aef1a8eb7dc1d0b9d4313479e61 Author: Richard Zhu Date: Fri Mar 25 09:18:27 2011 -0400 mmc: sdhci-esdhc: use writel/readl as general APIs Add one flag to indicate the GPIO CD/WP is enabled or not on imx platforms, and reuse the writel/readl as the general APIs for imx SOCs. Signed-off-by: Richard Zhu Reviewed-by: Wolfram Sang Signed-off-by: Chris Ball commit 574e3f5602d930a962f50dcc7124941c60c44084 Author: Richard Zhu Date: Mon Mar 21 13:22:14 2011 +0800 mmc: sdhci: add the abort CMDTYPE bits definition Add the abort CMDTYPE bits definition of command register (offset 0xE) Signed-off-by: Richard Zhu Signed-off-by: Chris Ball commit e481e45df754cbb01630e308f9baeb1c066ef1f9 Author: Richard Zhu Date: Mon Mar 21 13:22:13 2011 +0800 mmc: sdhci-esdhc: remove SDHCI_QUIRK_NO_CARD_NO_RESET from esdhc sdhci-esdhc-imx does not need SDHCI_QUIRK_NO_CARD_NO_RESET. Make it OF-specific. Signed-off-by: Richard Zhu Tested-by: Wolfram Sang Signed-off-by: Chris Ball commit b2fce6ad9f0f01cc06745298148a4941ccc4d3ec Author: David Miller Date: Fri Mar 18 15:00:23 2011 -0700 mmc: of_mmc_spi: Need to include irq.h and of_irq.h Since these are the headers that provide irq_of_parse_and_map() and NO_IRQ. Signed-off-by: David S. Miller Acked-by: Grant Likely Signed-off-by: Chris Ball commit 768fbc1876b3239f4c463c00ea1e78725554cf21 Author: Pawel Moll Date: Fri Mar 11 17:18:07 2011 +0000 mmc: mmci: Add ARM variant with extended FIFO New IO FPGA implementation for Versatile Express boards contain MMCI (PL180) cell with FIFO extended to 128 words (512 bytes). Matt Waddel reports that this patch improves MMC performance on his vexpress system, and also fixes "mmcblk0: error -5 transferring data" errors. Signed-off-by: Pawel Moll Tested-by: Matt Waddel Signed-off-by: Chris Ball commit a5289a433dd7b15df248d1f0272f52be38fe6971 Author: Jaehoon Chung Date: Fri Feb 25 11:08:13 2011 +0900 mmc: dw_mmc: set fixed burst in BMOD register This patch uses the fixed burst bit when using an internal DMA controller. I found increased performance with IDMAC when this bit is set. Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park Signed-off-by: Chris Ball commit cf5e23e1c27af4291cf90020c295756ba4dcf326 Author: Sergei Shtylyov Date: Thu Mar 17 16:46:17 2011 -0400 mmc: use pci_dev->revision The SDHCI driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so it was not converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all drivers to use pci_device->revision). The newer VIA driver has similar code too. This patch converts both drivers to use the 'revision' field of 'struct pci_dev'. Signed-off-by: Sergei Shtylyov Acked-by: Harald Welte Signed-off-by: Chris Ball commit 5a8fba524c2063cb297bdbacda535448ee365dc4 Author: Chris Ball Date: Wed Mar 16 17:46:45 2011 -0400 mmc: mmc_test: Remove set-but-unused variable. Fixes: drivers/mmc/card/mmc_test.c: In function ‘mmc_test_seq_perf’: drivers/mmc/card/mmc_test.c:1878:28: warning: variable ‘ts’ set but not used [-Wunused-but-set-variable] There's no reason to be calling timespec_sub() here, because mmc_test_print_avg_rate() is going to do that itself. Signed-off-by: Chris Ball Cc: Adrian Hunter commit b2e65c8e9133218eb28c30e79ddd3d66d4666ba0 Author: Eliot Blennerhassett Date: Fri Mar 25 15:25:48 2011 +1300 ALSA: asihpi - Update verbose debug print macros Replace local VPRINTK1 with snd_printdd. Create local snd_printddd instead of VPRINTK2 for most verbose debug. In most cases let snd_printk supply default level for messages. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 26aebef420f8036213419b8a46e3a07db51439cd Author: Eliot Blennerhassett Date: Fri Mar 25 15:25:47 2011 +1300 ALSA: asihpi - Improve non-busmaster adapter operation Make playback silence callback a no-op, card automatically outputs silence when written data runs out. Increasing update interval and thus minimum period avoids xrun on startup or because of timer jitter. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 7bf76c33e9a1ecb2a15f1a066d4e032b5d0922a7 Author: Eliot Blennerhassett Date: Fri Mar 25 15:25:46 2011 +1300 ALSA: asihpi - Support single-rate no-SRC cards Cards without settable local samplerate and without SRC still must have a valid samplerate. This fixed rate is determined by reading the current rate for the card. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 29096202176ceaa5016a17ea2dd1aea19a4e90e2 Author: Steven Rostedt Date: Thu Mar 17 15:21:07 2011 -0400 futex: Fix WARN_ON() test for UP An update of the futex code had a WARN_ON(!spin_is_locked(q->lock_ptr)) But on UP, spin_is_locked() is always false, and will trigger this warning, and even worse, it will exit the function without doing the necessary work. Converting this to a WARN_ON_SMP() fixes the problem. Reported-by: Richard Weinberger Tested-by: Richard Weinberger Signed-off-by: Steven Rostedt Acked-by: Thomas Gleixner Acked-by: Peter Zijlstra Acked-by: Darren Hart Cc: Lai Jiangshan LKML-Reference: <20110317192208.682654502@goodmis.org> Signed-off-by: Ingo Molnar commit 2092e6be82ec71ecbf5a8ceeef004bbcbdb78812 Author: Steven Rostedt Date: Thu Mar 17 15:21:06 2011 -0400 WARN_ON_SMP(): Allow use in if() statements on UP Both WARN_ON() and WARN_ON_SMP() should be able to be used in an if statement. if (WARN_ON_SMP(foo)) { ... } Because WARN_ON_SMP() is defined as a do { } while (0) on UP, it can not be used this way. Convert it to the same form that WARN_ON() is, even when CONFIG_SMP is off. Signed-off-by: Steven Rostedt Acked-by: Thomas Gleixner Acked-by: Peter Zijlstra Acked-by: Darren Hart Cc: Lai Jiangshan Cc: Linus Torvalds Cc: Andrew Morton LKML-Reference: <20110317192208.444147791@goodmis.org> Signed-off-by: Ingo Molnar commit 677cd904aba939bc4cfdc3c1eada8ec46582127e Author: David Henningsson Date: Mon Feb 7 15:19:34 2011 +0100 ALSA: HDA: New AD1984A model for Dell Precision R5500 For codec AD1984A, add a new model to support Dell Precision R5500 or the microphone jack won't work correctly. BugLink: http://bugs.launchpad.net/bugs/741516 Tested-by: Kent Baxley Cc: stable@kernel.org Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 45daae575e08bbf7405c5a3633e956fa364d1b4f Author: Ingo Molnar Date: Fri Mar 25 10:24:23 2011 +0100 perf, x86: Complain louder about BIOSen corrupting CPU/PMU state and continue Eric Dumazet reported that hardware PMU events do not work on his system, due to the BIOS corrupting PMU state: Performance Events: PEBS fmt0+, Core2 events, Broken BIOS detected, using software events only. [Firmware Bug]: the BIOS has corrupted hw-PMU resources (MSR 186 is 43003c) Linus suggested that we continue in the face of such BIOS-induced CPU state corruption: http://lkml.org/lkml/2011/3/24/608 Such BIOSes will have to be fixed - Linux developers rely on a working and fully capable PMU and the BIOS interfering with the CPU's PMU state is simply not acceptable. So this patch changes perf to continue when it detects such BIOS interaction, some hardware events may be unreliable due to the BIOS writing and re-writing them - there's not much the kernel can do about that but to detect the corruption and report it. Reported-and-tested-by: Eric Dumazet Suggested-by: Linus Torvalds Acked-by: Peter Zijlstra Cc: Thomas Gleixner Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Steven Rostedt LKML-Reference: Signed-off-by: Ingo Molnar commit 3674f19dabd15f9541079a588149a370d888f4e6 Author: Benjamin Herrenschmidt Date: Fri Mar 25 17:51:54 2011 +1100 ALSA: vmalloc buffers should use normal mmap It's a big no-no to use pgprot_noncached() when mmap'ing such buffers into userspace since they are mapped cachable in kernel space. This can cause all sort of interesting things ranging from to garbled sound to lockups on various architectures. I've observed that usb-audio is broken on powerpc 4xx for example because of that. Also remove the now unused snd_pcm_lib_mmap_noncached(). It's an arch business to know when to use uncached mappings, there's already hacks for MIPS inside snd_pcm_default_mmap() and other archs are supposed to use dma_mmap_coherent(). (See my separate patch that adds dma_mmap_coherent() to powerpc) Signed-off-by: Benjamin Herrenschmidt CC: Signed-off-by: Takashi Iwai commit 6df59a84eccd4cad7fcefda3e0c5e55239a3b2dd Author: Steffen Klassert Date: Fri Mar 25 01:28:45 2011 -0700 route: Take the right src and dst addresses in ip_route_newports When we set up the flow informations in ip_route_newports(), we take the address informations from the the rt_key_src and rt_key_dst fields of the rtable. They appear to be empty. So take the address informations from rt_src and rt_dst instead. This issue was introduced by commit 5e2b61f78411be25f0b84f97d5b5d312f184dfd1 ("ipv4: Remove flowi from struct rtable.") Signed-off-by: Steffen Klassert Signed-off-by: David S. Miller commit 66d857b08b8c3ed5c72c361f863cce77d2a978d7 Author: Greg Ungerer Date: Tue Mar 22 13:39:27 2011 +1000 m68k: merge m68k and m68knommu arch directories There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King , which was originally written by Arnd Bergmann . > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > _mm. and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed _no. and a small > wrapper file . is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include _mm. > #else > #include _no. > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer commit d39dd11c3e6a7af5c20bfac40594db36cf270f42 Merge: 30f5b28 0b2d072 Author: Linus Torvalds Date: Thu Mar 24 19:01:30 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: fs: simplify iget & friends fs: pull inode->i_lock up out of writeback_single_inode fs: rename inode_lock to inode_hash_lock fs: move i_wb_list out from under inode_lock fs: move i_sb_list out from under inode_lock fs: remove inode_lock from iput_final and prune_icache fs: Lock the inode LRU list separately fs: factor inode disposal fs: protect inode->i_state with inode->i_lock autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd() autofs4 - remove autofs4_lock autofs4 - fix d_manage() return on rcu-walk autofs4 - fix autofs4_expire_indirect() traversal autofs4 - fix dentry leak in autofs4_expire_direct() autofs4 - reinstate last used update on access vfs - check non-mountpoint dentry might block in __follow_mount_rcu() commit 30f5b28e7f937608e0407edaa459cc8161de81d9 Author: Stephen Rothwell Date: Fri Mar 25 12:30:05 2011 +1100 [media] rc: update for bitop name changes Fix the following compile failure: drivers/media/rc/ite-cir.c: In function 'ite_decode_bytes': drivers/media/rc/ite-cir.c:190: error: implicit declaration of function 'generic_find_next_le_bit' drivers/media/rc/ite-cir.c:199: error: implicit declaration of function 'generic_find_next_zero_le_bit' Caused by commit 620a32bba4a2 ("[media] rc: New rc-based ite-cir driver for several ITE CIRs") interacting with commit c4945b9ed472 ("asm-generic: rename generic little-endian bitops functions"). Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 0b2d0724e26a335cd326eb7ad552c109116a8795 Author: Christoph Hellwig Date: Wed Mar 23 15:03:28 2011 -0400 fs: simplify iget & friends Merge get_new_inode/get_new_inode_fast into iget5_locked/iget_locked as those were the only callers. Remove the internal ifind/ifind_fast helpers - ifind_fast only had a single caller, and ifind had two callers wanting it to do different things. Also clean up the comments in this area to focus on information important to a developer trying to use it, instead of overloading them with implementation details. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 0f1b1fd86f6fd662e04da3e82a6780b226fcd0d1 Author: Dave Chinner Date: Tue Mar 22 22:23:43 2011 +1100 fs: pull inode->i_lock up out of writeback_single_inode First thing we do in writeback_single_inode() is take the i_lock and the last thing we do is drop it. A caller already holds the i_lock, so pull the i_lock out of writeback_single_inode() to reduce the round trips on this lock during inode writeback. Signed-off-by: Dave Chinner Signed-off-by: Al Viro commit 67a23c494621ff1d5431c3bc320947865b224625 Author: Dave Chinner Date: Tue Mar 22 22:23:42 2011 +1100 fs: rename inode_lock to inode_hash_lock All that remains of the inode_lock is protecting the inode hash list manipulation and traversals. Rename the inode_lock to inode_hash_lock to reflect it's actual function. Signed-off-by: Dave Chinner Signed-off-by: Al Viro commit a66979abad090b2765a6c6790c9fdeab996833f2 Author: Dave Chinner Date: Tue Mar 22 22:23:41 2011 +1100 fs: move i_wb_list out from under inode_lock Protect the inode writeback list with a new global lock inode_wb_list_lock and use it to protect the list manipulations and traversals. This lock replaces the inode_lock as the inodes on the list can be validity checked while holding the inode->i_lock and hence the inode_lock is no longer needed to protect the list. Signed-off-by: Dave Chinner Signed-off-by: Al Viro commit 55fa6091d83160ca772fc37cebae45d42695a708 Author: Dave Chinner Date: Tue Mar 22 22:23:40 2011 +1100 fs: move i_sb_list out from under inode_lock Protect the per-sb inode list with a new global lock inode_sb_list_lock and use it to protect the list manipulations and traversals. This lock replaces the inode_lock as the inodes on the list can be validity checked while holding the inode->i_lock and hence the inode_lock is no longer needed to protect the list. Signed-off-by: Dave Chinner Signed-off-by: Al Viro commit f283c86afe6aa70b733d1ecebad5d9464943b774 Author: Dave Chinner Date: Tue Mar 22 22:23:39 2011 +1100 fs: remove inode_lock from iput_final and prune_icache Now that inode state changes are protected by the inode->i_lock and the inode LRU manipulations by the inode_lru_lock, we can remove the inode_lock from prune_icache and the initial part of iput_final(). instead of using the inode_lock to protect the inode during iput_final, use the inode->i_lock instead. This protects the inode against new references being taken while we change the inode state to I_FREEING, as well as preventing prune_icache from grabbing the inode while we are manipulating it. Hence we no longer need the inode_lock in iput_final prior to setting I_FREEING on the inode. For prune_icache, we no longer need the inode_lock to protect the LRU list, and the inodes themselves are protected against freeing races by the inode->i_lock. Hence we can lift the inode_lock from prune_icache as well. Signed-off-by: Dave Chinner Signed-off-by: Al Viro commit 02afc410f363f98ac4f186341e38dcec13fc0e60 Author: Dave Chinner Date: Tue Mar 22 22:23:38 2011 +1100 fs: Lock the inode LRU list separately Introduce the inode_lru_lock to protect the inode_lru list. This lock is nested inside the inode->i_lock to allow the inode to be added to the LRU list in iput_final without needing to deal with lock inversions. This keeps iput_final() clean and neat. Further, where marking the inode I_FREEING and removing it from the LRU, move the LRU list manipulation within the inode->i_lock to keep the list manipulation consistent with iput_final. This also means that most of the open coded LRU list removal + unused inode accounting can now use the inode_lru_list_del() wrappers which cleans the code up further. However, this locking change means what the LRU traversal in prune_icache() inverts this lock ordering and needs to use trylock semantics on the inode->i_lock to avoid deadlocking. In these cases, if we fail to lock the inode we move it to the back of the LRU to prevent spinning on it. Signed-off-by: Dave Chinner Signed-off-by: Al Viro commit b2b2af8e614b4dcd8aca1369d82ce5ad0461a7b1 Author: Dave Chinner Date: Tue Mar 22 22:23:37 2011 +1100 fs: factor inode disposal We have a couple of places that dispose of inodes. factor the disposal into evict() to isolate this code and make it simpler to peel away the inode_lock from the code. While doing this, change the logic flow in iput_final() to separate the different cases that need to be handled to make the transitions the inode goes through more obvious. Signed-off-by: Dave Chinner Signed-off-by: Al Viro commit 250df6ed274d767da844a5d9f05720b804240197 Author: Dave Chinner Date: Tue Mar 22 22:23:36 2011 +1100 fs: protect inode->i_state with inode->i_lock Protect inode state transitions and validity checks with the inode->i_lock. This enables us to make inode state transitions independently of the inode_lock and is the first step to peeling away the inode_lock from the code. This requires that __iget() is done atomically with i_state checks during list traversals so that we don't race with another thread marking the inode I_FREEING between the state check and grabbing the reference. Also remove the unlock_new_inode() memory barrier optimisation required to avoid taking the inode_lock when clearing I_NEW. Simplify the code by simply taking the inode->i_lock around the state change and wakeup. Because the wakeup is no longer tricky, remove the wake_up_inode() function and open code the wakeup where necessary. Signed-off-by: Dave Chinner Signed-off-by: Al Viro commit 37e826c513883099c298317bad1b3b677b2905fb Author: David S. Miller Date: Thu Mar 24 18:06:47 2011 -0700 ipv4: Fix nexthop caching wrt. scoping. Move the scope value out of the fib alias entries and into fib_info, so that we always use the correct scope when recomputing the nexthop cached source address. Reported-by: Julian Anastasov Signed-off-by: David S. Miller commit a7351402574eec1308b099cc8e8108e715a2c8b6 Merge: b2b755b b8c4c96 Author: Linus Torvalds Date: Thu Mar 24 17:51:12 2011 -0700 Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: Write to per cpu data when allocating it slub: Fix debugobjects with lockless fastpath commit b2b755b5f10eb32fbdc73a9907c07006b17f714b Author: David Rientjes Date: Thu Mar 24 15:18:15 2011 -0700 lib, arch: add filter argument to show_mem and fix private implementations Commit ddd588b5dd55 ("oom: suppress nodes that are not allowed from meminfo on oom kill") moved lib/show_mem.o out of lib/lib.a, which resulted in build warnings on all architectures that implement their own versions of show_mem(): lib/lib.a(show_mem.o): In function `show_mem': show_mem.c:(.text+0x1f4): multiple definition of `show_mem' arch/sparc/mm/built-in.o:(.text+0xd70): first defined here The fix is to remove __show_mem() and add its argument to show_mem() in all implementations to prevent this breakage. Architectures that implement their own show_mem() actually don't do anything with the argument yet, but they could be made to filter nodes that aren't allowed in the current context in the future just like the generic implementation. Reported-by: Stephen Rothwell Reported-by: James Bottomley Suggested-by: Andrew Morton Signed-off-by: David Rientjes Signed-off-by: Linus Torvalds commit 436c3b66ec9824a633724ae42de1c416af4f2063 Author: David S. Miller Date: Thu Mar 24 17:42:21 2011 -0700 ipv4: Invalidate nexthop cache nh_saddr more correctly. Any operation that: 1) Brings up an interface 2) Adds an IP address to an interface 3) Deletes an IP address from an interface can potentially invalidate the nh_saddr value, requiring it to be recomputed. Perform the recomputation lazily using a generation ID. Reported-by: Julian Anastasov Signed-off-by: David S. Miller commit e285c1746accb80620e511f9c72e9893beeedc0e Merge: 6c51038 51eab41 Author: Linus Torvalds Date: Thu Mar 24 17:27:20 2011 -0700 Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/vblank: update recently added vbl interface to be more future proof. drm radeon: Return -EINVAL on wrong pm sysfs access drm/radeon/kms: fix hardcoded EDID handling Revert "drm/i915: Don't save/restore hardware status page address register" drm/i915: Avoid unmapping pages from a NULL address space drm/i915: Fix use after free within tracepoint drm/i915: Restore missing command flush before interrupt on BLT ring drm/i915: Disable pagefaults along execbuffer relocation fast path drm/i915: Fix computation of pitch for dumb bo creator drm/i915: report correct render clock frequencies on SNB drm/i915/dp: Correct the order of deletion for ghost eDP devices drm/i915: Fix tiling corruption from pipelined fencing drm/i915: Re-enable self-refresh drm/i915: Prevent racy removal of request from client list drm/i915: skip redundant operations whilst enabling pipes and planes drm/i915: Remove surplus POSTING_READs before wait_for_vblank drm/radeon/kms: prefer legacy pll algo for tv-out drm: check for modesetting on modeset ioctls drm/kernel: vblank wait on crtc > 1 drm: Fix use-after-free in drm_gem_vm_close() commit cf55bb2439d2a7080fae6edf84919fd81f891574 Author: Roland Dreier Date: Thu Mar 24 17:13:20 2011 -0700 RDMA/nes: Fix test of uninitialized netdev Commit 1765a575334f ("net: make dev->master general") introduced a test of an uninitialized netdev. Fix the code so the intended netdev is tested. Signed-off-by: Roland Dreier commit 1c833bc3b60744a385ac66cc1bc72fbecd5670ab Author: Kjetil Oftedal Date: Thu Mar 24 16:34:52 2011 -0700 sparc32: Fix multiple RTC detections on SUN4D During the preparation for testing the recent changes made to the SUN4D specific code in the kernel by Sam Ravnborg the following was discovered: Since the removal of of_platform_bus_type (commit: eca3930163ba8884060ce9d9ff5ef0d9b7c7b00f ) multiboard SUN4Ds have not been able to boot. The kernel crashes due to a zero-pointer error encountered when registering multiple M48T59 RTCs (There is one on each board). A patch for the was previously submitted, but the problem was not a serious at that time, as it would only generate warnings. Now the kernel will crash and stop executing before the serial console has been started. (Crash output can be viewed by using the -p boot flag) Signed-off-by: Kjetil Oftedal Signed-off-by: David S. Miller commit f7594d42944c0dfca90318f50978a4bdf8504086 Author: Randy Dunlap Date: Thu Mar 24 16:16:02 2011 -0700 net: fix pch_gbe section mismatch warning Fix section mismatch warning by renaming the pci_driver variable to a recognized (whitelisted) name. WARNING: drivers/net/pch_gbe/pch_gbe.o(.data+0x1f8): Section mismatch in reference from the variable pch_gbe_pcidev to the variable .devinit.rodata:pch_gbe_pcidev_id The variable pch_gbe_pcidev references the variable __devinitconst pch_gbe_pcidev_id If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 08f1b807355c8d355885a71e7fd462fe9d499411 Author: Thomas Gleixner Date: Thu Mar 24 21:27:37 2011 +0000 gpio: Fold irq_set_chip/irq_set_handler to irq_set_chip_and_handler Converted with coccinelle. Signed-off-by: Thomas Gleixner Acked-by: Grant Likely LKML-Reference: <20110324212509.118888535@linutronix.de> commit b51804bcf0774a8bc6af1e8bb6ae818f4b71173a Author: Thomas Gleixner Date: Thu Mar 24 21:27:36 2011 +0000 gpio: Cleanup genirq namespace Converted with coccinelle. Signed-off-by: Thomas Gleixner Acked-by: Grant Likely LKML-Reference: <20110324212509.025730689@linutronix.de> Signed-off-by: Thomas Gleixner commit 778b548ced16b4bdca7ee2b694796f22ac24437f Author: Ryan Mallon Date: Thu Mar 24 23:46:46 2011 +0100 arm: ep93xx: Add basic interrupt info For the time being can we fix up the ep93xx gpio code with the amended patch below. It keeps the information that the pin is also configured as an interrupt and cleans the code up a bit. [ tglx: Rebased it on the removal patch ] Signed-off-by: Ryan Mallon Signed-off-by: Thomas Gleixner commit b15f052cb8c1ba2a55998707f29dc8a8e5cc40ca Author: Thomas Gleixner Date: Thu Mar 24 21:27:35 2011 +0000 arm/gpio: Remove three copies of broken and racy debug code gpiolib plus two gpio implementations in arm fiddle in the guts of irq_desc in a racy and buggy way. Remove the stuff. I already told the gpio folks that we can provide that information in a proper way if necessary. Signed-off-by: Thomas Gleixner Acked-by: Grant Likely LKML-Reference: <20110324212508.931638262@linutronix.de> commit 07611dbda5ccbd9a628f29686d62bafdd007db7b Author: Thomas Gleixner Date: Thu Mar 24 21:41:57 2011 +0100 x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional That call escaped the name space cleanup. Fix it up. We really want to call there. The chip might have changed since the irq was setup initially. So let the core code and the chip decide what to do. The status is just an unreliable snapshot. Signed-off-by: Thomas Gleixner Cc: Sebastian Andrzej Siewior commit 00a30b254b88d2d4f5af00835a9b7f70326def9b Author: Thomas Gleixner Date: Thu Mar 24 22:53:10 2011 +0100 x86: DT: Fix return condition in irq_create_of_mapping() The xlate() function returns 0 or a negative error code. Returning the error code blindly will be seen as an huge irq number by the calling function because irq_create_of_mapping() returns an unsigned value. Return 0 (NO_IRQ) as required. Signed-off-by: Thomas Gleixner Cc: Sebastian Andrzej Siewior commit 0acd2201920d0968919f4f5797d63f7b6f2b19d4 Merge: 8f70e95 35124a0 Author: Trond Myklebust Date: Thu Mar 24 17:03:14 2011 -0400 Merge branch 'nfs-for-2.6.39' into nfs-for-next commit 35124a0994fc02545b14b9fa3aad000b3331f1c0 Author: Weston Andros Adamson Date: Thu Mar 24 16:48:21 2011 -0400 Cleanup XDR parsing for LAYOUTGET, GETDEVICEINFO changes LAYOUTGET and GETDEVICEINFO XDR parsing to: - not use vmap, which doesn't work on incoherent archs - use xdr_stream parsing for all xdr Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust commit 242214f9c1eeaae40eca11e3b4d37bfce960a7cd Author: Don Zickus Date: Thu Mar 24 23:36:25 2011 +0300 perf, x86: P4 PMU - Read proper MSR register to catch unflagged overflows The read of a proper MSR register was missed and instead of counter the configration register was tested (it has ARCH_P4_UNFLAGGED_BIT always cleared) leading to unknown NMI hitting the system. As result the user may obtain "Dazed and confused, but trying to continue" message. Fix it by reading a proper MSR register. When an NMI happens on a P4, the perf nmi handler checks the configuration register to see if the overflow bit is set or not before taking appropriate action. Unfortunately, various P4 machines had a broken overflow bit, so a backup mechanism was implemented. This mechanism checked to see if the counter rolled over or not. A previous commit that implemented this backup mechanism was broken. Instead of reading the counter register, it used the configuration register to determine if the counter rolled over or not. Reading that bit would give incorrect results. This would lead to 'Dazed and confused' messages for the end user when using the perf tool (or if the nmi watchdog is running). The fix is to read the counter register before determining if the counter rolled over or not. Signed-off-by: Don Zickus Signed-off-by: Cyrill Gorcunov Cc: Lin Ming LKML-Reference: <4D8BAB49.3080701@openvz.org> Signed-off-by: Ingo Molnar commit b8c4c96ed4cdecf5ae51fc6f4c006658e873047f Author: Christoph Lameter Date: Thu Mar 24 14:51:38 2011 -0500 SLUB: Write to per cpu data when allocating it It turns out that the cmpxchg16b emulation has to access vmalloced percpu memory with interrupts disabled. If the memory has never been touched before then the fault necessary to establish the mapping will not to occur and the kernel will fail on boot. Fix that by reusing the CONFIG_PREEMPT code that writes the cpu number into a field on every cpu. Writing to the per cpu area before causes the mapping to be established before we get to a cmpxchg16b emulation. Tested-by: Ingo Molnar Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit ef31153786bc1e4304e6b9422cc8b9efef455611 Author: Andy Adamson Date: Sat Mar 12 02:58:10 2011 -0500 NFSv4.1 convert layoutcommit sync to boolean Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit de4b15c7e9fe9fdd1eb6333be0a08c822db1ca0e Author: Andy Adamson Date: Sat Mar 12 02:58:09 2011 -0500 NFSv4.1 pnfs_layoutcommit_inode fixes Test NFS_INO_LAYOUTCOMMIT before kzalloc Mark inode dirty to retry LAYOUTCOMMIT on kzalloc failure. Add comments. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 47a5d9dcbb595b1bef54f59ba3846170e13be32a Author: Thomas Gleixner Date: Thu Mar 24 18:28:40 2011 +0100 xtensa: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit 610e1756eafdeca15cc24ade6dae23d8129225f9 Author: Thomas Gleixner Date: Thu Mar 24 14:58:43 2011 +0100 xtensa: Convert genirq namespace Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit 3b190a4a0919eac849f73cb06886f26d357a554c Author: Thomas Gleixner Date: Sun Feb 6 22:10:54 2011 +0100 xtensa: Use generic IRQ Kconfig and set GENERIC_HARDIRQS_NO_DEPRECATED All chips converted. Signed-off-by: Thomas Gleixner Cc: Chris Zankel LKML-Reference: <20110206211137.849317253@linutronix.de> commit 0e77575346c2ed371e06aa3b409c74221be09c38 Author: Thomas Gleixner Date: Sun Feb 6 22:10:53 2011 +0100 xtensa: Convert s6000 gpio irq_chip to new functions Also use proper wrappers for irq_desc access. Signed-off-by: Thomas Gleixner Cc: Chris Zankel LKML-Reference: <20110206211137.750284615@linutronix.de> commit 495e0c79406fc0915fe80c7b1bbc006ef1370842 Author: Thomas Gleixner Date: Sun Feb 6 22:10:52 2011 +0100 xtensa: Convert main irq_chip to new functions Signed-off-by: Thomas Gleixner Cc: Chris Zankel LKML-Reference: <20110206211137.653005586@linutronix.de> commit df31a0a06f00a9b54a5cd4eaef59ebc6ca629b78 Author: Thomas Gleixner Date: Thu Mar 24 18:25:20 2011 +0100 um: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit 0ebec35f683c4e94e4bfb877b71598e79b131638 Author: Thomas Gleixner Date: Thu Mar 24 18:24:42 2011 +0100 um: Convert genirq namespace Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit 4bdab7e0305383ce1126f43f46262f00a265d802 Author: Thomas Gleixner Date: Thu Mar 24 19:24:55 2011 +0100 m32r: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit 27e5c5a9a240d2a7790bfe31045020a043c5d74a Author: Thomas Gleixner Date: Thu Mar 24 17:32:45 2011 +0100 m32r: Convert genirq namespace Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit 9f7b21871355d00ea0aa4dc84e44f81d90a53f55 Author: Thomas Gleixner Date: Thu Mar 24 19:15:36 2011 +0100 h8300: Use generic show_interrupts() Signed-off-by: Thomas Gleixner commit 7b04690a358ea44c35ad7e3af08ae4544d2175f3 Author: Thomas Gleixner Date: Thu Mar 24 17:32:22 2011 +0100 h8300: Convert genirq namespace Scripted with coccinelle. Signed-off-by: Thomas Gleixner commit 62ec05d1ea2fe95ab03b55f717c045fd24c02354 Author: Thomas Gleixner Date: Thu Mar 24 17:24:04 2011 +0100 avr32: Cleanup eic_set_irq_type() No need to fiddle in irq_desc. The trigger mask can be written back into irq_data. Return IRQ_SET_MASK_OK_NOCOPY, so the generic code wont overwrite it again. Signed-off-by: Thomas Gleixner Cc: Hans-Christian Egtvedt commit db82817bcb278186cad04e263e2d5abb26a4f6fd Author: Thomas Gleixner Date: Thu Mar 24 19:08:11 2011 +0100 avr32: Use generic show_interrupts() Signed-off-by: Thomas Gleixner Cc: Hans-Christian Egtvedt commit d75f1bfdbccb38310088b98e9866273f5d7bda14 Author: Thomas Gleixner Date: Thu Mar 24 16:39:32 2011 +0100 avr: Cleanup genirq namespace Scripted conversion to new function names with coccinelle. Signed-off-by: Thomas Gleixner Cc: Hans-Christian Egtvedt commit 250153361fa804985392866fa0622a787dd60109 Author: Thomas Gleixner Date: Sun Feb 6 17:29:04 2011 +0100 avr32: Use generic IRQ config, enable GENERIC_HARDIRQS_NO_DEPRECATED Use the generic Kconfig for interrupts and enable GENERIC_HARDIRQS_NO_DEPRECATED. All conversions done. Signed-off-by: Thomas Gleixner Cc: Hans-Christian Egtvedt LKML-Reference: <20110206163009.289833604@linutronix.de> commit f2f9c6508dc15fdcf5902047d47a86f4f6466459 Author: Thomas Gleixner Date: Sun Feb 6 17:29:03 2011 +0100 avr32: At32ap: Convert pop irq_chip to new functions Also replace the open coded handler call with the proper wrapper. Signed-off-by: Thomas Gleixner Cc: Hans-Christian Egtvedt LKML-Reference: <20110206163009.190112353@linutronix.de> commit 3972f6917d05b4350c9b5ab2aaa623cd52fa4bc9 Author: Thomas Gleixner Date: Sun Feb 6 17:29:02 2011 +0100 avr32: At32ap: Convert intc irq_chip to new functions Also replace the open coded handler call with the proper wrapper. Signed-off-by: Thomas Gleixner Cc: Hans-Christian Egtvedt LKML-Reference: <20110206163009.096308633@linutronix.de> commit 7776e233ef32d9e8152dbb31328367c65288abcf Author: Thomas Gleixner Date: Sun Feb 6 17:29:01 2011 +0100 avr32: At32ap: Convert extint irq_chip to new functions Signed-off-by: Thomas Gleixner Cc: Hans-Christian Egtvedt LKML-Reference: <20110206163008.996220791@linutronix.de> commit f9b615de4663c4b852e07257e9f967df6a0161c0 Author: Thomas Gleixner Date: Thu Mar 24 21:26:46 2011 +0200 slub: Fix debugobjects with lockless fastpath On Thu, 24 Mar 2011, Ingo Molnar wrote: > RIP: 0010:[] [] get_next_timer_interrupt+0x119/0x260 That's a typical timer crash, but you were unable to debug it with debugobjects because commit d3f661d6 broke those. Cc: Christoph Lameter Tested-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Pekka Enberg commit 3dc8fe4dca9cd3e4aa828ed36451e2bcfd2350da Author: Jesper Juhl Date: Fri Mar 25 01:51:37 2011 +0800 autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd() In fs/autofs4/dev-ioctl.c::autofs_dev_ioctl_setpipefd() we call fget(), which may return NULL, but we do not explicitly test for that NULL return so we may end up dereferencing a NULL pointer - bad. When I originally submitted this patch I had chosen EBUSY as the return value to use if this happens. Ian Kent was kind enough to explain why that would most likely be wrong and why EBADF should most likely be used instead. This version of the patch uses EBADF. Signed-off-by: Jesper Juhl Signed-off-by: Ian Kent Signed-off-by: Al Viro commit e7854723d0f3626f260c880d8db8e5136f29db19 Author: Ian Kent Date: Fri Mar 25 01:51:31 2011 +0800 autofs4 - remove autofs4_lock The autofs4_lock introduced by the rcu-walk changes has unnecessarily broad scope. The locking is better handled by the per-autofs super block lookup_lock. Signed-off-by: Ian Kent Acked-by: David Howells Signed-off-by: Al Viro commit 83fb96bfc792e5ca693e53f7fd878d51b8493da8 Author: Ian Kent Date: Fri Mar 25 01:51:25 2011 +0800 autofs4 - fix d_manage() return on rcu-walk The daemon never needs to block and, in the rcu-walk case an error return isn't used, so always return zero. Signed-off-by: Ian Kent Signed-off-by: Al Viro commit d4a85e35d1465da055264407d8395e84483084e6 Author: Ian Kent Date: Fri Mar 25 01:51:20 2011 +0800 autofs4 - fix autofs4_expire_indirect() traversal The vfs-scale changes changed the traversal used in autofs4_expire_indirect() from a list to a depth first tree traversal which isn't right. Signed-off-by: Ian Kent Signed-off-by: Al Viro commit f9398c233e3201874395eea8558eb616fb198648 Author: Ian Kent Date: Fri Mar 25 01:51:14 2011 +0800 autofs4 - fix dentry leak in autofs4_expire_direct() There is a missing dput() when returning from autofs4_expire_direct() when we see that the dentry is already a pending mount. Signed-off-by: Ian Kent Acked-by: David Howells Signed-off-by: Al Viro commit 3c3199852905ceb90a70e98777e71d369a5f0823 Author: Ian Kent Date: Fri Mar 25 01:51:08 2011 +0800 autofs4 - reinstate last used update on access When direct (and offset) mounts were introduced the the last used timeout could no longer be updated in ->d_revalidate(). This is because covered direct mounts would be followed over without calling the autofs file system. As a result the definition of the busyness check for all entries was changed to be "actually busy" being an open file or working directory within the automount. But now we have a call back in the follow so the last used update on any access can be re-instated. This requires DCACHE_MANAGE_TRANSIT to always be set. Signed-off-by: Ian Kent Signed-off-by: Al Viro commit fcd13f42c9d6ab7b1024b9b7125a2e8db3cc00b2 Author: Eric Dumazet Date: Thu Mar 24 07:01:24 2011 +0000 ipv4: fix fib metrics Alessandro Suardi reported that we could not change route metrics : ip ro change default .... advmss 1400 This regression came with commit 9c150e82ac50 (Allocate fib metrics dynamically). fib_metrics is no longer an array, but a pointer to an array. Reported-by: Alessandro Suardi Signed-off-by: Eric Dumazet Tested-by: Alessandro Suardi Signed-off-by: David S. Miller commit 6f71d7927c9a9efb7d7e9e6d227d5e246a9c5bd7 Author: Yevgeny Petrilin Date: Thu Mar 24 11:47:51 2011 -0700 mlx4_en: Removing HW info from ethtool -i report. Avoiding abuse of ethtool_drvinfo.driver field. HW specific info can be retrieved using lspci. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 54a4fe5499542f083ff282048c6a5afb8d4aca16 Merge: ef352e7 d78f4b3 Author: David S. Miller Date: Thu Mar 24 11:43:09 2011 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 62a7375e5d77d654695297c4b39d5d740d901184 Author: Ian Kent Date: Fri Mar 25 01:51:02 2011 +0800 vfs - check non-mountpoint dentry might block in __follow_mount_rcu() When following a mount in rcu-walk mode we must check if the incoming dentry is telling us it may need to block, even if it isn't actually a mountpoint. Signed-off-by: Ian Kent Signed-off-by: Al Viro commit 8f70e95f9f4159184f557a1db60c909d7c1bd2e3 Author: Bryan Schumaker Date: Thu Mar 24 17:12:31 2011 +0000 NFS: Determine initial mount security When sec= is not presented as a mount option, we should attempt to determine what security flavor the server is using. Signed-off-by: Bryan Schumaker Signed-off-by: Trond Myklebust commit 7ebb931598cd95cccea10d4bc4c0123a464ea565 Author: Bryan Schumaker Date: Thu Mar 24 17:12:30 2011 +0000 NFS: use secinfo when crossing mountpoints A submount may use different security than the parent mount does. We should figure out what sec flavor the submount uses at mount time. Signed-off-by: Bryan Schumaker Signed-off-by: Trond Myklebust commit 5a5ea0d485c9715c86bf858bbdc5f6d373b3db88 Author: Bryan Schumaker Date: Thu Mar 24 17:12:29 2011 +0000 NFS: Add secinfo procedure This patch adds the nfs4 operation secinfo as a valid nfs rpc operation. Signed-off-by: Bryan Schumaker Signed-off-by: Trond Myklebust commit 7c5130588d691a3b34d02312f1bd1b6d56fe0100 Author: Bryan Schumaker Date: Thu Mar 24 17:12:24 2011 +0000 NFS: lookup supports alternate client A later patch will need to perform a lookup using an alternate client with a different security flavor. This patch adds support for doing that on NFS v4. Signed-off-by: Bryan Schumaker Signed-off-by: Trond Myklebust commit e73b83f270828630a9ce33728f6ef61c37a82340 Author: Bryan Schumaker Date: Thu Mar 24 17:12:23 2011 +0000 NFS: convert call_sync() to a function This patch changes nfs4_call_sync() from a macro into a static inline function. As a macro, the call_sync() function will not do any type checking and depends on the sequence arguments always having the same name. As a function, we get to have type checking and can rename the arguments if we so choose. Signed-off-by: Bryan Schumaker Signed-off-by: Trond Myklebust commit 6c5103890057b1bb781b26b7aae38d33e4c517d8 Merge: 3dab04e 9d2e157 Author: Linus Torvalds Date: Thu Mar 24 10:16:26 2011 -0700 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block * 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits) Documentation/iostats.txt: bit-size reference etc. cfq-iosched: removing unnecessary think time checking cfq-iosched: Don't clear queue stats when preempt. blk-throttle: Reset group slice when limits are changed blk-cgroup: Only give unaccounted_time under debug cfq-iosched: Don't set active queue in preempt block: fix non-atomic access to genhd inflight structures block: attempt to merge with existing requests on plug flush block: NULL dereference on error path in __blkdev_get() cfq-iosched: Don't update group weights when on service tree fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away block: Require subsystems to explicitly allocate bio_set integrity mempool jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging fs: make fsync_buffers_list() plug mm: make generic_writepages() use plugging blk-cgroup: Add unaccounted time to timeslice_used. block: fixup plugging stubs for !CONFIG_BLOCK block: remove obsolete comments for blkdev_issue_zeroout. blktrace: Use rq->cmd_flags directly in blk_add_trace_rq. ... Fix up conflicts in fs/{aio.c,super.c} commit 3dab04e6978e358ad2307bca563fabd6c5d2c58b Merge: 6d1e9a4 5a4b65a Author: Linus Torvalds Date: Thu Mar 24 10:07:50 2011 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: MN10300: gcc 4.6 vs am33 inline assembly MN10300: Deprecate gdbstub MN10300: Allow KGDB to use the MN10300 serial ports MN10300: Emulate single stepping in KGDB on MN10300 MN10300: Generalise kernel debugger kernel halt, reboot or power off hook KGDB: Notify GDB of machine halt, reboot or power off MN10300: Use KGDB MN10300: Create generic kernel debugger hooks MN10300: Create general kernel debugger cache flushing MN10300: Introduce a general config option for kernel debugger hooks MN10300: The icache invalidate functions should disable the icache first MN10300: gdbstub: Restrict single-stepping to non-preemptable non-SMP configs commit 6d1e9a42e7176bbce9348274784b2e5f69223936 Merge: 9598572 7415982 Author: Linus Torvalds Date: Thu Mar 24 10:05:23 2011 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: pstore: cleanups to pstore_dump() [IA64] New syscalls for 2.6.39 commit 95985725367e55642755ca6986d0c930cd3738e2 Merge: 4d4fcae 9d9659b Author: Linus Torvalds Date: Thu Mar 24 10:04:59 2011 -0700 Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: mmc: Add MMC_PROGRESS_* mmc, ARM: Rename SuperH Mobile ARM zboot helpers ARM: mach-shmobile: add coherent DMA mask to CEU camera devices ARM: mach-shmobile: Dynamic backlight control for Mackerel commit 4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e Merge: b4a41ed b15ed69 Author: Linus Torvalds Date: Thu Mar 24 10:04:05 2011 -0700 Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix build alloc_thread_info_node function sh: Fix ptrace hw_breakpoint handling sh: Fix ptrace fpu state initialisation sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED. sh: pmb: Use struct syscore_ops instead of sysdevs sh: Use struct syscore_ops instead of sysdevs sh: Conver to asm-generic/sizes.h. sh: wire up sys_syncfs. commit b4a41ed24c858d75985c7dcba685715fdf2e6114 Merge: 76d21c5 7e7797e Author: Linus Torvalds Date: Thu Mar 24 10:02:55 2011 -0700 Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: cdc-acm: fix potential null-pointer dereference on disconnect USB: cdc-acm: fix potential null-pointer dereference USB: cdc-acm: fix memory corruption / panic USB: Fix 'bad dma' problem on WDM device disconnect usb: wwan: fix compilation without CONFIG_PM_RUNTIME USB: uss720 fixup refcount position usb: musb: blackfin: fix typo in new bfin_musb_vbus_status func usb: musb: blackfin: fix typo in new dev_pm_ops struct usb: musb: blackfin: fix typo in platform driver name usb: musb: Fix for merge issue ehci-hcd: Bug fix: don't set a QH's Halt bit USB: Do not pass negative length to snoop_urb() commit 76d21c563569bcea6bc67d65cc2c460cff643058 Merge: 6e50e9f 472af2b Author: Linus Torvalds Date: Thu Mar 24 09:50:13 2011 -0700 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ... Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c commit 6e50e9f9f4a8277b4d76de417ca77cf3921bd524 Merge: e264ac8 84abf60 Author: Linus Torvalds Date: Thu Mar 24 09:33:14 2011 -0700 Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra * 'for-linus' of git://android.git.kernel.org/kernel/tegra: ARM: tegra: harmony: initialize the TPS65862 PMIC ARM: tegra: update defconfig ARM: tegra: harmony: update PCI-e initialization sequence ARM: tegra: trimslice: enable MMC/SD slots ARM: tegra: enable new drivers in defconfig ARM: tegra: Add Toshiba AC100 support ARM: tegra: harmony: Set WM8903 gpio_base ARM: tegra: harmony: I2C-related portions of audio support ARM: tegra: harmony: register i2c devices ARM: tegra: seaboard: register i2c devices ARM: tegra: harmony: Beginnings of audio support ARM: tegra: create defines for SD-related GPIO names ARM: tegra: add devices.c entries for audio commit e264ac8cad5a3f2e717ac68eb300766eef61f568 Merge: 2004600 06fb01f Author: Linus Torvalds Date: Thu Mar 24 09:30:20 2011 -0700 Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: spi/pl022: Add loopback support for the SPI on 5500 spi/omap_mcspi: Fix broken last word xfer of/flattree: minor cleanups dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table dt: protect against NULL matches passed to of_match_node() dt: Refactor of_platform_bus_probe() commit 9d9659b6c0ebf7dde65ebada4c67980818245913 Author: Simon Horman Date: Thu Mar 24 07:04:38 2011 +0000 mmc: Add MMC_PROGRESS_* This is my second attempt to make this enum generally available. The first attempt added MMCIF_PROGRESS_* to include/linux/mmc/sh_mmcif.h. However this is not sufficiently generic as the enum will be used by SDHI boot code. Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit a6558c2d07d5c955fbb0290f68c27164a5567b9a Author: Simon Horman Date: Thu Mar 24 07:04:37 2011 +0000 mmc, ARM: Rename SuperH Mobile ARM zboot helpers These headers and helpers will also be used for SDHI boot so the mmcif name will start to make a lot less sense. Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 200460067d19db4aab7f1d9f5c95dd644d260337 Merge: 047f61c 15e123e Author: Linus Torvalds Date: Thu Mar 24 08:25:53 2011 -0700 Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: intel_idle: Rename cpuidle states commit 047f61c5d16d617e1df2deea5c5d5fb2a1b41c95 Merge: 05061bf 3d26678 Author: Linus Torvalds Date: Thu Mar 24 08:25:15 2011 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (42 commits) ACPI: minor printk format change in acpi_pad ACPI: make acpi_pad /sys output more readable ACPICA: Update version to 20110316 ACPICA: Header support for SLIC table ACPI: Make sure the FADT is at least rev 2 before using the reset register ACPI: Bug compatibility for Windows on the ACPI reboot vector ACPICA: Fix access width for reset vector ACPI battery: fribble sysfs files from a resume notifier ACPI button: remove unused procfs I/F ACPI, APEI, Add PCIe AER error information printing support PCIe, AER, use pre-generated prefix in error information printing ACPI, APEI, Add ERST record ID cache ACPI: Use syscore_ops instead of sysdev class and sysdev ACPI: Remove the unused EC sysdev class ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree ACPI: use __init where possible in processor driver Thermal_Framework-Fix_crash_during_hwmon_unregister ACPICA: Update version to 20110211. ACPICA: Add mechanism to defer _REG methods for some installed handlers ACPICA: Add support for FunctionalFixedHW in acpi_ut_get_region_name ... commit 05061bf678de5d69ebaae2c0705bf106e3000b6e Merge: fdc0ad8 de55aa3 Author: Linus Torvalds Date: Thu Mar 24 08:24:28 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: bf54x: re-enable anomaly 05000353 for all revs Blackfin: enable atomic64_t support Blackfin: wire up new syncfs syscall Blackfin: SMP: flush CoreB cache when shutting down commit fdc0ad80a4f27efcb457b49f5dd8455a3d623559 Merge: dc87c55 6ed09c3 Author: Linus Torvalds Date: Thu Mar 24 08:22:34 2011 -0700 Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 * 'for-linus' of git://git.infradead.org/ubi-2.6: UBIFS: fix assertion warning and refine comments UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS UBIFS: use GFP_NOFS properly UBI: use GFP_NOFS properly commit dc87c55120b0a5b0c4d731183f8bb348981aba65 Merge: 5818fcc 4be34b9 Author: Linus Torvalds Date: Thu Mar 24 08:20:39 2011 -0700 Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux * 'for-2.6.39' of git://linux-nfs.org/~bfields/linux: SUNRPC: Remove resource leak in svc_rdma_send_error() nfsd: wrong index used in inner loop nfsd4: fix comment and remove unused nfsd4_file fields nfs41: make sure nfs server return right ca_maxresponsesize_cached nfsd: fix compile error svcrpc: fix bad argument in unix_domain_find nfsd4: fix struct file leak nfsd4: minor nfs4state.c reshuffling svcrpc: fix rare race on unix_domain creation nfsd41: modify the members value of nfsd4_op_flags nfsd: add proc file listing kernel's gss_krb5 enctypes gss:krb5 only include enctype numbers in gm_upcall_enctypes NFSD, VFS: Remove dead code in nfsd_rename() nfsd: kill unused macro definition locks: use assign_type() commit 5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4 Merge: 0625bef 117a91e Author: Linus Torvalds Date: Thu Mar 24 08:02:21 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: Squashfs: Use vmalloc rather than kmalloc for zlib workspace Squashfs: handle corruption of directory structure Squashfs: wrap squashfs_mount() definition Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore Squashfs: Update documentation to include compression options Squashfs: Update Kconfig help text to include xz compression Squashfs: add compression options support to xz decompressor Squashfs: extend decompressor framework to handle compression options commit 0625bef6060fab4aab0e484130b59af5e9ac81bc Merge: a6a1d64 ba82638 Author: Linus Torvalds Date: Thu Mar 24 07:59:46 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB: Increase DMA max_segment_size on Mellanox hardware IB/mad: Improve an error message so error code is included RDMA/nes: Don't print success message at level KERN_ERR RDMA/addr: Fix return of uninitialized ret value IB/srp: try to use larger FMR sizes to cover our mappings IB/srp: add support for indirect tables that don't fit in SRP_CMD IB/srp: rework mapping engine to use multiple FMR entries IB/srp: allow sg_tablesize to be set for each target IB/srp: move IB CM setup completion into its own function IB/srp: always avoid non-zero offsets into an FMR commit a6a1d6485e77f28c11cdf943a3ed2a3fd83ac727 Merge: 1b506cf 316b6cc Author: Linus Torvalds Date: Thu Mar 24 07:59:01 2011 -0700 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (90 commits) mfd: Push byte swaps out of wm8994 bulk read path mfd: Rename ab8500 gpadc header mfd: Constify WM8994 write path mfd: Push byte swap out of WM8994 bulk I/O mfd: Avoid copying data in WM8994 I2C write mfd: Remove copy from WM831x I2C write function mfd: Staticise WM8994 PM ops regulator: Add a subdriver for TI TPS6105x regulator portions v2 mfd: Add a core driver for TI TPS61050/TPS61052 chips v2 gpio: Add Tunnel Creek support to sch_gpio mfd: Add Tunnel Creek support to lpc_sch pci_ids: Add Intel Tunnel Creek LPC Bridge device ID. regulator: MAX8997/8966 support mfd: Add WM8994 bulk register write operation mfd: Append additional read write on 88pm860x mfd: Adopt mfd_data in 88pm860x input driver mfd: Adopt mfd_data in 88pm860x regulator mfd: Adopt mfd_data in 88pm860x led mfd: Adopt mfd_data in 88pm860x backlight mfd: Fix MAX8997 Kconfig entry typos ... commit 1b506cfb6ae63f352643d6e208c85c1351547036 Merge: 4cc4d24 a49fb4c Author: Linus Torvalds Date: Thu Mar 24 07:57:38 2011 -0700 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd * 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: deprecate the commands pending counter exofs: Write sbi->s_nextid as part of the Create command exofs: Add option to mount by osdname exofs: Override read-ahead to align on stripe_size exofs: simple fsync race fix exofs: Optimize read_4_write exofs: Trivial: fix some indentation and debug prints exofs: Remove redundant unlikely() commit 4cc4d24efce4672f9b0e7fa27963770ae602998f Merge: b81a618 56be141 Author: Linus Torvalds Date: Thu Mar 24 07:56:52 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (140 commits) MAINTAINERS: de-orphan fbdev. MAINTAINERS: Add file pattern for fb dt bindings. video: Move sm501fb devicetree binding documentation to a better place. fbcon: fix situation where fbcon gets deinitialised and can't reinit. video, sm501: add OF binding to support SM501 video, sm501: add edid and commandline support video, sm501: add I/O functions for use on powerpc video: Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET fbcon: Bugfix soft cursor detection in Tile Blitting video: add missing framebuffer_release in error path video: metronomefb: add __devexit_p around reference to metronomefb_remove video: hecubafb: add __devexit_p around reference to hecubafb_remove drivers:video:aty:radeon_base Fix typo occationally to occasionally atmel_lcdfb: add fb_blank function atmel_lcdfb: implement inverted contrast pwm video: s3c-fb: return proper error if clk_get fails uvesafb,vesafb: create WC or WB PAT-entries video: ffb: fix ffb_probe error path radeonfb: Let hwmon driver probe the "monid" I2C bus fbdev: sh_mobile_lcdc: checking NULL instead of IS_ERR() ... commit b254244d2682fe975630f176c25a4444cc4e088d Author: Daniel De Graaf Date: Thu Mar 24 08:10:07 2011 -0400 xen/p2m: Allocate p2m tracking pages on override It is possible to add a p2m override on pages that are currently mapped to INVALID_P2M_ENTRY; in particular, this will happen when using ballooned pages in gntdev. This means that set_phys_to_machine must be used instead of __set_phys_to_machine. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit a93e20a83077f57638f8574b1c072ce6712e95ec Author: Dan Carpenter Date: Sat Mar 19 08:45:43 2011 +0300 xen-gntdev: unlock on error path in gntdev_mmap() We should unlock here and also decrement the number of &map->users. Signed-off-by: Dan Carpenter Signed-off-by: Konrad Rzeszutek Wilk commit 12f0258d5b44b3b5a9442ec461bbac1f7edab8c6 Author: Dan Carpenter Date: Sat Mar 19 08:44:34 2011 +0300 xen-gntdev: return -EFAULT on copy_to_user failure copy_to_user() returns the amount of data remaining to be copied. We want to return a negative error code here. The upper layers just call WARN_ON() if we return non-zero so this doesn't change the behavior. But returning -EFAULT is still cleaner. Signed-off-by: Dan Carpenter Signed-off-by: Konrad Rzeszutek Wilk commit 6ed09c34b7984a978a73a855f4c2e6662acc8bdb Author: Artem Bityutskiy Date: Wed Mar 23 10:32:58 2011 +0200 UBIFS: fix assertion warning and refine comments This patch fixes the following UBIFS assertion warning: UBIFS assert failed in do_readpage at 115 (pid 199) [] (unwind_backtrace+0x0/0xdc) from [] (do_readpage+0x108/0x594 [ubifs]) [] (do_readpage+0x108/0x594 [ubifs]) from [] (ubifs_write_end+0x1c0/0x2e8 [ubifs]) [] (ubifs_write_end+0x1c0/0x2e8 [ubifs]) from [] (generic_file_buffered_write+0x18c/0x270) [] (generic_file_buffered_write+0x18c/0x270) from [] (__generic_file_aio_write+0x478/0x4c0) [] (__generic_file_aio_write+0x478/0x4c0) from [] (generic_file_aio_write+0x68/0xc8) [] (generic_file_aio_write+0x68/0xc8) from [] (ubifs_aio_write+0x178/0x1d8 [ubifs]) [] (ubifs_aio_write+0x178/0x1d8 [ubifs]) from [] (do_sync_write+0xb0/0x100) [] (do_sync_write+0xb0/0x100) from [] (vfs_write+0xac/0x154) [] (vfs_write+0xac/0x154) from [] (sys_write+0x3c/0x68) [] (sys_write+0x3c/0x68) from [] (ret_fast_syscall+0x0/0x2c) The 'PG_checked' flag is used to indicate that the page does not supposedly exist on the media (e.g., a hole or a page beyond the inode size), so it requires slightly bigger budget, because we have to account the indexing size increase. And this flag basically tells that the budget for this page has to be "new page budget". The "new page budget" is slightly bigger than the "existing page budget". The 'do_readpage()' function has the following assertion which sometimes is hit: 'ubifs_assert(!PageChecked(page))'. Obviously, the meaning of this assertion is: "I should not be asked to read a page which does not exist on the media". However, in 'ubifs_write_begin()' we have a small "trick". Notice, that VFS may write pages which were not read yet, so the page data were not loaded from the media to the page cache yet. If VFS tells that it is going to change only some part of the page, we obviously have to load it from the media. However, if VFS tells that it is going to change whole page, we do not read it from the media for optimization purposes. However, since we do not read it, we do not know if it exists on the media or not (a hole, etc). So we set the 'PG_checked' flag to this page to force bigger budget, just in case. So 'ubifs_write_begin()' sets 'PG_checked'. Then we are in 'ubifs_write_end()'. And VFS tells us: "hey, for some reasons I changed my mind and did not change whole page". Frankly, I do not know why this happens, but I hit this somehow on an ARM platform. And this is extremely rare. So in this case UBIFS does the following: 1. Cancels allocated budget. 2. Loads the page from the media by calling 'do_readpage()'. 3. Asks VFS to repeat the whole write operation from the very beginning (call '->write_begin() again, etc). And the assertion warning is hit at the step 2 - remember we have the 'PG_checked' set for this page, and 'do_readpage()' does not like this. So this patch fixes the problem by adding step 1.5 and cleaning the 'PG_checked' before calling 'do_readpage()'. All in all, this patch does not fix any functionality issue, but it silences UBIFS false positive warning which may happen in very very rare cases. And while on it, this patch also improves a commentary which explains the reasons of setting the 'PG_checked' flag for the page. The old commentary was a bit difficult to understand. Signed-off-by: Artem Bityutskiy commit 9d523cafbe0dab5a2b873ecd85c37fec9d1368f3 Author: Artem Bityutskiy Date: Mon Mar 21 16:16:29 2011 +0200 UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS Simplify UBIFS configuration menu and kill the option to enable self-check compile-time. We do not really need this because we can do this run-time using the module parameters or the corresponding sysfs interfaces. And there is a value in simplifying the kernel configuration menu which becomes increasingly large. Signed-off-by: Artem Bityutskiy commit fc5e58c0c4fd86881ec8ba8e46e41a07e25dc7a6 Author: Artem Bityutskiy Date: Thu Mar 24 16:14:26 2011 +0200 UBIFS: use GFP_NOFS properly This patch fixes a brown-paperbag bug which was introduced by me: I used incorrect "GFP_KERNEL | GFP_NOFS" allocation flags to make sure my allocations do not cause write-back. But the correct form is "GFP_NOFS". Signed-off-by: Artem Bityutskiy commit 3d46b316bcc1ecb17f8e7874a8ec620c64864898 Author: Artem Bityutskiy Date: Thu Mar 24 16:09:56 2011 +0200 UBI: use GFP_NOFS properly This patch fixes a brown-paperbag bug which was introduced by me: I used incorrect "GFP_KERNEL | GFP_NOFS" allocation flags to make sure my allocations do not cause write-back. But the correct form is "GFP_NOFS". Signed-off-by: Artem Bityutskiy commit 29915202006c2e7bafe81348eb498ff9a724ac61 Author: Mustafa Mesanovic Date: Thu Mar 24 13:54:35 2011 +0000 dm stripe: implement merge method Implement a merge function in the striped target. When the striped target's underlying devices provide a merge_bvec_fn (like all DM devices do via dm_merge_bvec) it is important to call down to them when building a biovec that doesn't span a stripe boundary. Without the merge method, a striped DM device stacked on DM devices causes bios with a single page to be submitted which results in unnecessary overhead that hurts performance. This change really helps filesystems (e.g. XFS and now ext4) which take care to assemble larger bios. By implementing stripe_merge(), DM and the stripe target no longer undermine the filesystem's work by only allowing a single page per bio. Buffered IO sees the biggest improvement (particularly uncached reads, buffered writes to a lesser degree). This is especially so for more capable "enterprise" storage LUNs. The performance improvement has been measured to be ~12-35% -- when a reasonable chunk_size is used (e.g. 64K) in conjunction with a stripe count that is a power of 2. In contrast, the performance penalty is ~5-7% for the pathological worst case stripe configuration (small chunk_size with a stripe count that is not a power of 2). The reason for this is that stripe_map_sector() is now called once for every call to dm_merge_bvec(). stripe_map_sector() will use slower division if stripe count isn't a power of 2. Signed-off-by: Mustafa Mesanovic Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit a490a07a67b7a37f588021410e06b721a752fc34 Author: Mike Snitzer Date: Thu Mar 24 13:54:33 2011 +0000 dm mpath: allow table load with no priority groups This patch adjusts the multipath target to allow a table with both 0 priority groups and 0 for the initial priority group number. If any mpath device is held open when all paths in the last priority group have failed, userspace multipathd will attempt to reload the associated DM table to reflect the fact that the device no longer has any priority groups. But the reload attempt always failed because the multipath target did not allow 0 priority groups. All multipath target messages related to priority group (enable_group, disable_group, switch_group) will handle a priority group of 0 (will cause error). When reloading a multipath table with 0 priority groups, userspace multipathd must be updated to specify an initial priority group number of 0 (rather than 1). Signed-off-by: Mike Snitzer Cc: Babu Moger Acked-by: Hannes Reinecke Signed-off-by: Alasdair G Kergon commit 19040c0bc8efcb767221d8ef7bb9c32ff0586179 Author: Mike Snitzer Date: Thu Mar 24 13:54:31 2011 +0000 dm mpath: fail message ioctl if specified path is not valid Fail the reinstate_path and fail_path message ioctl if the specified path is not valid. The message ioctl would succeed for the 'reinistate_path' and 'fail_path' messages even if action was not taken because the specified device was not a valid path of the multipath device. Before, when /dev/vdb is not a path of mpathb: $ dmsetup message mpathb 0 reinstate_path /dev/vdb $ echo $? 0 After: $ dmsetup message mpathb 0 reinstate_path /dev/vdb device-mapper: message ioctl failed: Invalid argument Command failed $ echo $? 1 Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit f868120549fc1664b2c451d4b9882a363928c698 Author: Milan Broz Date: Thu Mar 24 13:54:30 2011 +0000 dm ioctl: add flag to wipe buffers for secure data Add DM_SECURE_DATA_FLAG which userspace can use to ensure that all buffers allocated for dm-ioctl are wiped immediately after use. The user buffer is wiped as well (we do not want to keep and return sensitive data back to userspace if the flag is set). Wiping is useful for cryptsetup to ensure that the key is present in memory only in defined places and only for the time needed. (For crypt, key can be present in table during load or table status, wait and message commands). Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 6bb43b5d1f54fb44c0408d86d5e71e4405a3ebe1 Author: Milan Broz Date: Thu Mar 24 13:54:28 2011 +0000 dm ioctl: prepare for crypt key wiping Prepare code for implementing buffer wipe flag. No functional change in this patch. Signed-off-by: Milan Broz Acked-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit de8be5ac70f50a2340f24fd769a1aafa5a51ae34 Author: Milan Broz Date: Thu Mar 24 13:54:27 2011 +0000 dm crypt: wipe keys string immediately after key is set Always wipe the original copy of the key after processing it in crypt_set_key(). Signed-off-by: Milan Broz Acked-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 3407ef5262b55ca5d7139d2b555ef792fe531eec Author: Josef Bacik Date: Thu Mar 24 13:54:24 2011 +0000 dm: add flakey target This target is the same as the linear target except that it returns I/O errors periodically. It's been found useful in simulating failing devices for testing purposes. I needed a dm target to do some failure testing on btrfs's raid code, and Mike pointed me at this. Signed-off-by: Josef Bacik Signed-off-by: Alasdair G Kergon commit 024d37e95ec4a7ccc256973ab2feab01f4fbdd2d Author: Milan Broz Date: Thu Mar 24 13:52:14 2011 +0000 dm: fix opening log and cow devices for read only tables If a table is read-only, also open any log and cow devices it uses read-only. Previously, even read-only devices were opened read-write internally. After patch 75f1dc0d076d1c1168f2115f1941ea627d38bd5a block: check bdev_read_only() from blkdev_get() was applied, loading such tables began to fail. The patch was reverted by e51900f7d38cbcfb481d84567fd92540e7e1d23a block: revert block_dev read-only check but this patch fixes this part of the code to work with the original patch. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 51eab416c9b4b3ed16553d405ec4a5f67daa34cf Author: Dave Airlie Date: Thu Mar 24 20:54:35 2011 +1000 drm/vblank: update recently added vbl interface to be more future proof. This makes the interface a bit cleaner by leaving a single gap in the vblank bit space instead of creating two gaps. Suggestions from Michel on mailing list/irc. Reviewed-by: Michel Dänzer Signed-off-by: Dave Airlie commit 1783e4bf6f4e5c3b13c09aff24da7dcc69fb3e2f Author: Thomas Renninger Date: Wed Mar 23 15:14:09 2011 +0000 drm radeon: Return -EINVAL on wrong pm sysfs access Throw an error if someone tries to fill this with wrong data, instead of simply ignoring the input. Now you get: echo hello >/sys/../power_method -bash: echo: write error: Invalid argument Signed-off-by: Thomas Renninger CC: Alexander.Deucher@amd.com CC: dri-devel@lists.freedesktop.org Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie commit fafcf94e2b5732d1e13b440291c53115d2b172e9 Author: Alex Deucher Date: Wed Mar 23 08:10:10 2011 +0000 drm/radeon/kms: fix hardcoded EDID handling On some servers there is a hardcoded EDID provided in the vbios so that the driver will always see a display connected even if something like a KVM prevents traditional means like DDC or load detection from working properly. Also most server boards with DVI are not actually DVI, but DVO connected to a virtual KVM service processor. If we fail to detect a monitor via DDC or load detection and a hardcoded EDID is available, use it. Additionally, when using the hardcoded EDID, use a copy of it rather than the actual one stored in the driver as the detect() and get_modes() functions may free it if DDC is successful. This fixes the virtual KVM on several internal servers. Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 2d370f502ac872dc9b4cd05f9922b260e2874ec1 Merge: 64146f8 f0c8602 Author: Dave Airlie Date: Thu Mar 24 20:21:45 2011 +1000 Merge remote branch 'intel/drm-intel-fixes' of ../drm-next into drm-core-next * 'intel/drm-intel-fixes' of ../drm-next: Revert "drm/i915: Don't save/restore hardware status page address register" drm/i915: Avoid unmapping pages from a NULL address space drm/i915: Fix use after free within tracepoint drm/i915: Restore missing command flush before interrupt on BLT ring drm/i915: Disable pagefaults along execbuffer relocation fast path drm/i915: Fix computation of pitch for dumb bo creator drm/i915: report correct render clock frequencies on SNB drm/i915/dp: Correct the order of deletion for ghost eDP devices drm/i915: Fix tiling corruption from pipelined fencing drm/i915: Re-enable self-refresh drm/i915: Prevent racy removal of request from client list drm/i915: skip redundant operations whilst enabling pipes and planes drm/i915: Remove surplus POSTING_READs before wait_for_vblank commit 71f9e59800e5ad4e6b683348424c9fe54306cd43 Author: Namhyung Kim Date: Thu Mar 24 11:42:30 2011 +0900 x86, dumpstack: Use %pB format specifier for stack trace Improve noreturn function entries in call traces: Before: Call Trace: [] panic+0x8c/0x18d [] deep01+0x0/0x38 [test_panic] <--- bad [] proc_file_write+0x73/0x8d [] proc_reg_write+0x8d/0xac [] vfs_write+0xa1/0xc5 [] sys_write+0x45/0x6c [] system_call_fastpath+0x16/0x1b After: Call Trace: [] panic+0x8c/0x18d [] panic_write+0x20/0x20 [test_panic] <--- good [] proc_file_write+0x73/0x8d [] proc_reg_write+0x8d/0xac [] vfs_write+0xa1/0xc5 [] sys_write+0x45/0x6c [] system_call_fastpath+0x16/0x1b Signed-off-by: Namhyung Kim Acked-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Linus Torvalds Cc: Andrew Morton LKML-Reference: <1300934550-21394-2-git-send-email-namhyung@gmail.com> Signed-off-by: Ingo Molnar commit 0f77a8d378254f27df4a114a5da67223af1fe93f Author: Namhyung Kim Date: Thu Mar 24 11:42:29 2011 +0900 vsprintf: Introduce %pB format specifier The %pB format specifier is for stack backtrace. Its handler sprint_backtrace() does symbol lookup using (address-1) to ensure the address will not point outside of the function. If there is a tail-call to the function marked "noreturn", gcc optimized out the code after the call then causes saved return address points outside of the function (i.e. the start of the next function), so pollutes call trace somewhat. This patch adds the %pB printk mechanism that allows architecture call-trace printout functions to improve backtrace printouts. Signed-off-by: Namhyung Kim Acked-by: Steven Rostedt Acked-by: Frederic Weisbecker Cc: Linus Torvalds Cc: Andrew Morton Cc: linux-arch@vger.kernel.org LKML-Reference: <1300934550-21394-1-git-send-email-namhyung@gmail.com> Signed-off-by: Ingo Molnar commit f0c860246472248a534656d6cdbed5a36d1feb2e Author: Chris Wilson Date: Wed Mar 23 17:53:28 2011 +0000 Revert "drm/i915: Don't save/restore hardware status page address register" This reverts commit a7a75c8f70d6f6a2f16c9f627f938bbee2d32718. There are two different variations on how Intel hardware addresses the "Hardware Status Page". One as a location in physical memory and the other as an offset into the virtual memory of the GPU, used in more recent chipsets. (The HWS itself is a cacheable region of memory which the GPU can write to without requiring CPU synchronisation, used for updating various details of hardware state, such as the position of the GPU head in the ringbuffer, the last breadcrumb seqno, etc). These two types of addresses were updated in different locations of code - one inline with the ringbuffer initialisation, and the other during device initialisation. (The HWS page is logically associated with the rings, and there is one HWS page per ring.) During resume, only the ringbuffers were being re-initialised along with the virtual HWS page, leaving the older physical address HWS untouched. This then caused a hang on the older gen3/4 (915GM, 945GM, 965GM) the first time we tried to synchronise the GPU as the breadcrumbs were never being updated. Reported-and-tested-by: Linus Torvalds Reported-by: Jan Niehusmann Reported-and-tested-by: Justin P. Mattock Reported-and-tested-by: Michael "brot" Groh Cc: Zhenyu Wang Signed-off-by: Chris Wilson Acked-by: Zhenyu Wang commit ef352e7cdf714596f51ad18809404edeaa50e8fd Author: Eric Dumazet Date: Thu Mar 24 00:13:14 2011 -0700 net_sched: fix THROTTLED/RUNNING race commit fd245a4adb52 (net_sched: move TCQ_F_THROTTLED flag) added a race. qdisc_watchdog() is run from softirq, so special care should be taken or we can lose one state transition (THROTTLED/RUNNING) Prior to fd245a4adb52, we were manipulating q->flags (qdisc->flags &= ~TCQ_F_THROTTLED;) and this manipulation could only race with qdisc_warn_nonwc(). Since we want to avoid atomic ops in qdisc fast path - it was the meaning of commit 371121057607e (QDISC_STATE_RUNNING dont need atomic bit ops) - fix is to move THROTTLE bit into 'state' field, this one being manipulated with SMP and IRQ safe operations. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a0fa2206f550066d6948d43c5401e973e5f7d320 Author: Aaro Koskinen Date: Wed Mar 23 23:48:19 2011 -0700 Input: tsc2005 - fix locking issue Commit 0b950d3 (Input: tsc2005 - add open/close) introduced a locking issue with the ESD watchdog: __tsc2005_disable() is calling cancel_delayed_work_sync() with mutex held, and the work also needs the same mutex. Fix the problem by using mutex_trylock() in tsc2005_esd_work(). If the mutex is taken, we know we are in the middle of disable or enable and the watchdog check can be skipped. Signed-off-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 903427955b9ffe1ca4b76c510089774c3b7a4a8a Author: Aaro Koskinen Date: Wed Mar 23 23:45:11 2011 -0700 Input: tsc2005 - use relative jiffies to schedule the watchdog Use relative jiffies to schedule the watchdog. Otherwise it will run like a mad one. Signed-off-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit ddca6a31345cbea8c7c907e6b7e016339cbb6342 Author: Geert Uytterhoeven Date: Mon Mar 21 02:37:07 2011 -0700 Input: tsc2005 - driver should depend on GENERIC_HARDIRQS drivers/input/touchscreen/tsc2005.c: In function ‘tsc2005_probe’: drivers/input/touchscreen/tsc2005.c:666: error: implicit declaration of function ‘set_irq_wake’ In addition, migrate from set_irq_wake() (marked "do not use" as of commit a0cd9ca2b907d7ee26575e7b63ac92dad768a75e ("genirq: Namespace cleanup")) to irq_set_irq_wake(). Signed-off-by: Geert Uytterhoeven Signed-off-by: Dmitry Torokhov commit b15ed691667f59867c9c130b8d84feda4050be04 Author: Nobuhiro Iwamatsu Date: Thu Mar 24 05:47:40 2011 +0000 sh: Fix build alloc_thread_info_node function By commit b6a84016bd2598e35ead635147fa53619982648d, alloc_thread_info was replaced by alloc_thread_info_node. However, the change of the function name and the addition of the argument were incomplete. Signed-off-by: Nobuhiro Iwamatsu CC: Eric Dumazet Signed-off-by: Paul Mundt commit a3d3362287fbe96fe90abdb5c6d1a35471129a8c Merge: fb7f045 4bbba11 Author: Paul Mundt Date: Thu Mar 24 15:17:25 2011 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest commit b81a618dcd3ea99de292dbe624f41ca68f464376 Merge: 2f284c8 a9712bc Author: Linus Torvalds Date: Wed Mar 23 20:51:42 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: deal with races in /proc/*/{syscall,stack,personality} proc: enable writing to /proc/pid/mem proc: make check_mem_permission() return an mm_struct on success proc: hold cred_guard_mutex in check_mem_permission() proc: disable mem_write after exec mm: implement access_remote_vm mm: factor out main logic of access_process_vm mm: use mm_struct to resolve gate vma's in __get_user_pages mm: arch: rename in_gate_area_no_task to in_gate_area_no_mm mm: arch: make in_gate_area take an mm_struct instead of a task_struct mm: arch: make get_gate_vma take an mm_struct instead of a task_struct x86: mark associated mm when running a task in 32 bit compatibility mode x86: add context tag to mark mm when running a task in 32-bit compatibility mode auxv: require the target to be tracable (or yourself) close race in /proc/*/environ report errors in /proc/*/*map* sanely pagemap: close races with suid execve make sessionid permissions in /proc/*/task/* match those in /proc/* fix leaks in path_lookupat() Fix up trivial conflicts in fs/proc/base.c commit 2f284c846331fa44be1300a3c2c3e85800268a00 Merge: 93a7205 6f82f4d Author: Linus Torvalds Date: Wed Mar 23 20:37:26 2011 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (35 commits) ARM: Update (and cut down) mach-types ARM: 6771/1: vexpress: add support for multiple core tiles ARM: 6797/1: hw_breakpoint: Fix newlines in WARNings ARM: 6751/1: vexpress: select applicable errata workarounds in Kconfig ARM: 6753/1: omap4: Enable ARM local timers with OMAP4430 es1.0 exception ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime ARM: pgtable: add pud-level code ARM: 6673/1: LPAE: use phys_addr_t instead of unsigned long for start of membanks ARM: Use long long format when printing meminfo physical addresses ARM: integrator: add Integrator/CP sched_clock support ARM: realview/vexpress: consolidate SMP bringup code ARM: realview/vexpress: consolidate localtimer support ARM: integrator/versatile: consolidate FPGA IRQ handling code ARM: rationalize versatile family Kconfig/Makefile ARM: realview: remove old AMBA device DMA definitions ARM: versatile: remove old AMBA device DMA definitions ARM: vexpress: use new init_early for clock tree and sched_clock init ARM: realview: use new init_early for clock tree and sched_clock init ARM: versatile: use new init_early for clock tree and sched_clock init ARM: integrator: use new init_early for clock tree init ... commit 06fb01fd1dc624d891cbe039a88a44bc8a8a9ec1 Author: Philippe Langlais Date: Wed Mar 23 11:05:16 2011 +0100 spi/pl022: Add loopback support for the SPI on 5500 Extend the vendor data with a loopback field, and add new amba-pl022 vendor data for the DB5500 pl023, as the pl023 on db8500 and db5500 vary. Signed-off-by: Prajadevi H Signed-off-by: Philippe Langlais Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit 93a72052be81823fa1584b9be037d51924f9efa4 Author: Olaf Hering Date: Wed Mar 23 16:43:29 2011 -0700 crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn The Xen PV drivers in a crashed HVM guest can not connect to the dom0 backend drivers because both frontend and backend drivers are still in connected state. To run the connection reset function only in case of a crashdump, the is_kdump_kernel() function needs to be available for the PV driver modules. Consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn into kernel/crash_dump.c Also export elfcorehdr_addr to make is_kdump_kernel() usable for modules. Leave 'elfcorehdr' as early_param(). This changes powerpc from __setup() to early_param(). It adds an address range check from x86 also on ia64 and powerpc. [akpm@linux-foundation.org: additional #includes] [akpm@linux-foundation.org: remove elfcorehdr_addr export] [akpm@linux-foundation.org: fix for Tejun's mm/nobootmem.c changes] Signed-off-by: Olaf Hering Cc: Russell King Cc: "Luck, Tony" Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Johannes Weiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8547727756a7322b99aa313ce50fe15d8f858872 Author: FUJITA Tomonori Date: Wed Mar 23 16:43:28 2011 -0700 remove dma64_addr_t There is no user now. Signed-off-by: FUJITA Tomonori Cc: David Miller Cc: Ralf Baechle Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9b182e24ecb2b3bb33340f053ba31c8c4e1d895 Author: Mandeep Singh Baines Date: Wed Mar 23 16:43:27 2011 -0700 taskstats: use appropriate printk priority level printk()s without a priority level default to KERN_WARNING. To reduce noise at KERN_WARNING, this patch set the priority level appriopriately for unleveled printks()s. This should be useful to folks that look at dmesg warnings closely. Signed-off-by: Mandeep Singh Baines Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e1496707560ecf98e9b0604622c0990f94861d3 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:26 2011 -0700 userns: rename is_owner_or_cap to inode_owner_or_capable And give it a kernel-doc comment. [akpm@linux-foundation.org: btrfs changed in linux-next] Signed-off-by: Serge E. Hallyn Cc: "Eric W. Biederman" Cc: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e795b71799ff0b27365020c9ddaa25d0d83f99c8 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:25 2011 -0700 userns: userns: check user namespace for task->file uid equivalence checks Cheat for now and say all files belong to init_user_ns. Next step will be to let superblocks belong to a user_ns, and derive inode_userns(inode) from inode->i_sb->s_user_ns. Finally we'll introduce more flexible arrangements. Changelog: Feb 15: make is_owner_or_cap take const struct inode Feb 23: make is_owner_or_cap bool [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Serge E. Hallyn Acked-by: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0e77598f87107001a00b8a4ece9c95e4254ccc4 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:24 2011 -0700 userns: user namespaces: convert several capable() calls CAP_IPC_OWNER and CAP_IPC_LOCK can be checked against current_user_ns(), because the resource comes from current's own ipc namespace. setuid/setgid are to uids in own namespace, so again checks can be against current_user_ns(). Changelog: Jan 11: Use task_ns_capable() in place of sched_capable(). Jan 11: Use nsown_capable() as suggested by Bastian Blank. Jan 11: Clarify (hopefully) some logic in futex and sched.c Feb 15: use ns_capable for ipc, not nsown_capable Feb 23: let copy_ipcs handle setting ipc_ns->user_ns Feb 23: pass ns down rather than taking it from current [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Serge E. Hallyn Acked-by: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b515498f5bb5f38fc0e390b4ff7d00b6077de127 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:23 2011 -0700 userns: add a user namespace owner of ipc ns Changelog: Feb 15: Don't set new ipc->user_ns if we didn't create a new ipc_ns. Feb 23: Move extern declaration to ipc_namespace.h, and group fwd declarations at top. Signed-off-by: Serge E. Hallyn Acked-by: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc832ad3645f0507f24d11752544525a50a83c71 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:22 2011 -0700 userns: user namespaces: convert all capable checks in kernel/sys.c This allows setuid/setgid in containers. It also fixes some corner cases where kernel logic foregoes capability checks when uids are equivalent. The latter will need to be done throughout the whole kernel. Changelog: Jan 11: Use nsown_capable() as suggested by Bastian Blank. Jan 11: Fix logic errors in uid checks pointed out by Bastian. Feb 15: allow prlimit to current (was regression in previous version) Feb 23: remove debugging printks, uninline set_one_prio_perm and make it bool, and document its return value. Signed-off-by: Serge E. Hallyn Acked-by: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3263245de48344ad7bdd0e7256bf1606d2592f88 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:21 2011 -0700 userns: make has_capability* into real functions So we can let type safety keep things sane, and as a bonus we can remove the declaration of init_user_ns in capability.h. Signed-off-by: Serge E. Hallyn Cc: "Eric W. Biederman" Cc: Daniel Lezcano Cc: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8409cca7056113bee3236cb6a8e4d8d4d1eef102 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:20 2011 -0700 userns: allow ptrace from non-init user namespaces ptrace is allowed to tasks in the same user namespace according to the usual rules (i.e. the same rules as for two tasks in the init user namespace). ptrace is also allowed to a user namespace to which the current task the has CAP_SYS_PTRACE capability. Changelog: Dec 31: Address feedback by Eric: . Correct ptrace uid check . Rename may_ptrace_ns to ptrace_capable . Also fix the cap_ptrace checks. Jan 1: Use const cred struct Jan 11: use task_ns_capable() in place of ptrace_capable(). Feb 23: same_or_ancestore_user_ns() was not an appropriate check to constrain cap_issubset. Rather, cap_issubset() only is meaningful when both capsets are in the same user_ns. Signed-off-by: Serge E. Hallyn Cc: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39fd33933b0209e4b6254743f2cede07c5ad4c52 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:19 2011 -0700 userns: allow killing tasks in your own or child userns Changelog: Dec 8: Fixed bug in my check_kill_permission pointed out by Eric Biederman. Dec 13: Apply Eric's suggestion to pass target task into kill_ok_by_cred() for clarity Dec 31: address comment by Eric Biederman: don't need cred/tcred in check_kill_permission. Jan 1: use const cred struct. Jan 11: Per Bastian Blank's advice, clean up kill_ok_by_cred(). Feb 16: kill_ok_by_cred: fix bad parentheses Feb 23: per akpm, let compiler inline kill_ok_by_cred Signed-off-by: Serge E. Hallyn Acked-by: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb96a6f50be27390dc959ff67d9ea0ea0cfbe177 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:18 2011 -0700 userns: allow sethostname in a container Changelog: Feb 23: let clone_uts_ns() handle setting uts->user_ns To do so we need to pass in the task_struct who'll get the utsname, so we can get its user_ns. Feb 23: As per Oleg's coment, just pass in tsk, instead of two of its members. Signed-off-by: Serge E. Hallyn Acked-by: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3486740a4f32a6a466f5ac931654d154790ba648 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:17 2011 -0700 userns: security: make capabilities relative to the user namespace - Introduce ns_capable to test for a capability in a non-default user namespace. - Teach cap_capable to handle capabilities in a non-default user namespace. The motivation is to get to the unprivileged creation of new namespaces. It looks like this gets us 90% of the way there, with only potential uid confusion issues left. I still need to handle getting all caps after creation but otherwise I think I have a good starter patch that achieves all of your goals. Changelog: 11/05/2010: [serge] add apparmor 12/14/2010: [serge] fix capabilities to created user namespaces Without this, if user serge creates a user_ns, he won't have capabilities to the user_ns he created. THis is because we were first checking whether his effective caps had the caps he needed and returning -EPERM if not, and THEN checking whether he was the creator. Reverse those checks. 12/16/2010: [serge] security_real_capable needs ns argument in !security case 01/11/2011: [serge] add task_ns_capable helper 01/11/2011: [serge] add nsown_capable() helper per Bastian Blank suggestion 02/16/2011: [serge] fix a logic bug: the root user is always creator of init_user_ns, but should not always have capabilities to it! Fix the check in cap_capable(). 02/21/2011: Add the required user_ns parameter to security_capable, fixing a compile failure. 02/23/2011: Convert some macros to functions as per akpm comments. Some couldn't be converted because we can't easily forward-declare them (they are inline if !SECURITY, extern if SECURITY). Add a current_user_ns function so we can use it in capability.h without #including cred.h. Move all forward declarations together to the top of the #ifdef __KERNEL__ section, and use kernel-doc format. 02/23/2011: Per dhowells, clean up comment in cap_capable(). 02/23/2011: Per akpm, remove unreachable 'return -EPERM' in cap_capable. (Original written and signed off by Eric; latest, modified version acked by him) [akpm@linux-foundation.org: fix build] [akpm@linux-foundation.org: export current_user_ns() for ecryptfs] [serge.hallyn@canonical.com: remove unneeded extra argument in selinux's task_has_capability] Signed-off-by: Eric W. Biederman Signed-off-by: Serge E. Hallyn Acked-by: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59607db367c57f515183cb203642291bb14d9c40 Author: Serge E. Hallyn Date: Wed Mar 23 16:43:16 2011 -0700 userns: add a user_namespace as creator/owner of uts_namespace The expected course of development for user namespaces targeted capabilities is laid out at https://wiki.ubuntu.com/UserNamespace. Goals: - Make it safe for an unprivileged user to unshare namespaces. They will be privileged with respect to the new namespace, but this should only include resources which the unprivileged user already owns. - Provide separate limits and accounting for userids in different namespaces. Status: Currently (as of 2.6.38) you can clone with the CLONE_NEWUSER flag to get a new user namespace if you have the CAP_SYS_ADMIN, CAP_SETUID, and CAP_SETGID capabilities. What this gets you is a whole new set of userids, meaning that user 500 will have a different 'struct user' in your namespace than in other namespaces. So any accounting information stored in struct user will be unique to your namespace. However, throughout the kernel there are checks which - simply check for a capability. Since root in a child namespace has all capabilities, this means that a child namespace is not constrained. - simply compare uid1 == uid2. Since these are the integer uids, uid 500 in namespace 1 will be said to be equal to uid 500 in namespace 2. As a result, the lxc implementation at lxc.sf.net does not use user namespaces. This is actually helpful because it leaves us free to develop user namespaces in such a way that, for some time, user namespaces may be unuseful. Bugs aside, this patchset is supposed to not at all affect systems which are not actively using user namespaces, and only restrict what tasks in child user namespace can do. They begin to limit privilege to a user namespace, so that root in a container cannot kill or ptrace tasks in the parent user namespace, and can only get world access rights to files. Since all files currently belong to the initila user namespace, that means that child user namespaces can only get world access rights to *all* files. While this temporarily makes user namespaces bad for system containers, it starts to get useful for some sandboxing. I've run the 'runltplite.sh' with and without this patchset and found no difference. This patch: copy_process() handles CLONE_NEWUSER before the rest of the namespaces. So in the case of clone(CLONE_NEWUSER|CLONE_NEWUTS) the new uts namespace will have the new user namespace as its owner. That is what we want, since we want root in that new userns to be able to have privilege over it. Changelog: Feb 15: don't set uts_ns->user_ns if we didn't create a new uts_ns. Feb 23: Move extern init_user_ns declaration from init/version.c to utsname.h. Signed-off-by: Serge E. Hallyn Acked-by: "Eric W. Biederman" Acked-by: Daniel Lezcano Acked-by: David Howells Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52e9fc76d0d4b1e8adeee736172c6c23180059b2 Author: Oleg Nesterov Date: Wed Mar 23 16:43:14 2011 -0700 procfs: kill the global proc_mnt variable After the previous cleanup in proc_get_sb() the global proc_mnt has no reasons to exists, kill it. Signed-off-by: Oleg Nesterov Signed-off-by: Eric W. Biederman Signed-off-by: Daniel Lezcano Cc: Alexey Dobriyan Acked-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4308eebbeb2026827d4492ce8c23d99f7f144a82 Author: Eric W. Biederman Date: Wed Mar 23 16:43:13 2011 -0700 pidns: call pid_ns_prepare_proc() from create_pid_namespace() Reorganize proc_get_sb() so it can be called before the struct pid of the first process is allocated. Signed-off-by: Eric W. Biederman Signed-off-by: Daniel Lezcano Cc: Oleg Nesterov Cc: Alexey Dobriyan Acked-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45a68628d37222e655219febce9e91b6484789b2 Author: Eric W. Biederman Date: Wed Mar 23 16:43:12 2011 -0700 pid: remove the child_reaper special case in init/main.c This patchset is a cleanup and a preparation to unshare the pid namespace. These prerequisites prepare for Eric's patchset to give a file descriptor to a namespace and join an existing namespace. This patch: It turns out that the existing assignment in copy_process of the child_reaper can handle the initial assignment of child_reaper we just need to generalize the test in kernel/fork.c Signed-off-by: Eric W. Biederman Signed-off-by: Daniel Lezcano Cc: Oleg Nesterov Cc: Alexey Dobriyan Acked-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfdc0b497faa82a0ba2f9dddcf109231dd519fcc Author: Richard Weinberger Date: Wed Mar 23 16:43:11 2011 -0700 sysctl: restrict write access to dmesg_restrict When dmesg_restrict is set to 1 CAP_SYS_ADMIN is needed to read the kernel ring buffer. But a root user without CAP_SYS_ADMIN is able to reset dmesg_restrict to 0. This is an issue when e.g. LXC (Linux Containers) are used and complete user space is running without CAP_SYS_ADMIN. A unprivileged and jailed root user can bypass the dmesg_restrict protection. With this patch writing to dmesg_restrict is only allowed when root has CAP_SYS_ADMIN. Signed-off-by: Richard Weinberger Acked-by: Dan Rosenberg Acked-by: Serge E. Hallyn Cc: Eric Paris Cc: Kees Cook Cc: James Morris Cc: Eugene Teo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb16e95fa2996743a6e80a665ed2ed0590bd38cf Author: Petr Holasek Date: Wed Mar 23 16:43:09 2011 -0700 sysctl: add some missing input constraint checks Add boundaries of allowed input ranges for: dirty_expire_centisecs, drop_caches, overcommit_memory, page-cluster and panic_on_oom. Signed-off-by: Petr Holasek Acked-by: Dave Young Cc: David Rientjes Cc: Wu Fengguang Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 256c53a65128cbc8a766b1503f3f25a52a8d07cb Author: Denis Kirjanov Date: Wed Mar 23 16:43:08 2011 -0700 sysctl_check: drop dead code Drop dead code. Signed-off-by: Denis Kirjanov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 814ecf6e5b7854504ae83255173e53836c5d8420 Author: Denis Kirjanov Date: Wed Mar 23 16:43:08 2011 -0700 sysctl_check: drop table->procname checks Since the for loop checks for the table->procname drop useless table->procname checks inside the loop body Signed-off-by: Denis Kirjanov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad4ac17ad1e2f0bd0ce38b2585c5d7fa2b0780dc Author: Dan Carpenter <[error27@gmail.com]> Date: Wed Mar 23 16:43:07 2011 -0700 rapidio: fix potential null deref on failure path If rio is not a switch then "rswitch" is null. Signed-off-by: Dan Carpenter Cc: Matt Porter Cc: Kumar Gala Signed-off-by: Alexandre Bounine Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1256ebe6a10bb3e104ecb2d1a458f9907ee49fb Author: Alexandre Bounine Date: Wed Mar 23 16:43:06 2011 -0700 rapidio: remove mport resource reservation from common RIO code Removes resource reservation from the common sybsystem initialization code and make it part of mport driver initialization. This resolves conflict with resource reservation by device specific mport drivers. Signed-off-by: Alexandre Bounine Cc: Kumar Gala Cc: Matt Porter Cc: Li Yang Cc: Thomas Moll Cc: Micha Nelissen Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 569fccb6b48878d654310e1ffaf9a5a6e46b3144 Author: Alexandre Bounine Date: Wed Mar 23 16:43:05 2011 -0700 rapidio: modify mport ID assignment Changes mport ID and host destination ID assignment to implement unified method common to all mport drivers. Makes "riohdid=" kernel command line parameter common for all architectures with support for more that one host destination ID assignment. Signed-off-by: Alexandre Bounine Cc: Kumar Gala Cc: Matt Porter Cc: Li Yang Cc: Thomas Moll Cc: Micha Nelissen Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f809985d2cbc78078b8da1cbed1f1ce1f4a0d5f Author: Alexandre Bounine Date: Wed Mar 23 16:43:04 2011 -0700 rapidio: modify subsystem and driver initialization sequence Subsystem initialization sequence modified to support presence of multiple RapidIO controllers in the system. The new sequence is compatible with initialization of PCI devices. Signed-off-by: Alexandre Bounine Cc: Kumar Gala Cc: Matt Porter Cc: Li Yang Cc: Thomas Moll Cc: Micha Nelissen Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 388b78adc9899f0299128610f566051d0b1a57f6 Author: Alexandre Bounine Date: Wed Mar 23 16:43:03 2011 -0700 rapidio: modify configuration to support PCI-SRIO controller 1. Add an option to include RapidIO support if the PCI is available. 2. Add FSL_RIO configuration option to enable controller selection. 3. Add RapidIO support option into x86 and MIPS architectures. Signed-off-by: Alexandre Bounine Acked-by: Kumar Gala Cc: Matt Porter Cc: Li Yang Cc: Thomas Moll Cc: Micha Nelissen Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8f0626989c85b3d8bd67eff29d9dd3d14a5e71f Author: Alexandre Bounine Date: Wed Mar 23 16:43:02 2011 -0700 rapidio: add architecture specific callbacks This set of patches eliminates RapidIO dependency on PowerPC architecture and makes it available to other architectures (x86 and MIPS). It also enables support of new platform independent RapidIO controllers such as PCI-to-SRIO and PCI Express-to-SRIO. This patch: Extend number of mport callback functions to eliminate direct linking of architecture specific mport operations. Signed-off-by: Alexandre Bounine Cc: Kumar Gala Cc: Matt Porter Cc: Li Yang Cc: Thomas Moll Cc: Micha Nelissen Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e15b4d687f3015aa7953687e5a80f1cc4ba9b736 Author: Alexandre Bounine Date: Wed Mar 23 16:43:00 2011 -0700 rapidio: add RapidIO documentation Add RapidIO documentation files as it was discussed earlier (see thread http://marc.info/?l=linux-kernel&m=129202338918062&w=2) Signed-off-by: Alexandre Bounine Cc: Kumar Gala Cc: Matt Porter Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd8b974fad4f993bde74d820f83bd0a88ad82491 Author: Alexandre Bounine Date: Wed Mar 23 16:42:59 2011 -0700 rapidio: add new sysfs attributes Add new sysfs attributes. 1. Routing information required to to reach the RIO device: destid - device destination ID (real for for endpoint, route for switch) hopcount - hopcount for maintenance requests (switches only) 2. device linking information: lprev - name of device that precedes the given device in the enumeration or discovery order (displayed along with of the port to which it is attached). lnext - names of devices (with corresponding port numbers) that are attached to the given device as next in the enumeration or discovery order (switches only) Signed-off-by: Alexandre Bounine Cc: Kumar Gala Cc: Matt Porter Cc: Li Yang Cc: Thomas Moll Cc: Micha Nelissen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfaf346cb2741ca648d83527df173b759381e607 Author: Changli Gao Date: Wed Mar 23 16:42:58 2011 -0700 drivers/char/mem.c: clean up the code Reduce the lines of code and simplify the logic. Signed-off-by: Changli Gao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 115bcd156a7c4b4dad950f3bd2e4d023688c2ee7 Author: Julia Lawall Date: Wed Mar 23 16:42:57 2011 -0700 drivers/staging/tty/specialix.c: convert func_enter to func_exit Convert calls to func_enter on leaving a function to func_exit. The semantic patch that fixes this problem is as follows: (http://coccinelle.lip6.fr/) // @@ @@ - func_enter(); + func_exit(); return...; // Signed-off-by: Julia Lawall Cc: Roger Wolff Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9d691f584bd012d235c35279c043a2ccd23d7d7 Author: Julia Lawall Date: Wed Mar 23 16:42:56 2011 -0700 drivers/tty/bfin_jtag_comm.c: avoid calling put_tty_driver on NULL put_tty_driver calls tty_driver_kref_put on its argument, and then tty_driver_kref_put calls kref_put on the address of a field of this argument. kref_put checks for NULL, but in this case the field is likely to have some offset and so the result of taking its address will not be NULL. Labels are added to be able to skip over the call to put_tty_driver when the argument will be NULL. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression *x; @@ *if (x == NULL) { ... * put_tty_driver(x); ... return ...; } // Signed-off-by: Julia Lawall Cc: Torben Hohn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73210a135b9dd53ba59beb4ced5a55633ae65b2f Author: Niranjana Vishwanathapura Date: Wed Mar 23 16:42:55 2011 -0700 drivers/char: add MSM smd_pkt driver Add smd_pkt driver which provides device interface to smd packet ports. Signed-off-by: Niranjana Vishwanathapura Cc: Brian Swetland Cc: Greg KH Cc: Alan Cox Cc: David Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dcf334c44d99cd08515f4fc5cc9075abd92b2ff Author: Sergey Senozhatsky Date: Wed Mar 23 16:42:54 2011 -0700 drivers/char/ipmi/ipmi_si_intf.c: fix cleanup_one_si section mismatch commit d2478521afc2022 ("char/ipmi: fix OOPS caused by pnp_unregister_driver on unregistered driver") introduced a section mismatch by calling __exit cleanup_ipmi_si from __devinit init_ipmi_si. Remove __exit annotation from cleanup_ipmi_si. Signed-off-by: Sergey Senozhatsky Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5883f57ca0008ffc93e09cbb9847a1928e50c6f3 Author: Kees Cook Date: Wed Mar 23 16:42:53 2011 -0700 proc: protect mm start_code/end_code in /proc/pid/stat While mm->start_stack was protected from cross-uid viewing (commit f83ce3e6b02d5 ("proc: avoid information leaks to non-privileged processes")), the start_code and end_code values were not. This would allow the text location of a PIE binary to leak, defeating ASLR. Note that the value "1" is used instead of "0" for a protected value since "ps", "killall", and likely other readers of /proc/pid/stat, take start_code of "0" to mean a kernel thread and will misbehave. Thanks to Brad Spengler for pointing this out. Addresses CVE-2011-0726 Signed-off-by: Kees Cook Cc: Cc: Alexey Dobriyan Cc: David Howells Cc: Eugene Teo Cc: Martin Schwidefsky Cc: Brad Spengler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 312ec7e50c4d3f40b3762af651d1aa79a67f556a Author: Alexey Dobriyan Date: Wed Mar 23 16:42:52 2011 -0700 proc: make struct proc_dir_entry::namelen unsigned int 1. namelen is declared "unsigned short" which hints for "maybe space savings". Indeed in 2.4 struct proc_dir_entry looked like: struct proc_dir_entry { unsigned short low_ino; unsigned short namelen; Now, low_ino is "unsigned int", all savings were gone for a long time. "struct proc_dir_entry" is not that countless to worry about it's size, anyway. 2. converting from unsigned short to int/unsigned int can only create problems, we better play it safe. Space is not really conserved, because of natural alignment for the next field. sizeof(struct proc_dir_entry) remains the same. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc3d8767b2b6de955579852d7a150f1734265eaf Author: Jovi Zhang Date: Wed Mar 23 16:42:51 2011 -0700 procfs: fix some wrong error code usage [root@wei 1]# cat /proc/1/mem cat: /proc/1/mem: No such process error code -ESRCH is wrong in this situation. Return -EPERM instead. Signed-off-by: Jovi Zhang Reviewed-by: KOSAKI Motohiro Cc: Alexey Dobriyan Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0db0c01b53a1a421513f91573241aabafb87802a Author: Aaro Koskinen Date: Wed Mar 23 16:42:50 2011 -0700 procfs: fix /proc//maps heap check The current code fails to print the "[heap]" marking if the heap is split into multiple mappings. Fix the check so that the marking is displayed in all possible cases: 1. vma matches exactly the heap 2. the heap vma is merged e.g. with bss 3. the heap vma is splitted e.g. due to locked pages Test cases. In all cases, the process should have mapping(s) with [heap] marking: (1) vma matches exactly the heap #include #include #include int main (void) { if (sbrk(4096) != (void *)-1) { printf("check /proc/%d/maps\n", (int)getpid()); while (1) sleep(1); } return 0; } # ./test1 check /proc/553/maps [1] + Stopped ./test1 # cat /proc/553/maps | head -4 00008000-00009000 r-xp 00000000 01:00 3113640 /test1 00010000-00011000 rw-p 00000000 01:00 3113640 /test1 00011000-00012000 rw-p 00000000 00:00 0 [heap] 4006f000-40070000 rw-p 00000000 00:00 0 (2) the heap vma is merged #include #include #include char foo[4096] = "foo"; char bar[4096]; int main (void) { if (sbrk(4096) != (void *)-1) { printf("check /proc/%d/maps\n", (int)getpid()); while (1) sleep(1); } return 0; } # ./test2 check /proc/556/maps [2] + Stopped ./test2 # cat /proc/556/maps | head -4 00008000-00009000 r-xp 00000000 01:00 3116312 /test2 00010000-00012000 rw-p 00000000 01:00 3116312 /test2 00012000-00014000 rw-p 00000000 00:00 0 [heap] 4004a000-4004b000 rw-p 00000000 00:00 0 (3) the heap vma is splitted (this fails without the patch) #include #include #include #include int main (void) { if ((sbrk(4096) != (void *)-1) && !mlockall(MCL_FUTURE) && (sbrk(4096) != (void *)-1)) { printf("check /proc/%d/maps\n", (int)getpid()); while (1) sleep(1); } return 0; } # ./test3 check /proc/559/maps [1] + Stopped ./test3 # cat /proc/559/maps|head -4 00008000-00009000 r-xp 00000000 01:00 3119108 /test3 00010000-00011000 rw-p 00000000 01:00 3119108 /test3 00011000-00012000 rw-p 00000000 00:00 0 [heap] 00012000-00013000 rw-p 00000000 00:00 0 [heap] It looks like the bug has been there forever, and since it only results in some information missing from a procfile, it does not fulfil the -stable "critical issue" criteria. Signed-off-by: Aaro Koskinen Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51e031496d50f87ff519a63cfd4fc2f415f03336 Author: Konstantin Khlebnikov Date: Wed Mar 23 16:42:48 2011 -0700 proc: hide kernel addresses via %pK in /proc//stack This file is readable for the task owner. Hide kernel addresses from unprivileged users, leave them function names and offsets. Signed-off-by: Konstantin Khlebnikov Acked-by: Kees Cook Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 523fb486bfd94e3a3b16a42bcb21b1959cf14df8 Author: Li Zefan Date: Wed Mar 23 16:42:48 2011 -0700 cpuset: hold callback_mutex in cpuset_post_clone() Chaning cpuset->mems/cpuset->cpus should be protected under callback_mutex. cpuset_clone() doesn't follow this rule. It's ok because it's called when creating and initializing a cgroup, but we'd better hold the lock to avoid subtil break in the future. Signed-off-by: Li Zefan Acked-by: Paul Menage Acked-by: David Rientjes Cc: Miao Xie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee24d3797780eee6ffe581a7b78d27896f9b494a Author: Li Zefan Date: Wed Mar 23 16:42:47 2011 -0700 cpuset: fix unchecked calls to NODEMASK_ALLOC() Those functions that use NODEMASK_ALLOC() can't propagate errno to users, but will fail silently. Fix it by using a static nodemask_t variable for each function, and those variables are protected by cgroup_mutex; [akpm@linux-foundation.org: fix comment spelling, strengthen cgroup_lock comment] Signed-off-by: Li Zefan Cc: Paul Menage Acked-by: David Rientjes Cc: Miao Xie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8163ca8afcac0fc54593fc60d1e1110edbd0eb2 Author: Li Zefan Date: Wed Mar 23 16:42:46 2011 -0700 cpuset: remove unneeded NODEMASK_ALLOC() in cpuset_attach() oldcs->mems_allowed is not modified during cpuset_attach(), so we don't have to copy it to a buffer allocated by NODEMASK_ALLOC(). Just pass it to cpuset_migrate_mm(). Signed-off-by: Li Zefan Cc: Paul Menage Acked-by: David Rientjes Cc: Miao Xie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9303e0c4814d2a6afca878cc35433291e862169c Author: Li Zefan Date: Wed Mar 23 16:42:45 2011 -0700 cpuset: remove unneeded NODEMASK_ALLOC() in cpuset_sprintf_memlist() It's not necessary to copy cpuset->mems_allowed to a buffer allocated by NODEMASK_ALLOC(). Just pass it to nodelist_scnprintf(). As spotted by Paul, a side effect is we fix a bug that the function can return -ENOMEM but the caller doesn't expect negative return value. Therefore change the return value of cpuset_sprintf_cpulist() and cpuset_sprintf_memlist() from int to size_t. Signed-off-by: Li Zefan Acked-by: Paul Menage Acked-by: David Rientjes Cc: Miao Xie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9434ad1552427fab49336e1a6e3ef121895b9d1 Author: David Rientjes Date: Wed Mar 23 16:42:44 2011 -0700 memcg: give current access to memory reserves if it's trying to die When a memcg is oom and current has already received a SIGKILL, then give it access to memory reserves with a higher scheduling priority so that it may quickly exit and free its memory. This is identical to the global oom killer and is done even before checking for panic_on_oom: a pending SIGKILL here while panic_on_oom is selected is guaranteed to have come from userspace; the thread only needs access to memory reserves to exit and thus we don't unnecessarily panic the machine until the kernel has no last resort to free memory. Signed-off-by: David Rientjes Cc: Balbir Singh Cc: Daisuke Nishimura Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a6475a4e162200f43855e2d42bbf55bcca1a9f2 Author: KAMEZAWA Hiroyuki Date: Wed Mar 23 16:42:42 2011 -0700 memcg: fix leak on wrong LRU with FUSE fs/fuse/dev.c::fuse_try_move_page() does (1) remove a page by ->steal() (2) re-add the page to page cache (3) link the page to LRU if it was not on LRU at (1) This implies the page is _on_ LRU when it's added to radix-tree. So, the page is added to memory cgroup while it's on LRU. because LRU is lazy and no one flushs it. This is the same behavior as SwapCache and needs special care as - remove page from LRU before overwrite pc->mem_cgroup. - add page to LRU after overwrite pc->mem_cgroup. And we need to taking care of pagevec. If PageLRU(page) is set before we add PCG_USED bit, the page will not be added to memcg's LRU (in short period). So, regardlress of PageLRU(page) value before commit_charge(), we need to check PageLRU(page) after commit_charge(). Addresses https://bugzilla.kernel.org/show_bug.cgi?id=30432 Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Johannes Weiner Acked-by: Daisuke Nishimura Cc: Miklos Szeredi Cc: Balbir Singh Reported-by: Daniel Poelzleithner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cfddb261555dd0c0529a5fb7cf8bc5b85ad95a5 Author: Michal Hocko Date: Wed Mar 23 16:42:41 2011 -0700 memcg: page_cgroup array is never stored on reserved pages KAMEZAWA Hiroyuki noted that free_pages_cgroup doesn't have to check for PageReserved because we never store the array on reserved pages (neither alloc_pages_exact nor vmalloc use those pages). So we can replace the check by a BUG_ON. Signed-off-by: Michal Hocko Acked-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dde79e005a769d800166687c9e00d50d93e411ff Author: Michal Hocko Date: Wed Mar 23 16:42:40 2011 -0700 page_cgroup: reduce allocation overhead for page_cgroup array for CONFIG_SPARSEMEM Currently we are allocating a single page_cgroup array per memory section (stored in mem_section->base) when CONFIG_SPARSEMEM is selected. This is correct but memory inefficient solution because the allocated memory (unless we fall back to vmalloc) is not kmalloc friendly: - 32b - 16384 entries (20B per entry) fit into 327680B so the 524288B slab cache is used - 32b with PAE - 131072 entries with 2621440B fit into 4194304B - 64b - 32768 entries (40B per entry) fit into 2097152 cache This is ~37% wasted space per memory section and it sumps up for the whole memory. On a x86_64 machine it is something like 6MB per 1GB of RAM. We can reduce the internal fragmentation by using alloc_pages_exact which allocates PAGE_SIZE aligned blocks so we will get down to <4kB wasted memory per section which is much better. We still need a fallback to vmalloc because we have no guarantees that we will have a continuous memory of that size (order-10) later on during the hotplug events. [hannes@cmpxchg.org: do not define unused free_page_cgroup() without memory hotplug] Signed-off-by: Michal Hocko Cc: Dave Hansen Acked-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Signed-off-by: Johannes Weiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4be4489feae6da890765cc1bdc1af5e4f8c4b75f Author: Andrew Morton Date: Wed Mar 23 16:42:39 2011 -0700 mm/memcontrol.c: suppress uninitialized-var warning with older gcc's mm/memcontrol.c: In function 'mem_cgroup_force_empty': mm/memcontrol.c:2280: warning: 'flags' may be used uninitialized in this function It's a false positive. Cc: Balbir Singh Cc: Daisuke Nishimura Cc: Greg Thelen Cc: Johannes Weiner Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a159cc9d7987cdb4853f8711f5f89e01cfffe42 Author: Johannes Weiner Date: Wed Mar 23 16:42:38 2011 -0700 memcg: use native word page statistics counters The statistic counters are in units of pages, there is no reason to make them 64-bit wide on 32-bit machines. Make them native words. Since they are signed, this leaves 31 bit on 32-bit machines, which can represent roughly 8TB assuming a page size of 4k. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Johannes Weiner Signed-off-by: Greg Thelen Acked-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9f8974f2f559b00c87ccfba67bca3903f913d50 Author: Johannes Weiner Date: Wed Mar 23 16:42:37 2011 -0700 memcg: break out event counters from other stats For increasing and decreasing per-cpu cgroup usage counters it makes sense to use signed types, as single per-cpu values might go negative during updates. But this is not the case for only-ever-increasing event counters. All the counters have been signed 64-bit so far, which was enough to count events even with the sign bit wasted. This patch: - divides s64 counters into signed usage counters and unsigned monotonically increasing event counters. - converts unsigned event counters into 'unsigned long' rather than 'u64'. This matches the type used by the /proc/vmstat event counters. The next patch narrows the signed usage counters type (on 32-bit CPUs, that is). Signed-off-by: Johannes Weiner Signed-off-by: Greg Thelen Acked-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ec99d6213b579a84c85ad37f2aa8ded4857c53c Author: Johannes Weiner Date: Wed Mar 23 16:42:36 2011 -0700 memcg: unify charge/uncharge quantities to units of pages There is no clear pattern when we pass a page count and when we pass a byte count that is a multiple of PAGE_SIZE. We never charge or uncharge subpage quantities, so convert it all to page counts. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ffd4ca7a2cdd7a18f0b499a4e9e0e7cf36ba018 Author: Johannes Weiner Date: Wed Mar 23 16:42:35 2011 -0700 memcg: convert uncharge batching from bytes to page granularity We never uncharge subpage quantities. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11c9ea4e80fc3be83485667204c68d0a732f3757 Author: Johannes Weiner Date: Wed Mar 23 16:42:34 2011 -0700 memcg: convert per-cpu stock from bytes to page granularity We never keep subpage quantities in the per-cpu stock. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7018b8d27e0c9aa2200e5b393e0fe9093c6565c Author: Johannes Weiner Date: Wed Mar 23 16:42:33 2011 -0700 memcg: keep only one charge cancelling function We have two charge cancelling functions: one takes a page count, the other a page size. The second one just divides the parameter by PAGE_SIZE and then calls the first one. This is trivial, no need for an extra function. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf1ff2635a5fda207fc870df348bfc766e8dcd4d Author: Johannes Weiner Date: Wed Mar 23 16:42:32 2011 -0700 memcg: remove memcg->reclaim_param_lock The reclaim_param_lock is only taken around single reads and writes to integer variables and is thus superfluous. Drop it. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dc03de1b29901b61cb27e4cab44a7f578dc0fc9 Author: Johannes Weiner Date: Wed Mar 23 16:42:31 2011 -0700 memcg: charged pages always have valid per-memcg zone info page_cgroup_zoneinfo() will never return NULL for a charged page, remove the check for it in mem_cgroup_get_reclaim_stat_from_page(). Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b3ae58efca06623c197fd6d91ded4aa3a8fe039 Author: Johannes Weiner Date: Wed Mar 23 16:42:30 2011 -0700 memcg: remove direct page_cgroup-to-page pointer In struct page_cgroup, we have a full word for flags but only a few are reserved. Use the remaining upper bits to encode, depending on configuration, the node or the section, to enable page_cgroup-to-page lookups without a direct pointer. This saves a full word for every page in a system with memory cgroups enabled. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5564e88ba6fd2f6dcd83a592771810cd84b5ae80 Author: Johannes Weiner Date: Wed Mar 23 16:42:29 2011 -0700 memcg: condense page_cgroup-to-page lookup points The per-cgroup LRU lists string up 'struct page_cgroup's. To get from those structures to the page they represent, a lookup is required. Currently, the lookup is done through a direct pointer in struct page_cgroup, so a lot of functions down the callchain do this lookup by themselves instead of receiving the page pointer from their callers. The next patch removes this pointer, however, and the lookup is no longer that straight-forward. In preparation for that, this patch only leaves the non-optional lookups when coming directly from the LRU list and passes the page down the stack. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de3638d9cdc89ac899225996b8dcedbcbc53bdd2 Author: Johannes Weiner Date: Wed Mar 23 16:42:28 2011 -0700 memcg: fold __mem_cgroup_move_account into caller It is one logical function, no need to have it split up. Also, get rid of some checks from the inner function that ensured the sanity of the outer function. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Acked-by: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97a6c37b34f46feed2544bd40891ee6dd0fd1554 Author: Johannes Weiner Date: Wed Mar 23 16:42:27 2011 -0700 memcg: change page_cgroup_zoneinfo signature Instead of passing a whole struct page_cgroup to this function, let it take only what it really needs from it: the struct mem_cgroup and the page. This has the advantage that reading pc->mem_cgroup is now done at the same place where the ordering rules for this pointer are enforced and explained. It is also in preparation for removing the pc->page backpointer. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad324e94475a04cfcdfdb11ad20f8ea81268e411 Author: Johannes Weiner Date: Wed Mar 23 16:42:26 2011 -0700 memcg: no uncharged pages reach page_cgroup_zoneinfo This patch series removes the direct page pointer from struct page_cgroup, which saves 20% of per-page memcg memory overhead (Fedora and Ubuntu enable memcg per default, openSUSE apparently too). The node id or section number is encoded in the remaining free bits of pc->flags which allows calculating the corresponding page without the extra pointer. I ran, what I think is, a worst-case microbenchmark that just cats a large sparse file to /dev/null, because it means that walking the LRU list on behalf of per-cgroup reclaim and looking up pages from page_cgroups is happening constantly and at a high rate. But it made no measurable difference. A profile reported a 0.11% share of the new lookup_cgroup_page() function in this benchmark. This patch: All callsites check PCG_USED before passing pc->mem_cgroup, so the latter is never NULL. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Acked-by: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f212ad7cf9c73f8a7fa160e223dcb3f074441a72 Author: Daisuke Nishimura Date: Wed Mar 23 16:42:25 2011 -0700 memcg: add memcg sanity checks at allocating and freeing pages Add checks at allocating or freeing a page whether the page is used (iow, charged) from the view point of memcg. This check may be useful in debugging a problem and we did similar checks before the commit 52d4b9ac(memcg: allocate all page_cgroup at boot). This patch adds some overheads at allocating or freeing memory, so it's enabled only when CONFIG_DEBUG_VM is enabled. Signed-off-by: Daisuke Nishimura Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af4a662144884a7dbb19acbef70878b3b955f928 Author: Johannes Weiner Date: Wed Mar 23 16:42:24 2011 -0700 memcg: remove NULL check from lookup_page_cgroup() result The page_cgroup array is set up before even fork is initialized. I seriously doubt that this code executes before the array is alloc'd. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c14f35c70e068392ccae0b2d6f755baea5eed4d6 Author: Johannes Weiner Date: Wed Mar 23 16:42:23 2011 -0700 memcg: remove impossible conditional when committing No callsite ever passes a NULL pointer for a struct mem_cgroup * to the committing function. There is no need to check for it. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3403968d7a7dc373901cad0cad56b3afcb09cc50 Author: Johannes Weiner Date: Wed Mar 23 16:42:22 2011 -0700 memcg: remove unused page flag bitfield defines These definitions have been unused since '4b3bde4 memcg: remove the overhead associated with the root cgroup'. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d11ea9f163a14920487bdda77461e64d600fd48 Author: Johannes Weiner Date: Wed Mar 23 16:42:21 2011 -0700 memcg: simplify the way memory limits are checked Since transparent huge pages, checking whether memory cgroups are below their limits is no longer enough, but the actual amount of chargeable space is important. To not have more than one limit-checking interface, replace memory_cgroup_check_under_limit() and memory_cgroup_check_margin() with a single memory_cgroup_margin() that returns the chargeable space and leaves the comparison to the callsite. Soft limits are now checked the other way round, by using the already existing function that returns the amount by which soft limits are exceeded: res_counter_soft_limit_excess(). Also remove all the corresponding functions on the res_counter side that are now no longer used. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Acked-by: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7c6167848fa36e32f1874b95c1edc02881cd040 Author: Johannes Weiner Date: Wed Mar 23 16:42:20 2011 -0700 memcg: soft limit reclaim should end at limit not below Soft limit reclaim continues until the usage is below the current soft limit, but the documented semantics are actually that soft limit reclaim will push usage back until the soft limits are met again. Signed-off-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Acked-by: Balbir Singh Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56039efa18f2530fc23e8ef19e716b65ee2a1d1e Author: KAMEZAWA Hiroyuki Date: Wed Mar 23 16:42:19 2011 -0700 memcg: fix ugly initialization of return value is in caller Remove initialization of vaiable in caller of memory cgroup function. Actually, it's return value of memcg function but it's initialized in caller. Some memory cgroup uses following style to bring the result of start function to the end function for avoiding races. mem_cgroup_start_A(&(*ptr)) /* Something very complicated can happen here. */ mem_cgroup_end_A(*ptr) In some calls, *ptr should be initialized to NULL be caller. But it's ugly. This patch fixes that *ptr is initialized by _start function. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: Johannes Weiner Acked-by: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c191cd01a935e5b53ef43c9403c771bb7a32b60 Author: KAMEZAWA Hiroyuki Date: Wed Mar 23 16:42:18 2011 -0700 memcg: res_counter_read_u64(): fix potential races on 32-bit machines res_counter_read_u64 reads u64 value without lock. It's dangerous in a 32bit environment. Add locking. Signed-off-by: KAMEZAWA Hiroyuki Cc: Greg Thelen Cc: Johannes Weiner Cc: David Rientjes Cc: KOSAKI Motohiro Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61f2e7b0f474225b4226772830ae4b29a3a21f8d Author: Akinobu Mita Date: Wed Mar 23 16:42:16 2011 -0700 bitops: remove minix bitops from asm/bitops.h minix bit operations are only used by minix filesystem and useless by other modules. Because byte order of inode and block bitmaps is different on each architecture like below: m68k: big-endian 16bit indexed bitmaps h8300, microblaze, s390, sparc, m68knommu: big-endian 32 or 64bit indexed bitmaps m32r, mips, sh, xtensa: big-endian 32 or 64bit indexed bitmaps for big-endian mode little-endian bitmaps for little-endian mode Others: little-endian bitmaps In order to move minix bit operations from asm/bitops.h to architecture independent code in minix filesystem, this provides two config options. CONFIG_MINIX_FS_BIG_ENDIAN_16BIT_INDEXED is only selected by m68k. CONFIG_MINIX_FS_NATIVE_ENDIAN is selected by the architectures which use native byte order bitmaps (h8300, microblaze, s390, sparc, m68knommu, m32r, mips, sh, xtensa). The architectures which always use little-endian bitmaps do not select these options. Finally, we can remove minix bit operations from asm/bitops.h for all architectures. Signed-off-by: Akinobu Mita Acked-by: Arnd Bergmann Acked-by: Greg Ungerer Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Andreas Schwab Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Yoshinori Sato Cc: Michal Simek Cc: "David S. Miller" Cc: Hirokazu Takata Acked-by: Ralf Baechle Acked-by: Paul Mundt Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fca5af7860f87eb2cd706c2d7dda4ad03230a07 Author: Akinobu Mita Date: Wed Mar 23 16:42:15 2011 -0700 m68k: remove inline asm from minix_find_first_zero_bit As a preparation for moving minix bit operations from asm/bitops.h to architecture independent code in minix filesystem, this removes inline asm from minix_find_first_zero_bit() for m68k. Signed-off-by: Akinobu Mita Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f312eff8164879e04923d41e9dd23e7850937d85 Author: Akinobu Mita Date: Wed Mar 23 16:42:14 2011 -0700 bitops: remove ext2 non-atomic bitops from asm/bitops.h As the result of conversions, there are no users of ext2 non-atomic bit operations except for ext2 filesystem itself. Now we can put them into architecture independent code in ext2 filesystem, and remove from asm/bitops.h for all architectures. Signed-off-by: Akinobu Mita Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb5cda3d706f44e5696533c9a7353c458f2871e0 Author: Akinobu Mita Date: Wed Mar 23 16:42:13 2011 -0700 dm: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Cc: Alasdair Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b33aff368def952be78102c0935ebd219f9a748 Author: Akinobu Mita Date: Wed Mar 23 16:42:13 2011 -0700 md: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Acked-by: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cdc7125c364b2baad8aba69c058b26d3dca5f52 Author: Akinobu Mita Date: Wed Mar 23 16:42:11 2011 -0700 ufs: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ad1e1e405fb2c1ff35f2ec67cc6ba4c6765f192 Author: Akinobu Mita Date: Wed Mar 23 16:42:11 2011 -0700 udf: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Acked-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9b9144a5336f0d85428e2870e1010641f27b3f4 Author: Akinobu Mita Date: Wed Mar 23 16:42:10 2011 -0700 reiserfs: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a49ebbabb084d345991b72818a119616431416f2 Author: Akinobu Mita Date: Wed Mar 23 16:42:08 2011 -0700 nilfs2: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Acked-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4354d0d6812ad6729ac33d3c8bc64585cfdb890 Author: Akinobu Mita Date: Wed Mar 23 16:42:08 2011 -0700 ocfs2: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Acked-by: Joel Becker Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50e0168cc3406fc1a04d57eb08f500a173d1660d Author: Akinobu Mita Date: Wed Mar 23 16:42:07 2011 -0700 ext4: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Acked-by: "Theodore Ts'o" Cc: Andreas Dilger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0795ccea24714c790187e3d4f23c8e5be515f42d Author: Akinobu Mita Date: Wed Mar 23 16:42:06 2011 -0700 ext3: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Acked-by: Jan Kara Cc: Andreas Dilger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1dc1c81b9d1c823f2a529b9b9cf8bf5dacbce6a Author: Akinobu Mita Date: Wed Mar 23 16:42:05 2011 -0700 rds: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Cc: Andy Grover Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd7e48c5de223f400bbfe52dc531a70f7b668e8c Author: Akinobu Mita Date: Wed Mar 23 16:42:04 2011 -0700 kvm: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Cc: Avi Kivity Cc: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c56530055a7c16eed03d31bedd0a49976923f8cf Author: Akinobu Mita Date: Wed Mar 23 16:42:04 2011 -0700 asm-generic: use little-endian bitops As a preparation for removing ext2 non-atomic bit operations from asm/bitops.h. This converts ext2 non-atomic bit operations to little-endian bit operations. Signed-off-by: Akinobu Mita Acked-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 861b5ae7cde96ca081914e21dedfa7e8a38da622 Author: Akinobu Mita Date: Wed Mar 23 16:42:02 2011 -0700 bitops: introduce little-endian bitops for most architectures Introduce little-endian bit operations to the big-endian architectures which do not have native little-endian bit operations and the little-endian architectures. (alpha, avr32, blackfin, cris, frv, h8300, ia64, m32r, mips, mn10300, parisc, sh, sparc, tile, x86, xtensa) These architectures can just include generic implementation (asm-generic/bitops/le.h). Signed-off-by: Akinobu Mita Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: "Luck, Tony" Cc: Ralf Baechle Cc: Kyle McMartin Cc: Matthew Wilcox Cc: Grant Grundler Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Hirokazu Takata Cc: "David S. Miller" Cc: Chris Zankel Cc: Ingo Molnar Cc: Thomas Gleixner Acked-by: Hans-Christian Egtvedt Acked-by: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1e6ca7a501f0139e5ec2a01f8420eeb21c97a52 Author: Akinobu Mita Date: Wed Mar 23 16:42:00 2011 -0700 m68knommu: introduce little-endian bitops Introduce little-endian bit operations by renaming native ext2 bit operations. The ext2 bit operations are kept as wrapper macros using little-endian bit operations to maintain bisectability until the conversions are finished. Signed-off-by: Akinobu Mita Acked-by: Greg Ungerer Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Andreas Schwab Cc: Arnd Bergmann Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0664996b7c2fdb1b7f90954469cc242274abd7db Author: Akinobu Mita Date: Wed Mar 23 16:41:59 2011 -0700 bitops: introduce CONFIG_GENERIC_FIND_BIT_LE This introduces CONFIG_GENERIC_FIND_BIT_LE to tell whether to use generic implementation of find_*_bit_le() in lib/find_next_bit.c or not. For now we select CONFIG_GENERIC_FIND_BIT_LE for all architectures which enable CONFIG_GENERIC_FIND_NEXT_BIT. But m68knommu wants to define own faster find_next_zero_bit_le() and continues using generic find_next_{,zero_}bit(). (CONFIG_GENERIC_FIND_NEXT_BIT and !CONFIG_GENERIC_FIND_BIT_LE) Signed-off-by: Akinobu Mita Cc: Greg Ungerer Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f5527fe7e0fb50556b97b8addbe3832985f793e Author: Akinobu Mita Date: Wed Mar 23 16:41:58 2011 -0700 m68k: introduce little-endian bitops Introduce little-endian bit operations by renaming native ext2 bit operations and changing find_*_bit_le() to take a "void *". The ext2 bit operations are kept as wrapper macros using little-endian bit operations to maintain bisectability until the conversions are finished. Signed-off-by: Akinobu Mita Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Andreas Schwab Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6b57e322f85f9d69db15ca112ee33cab33041b8 Author: Akinobu Mita Date: Wed Mar 23 16:41:57 2011 -0700 arm: introduce little-endian bitops Introduce little-endian bit operations by renaming native ext2 bit operations. The ext2 and minix bit operations are kept as wrapper macros using little-endian bit operations to maintain bisectability until the conversions are finished. Signed-off-by: Akinobu Mita Cc: Russell King Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50b9b475c5b3e6649c22e1d39ab3ced3dbf21758 Author: Akinobu Mita Date: Wed Mar 23 16:41:57 2011 -0700 s390: introduce little-endian bitops Introduce little-endian bit operations by renaming native ext2 bit operations. The ext2 bit operations are kept as wrapper macros using little-endian bit operations to maintain bisectability until the conversions are finished. Signed-off-by: Akinobu Mita Cc: Arnd Bergmann Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f57d7ff1b8798eccbc778552df34ed9f154ecebb Author: Akinobu Mita Date: Wed Mar 23 16:41:56 2011 -0700 powerpc: introduce little-endian bitops Introduce little-endian bit operations by renaming existing powerpc native little-endian bit operations and changing them to take any pointer types. Signed-off-by: Akinobu Mita Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a56560b3b233238e85205d4e8d7bded904ac2306 Author: Akinobu Mita Date: Wed Mar 23 16:41:50 2011 -0700 asm-generic: change little-endian bitops to take any pointer types This makes the little-endian bitops take any pointer types by changing the prototypes and adding casts in the preprocessor macros. That would seem to at least make all the filesystem code happier, and they can continue to do just something like #define ext2_set_bit __test_and_set_bit_le (or whatever the exact sequence ends up being). Signed-off-by: Akinobu Mita Cc: Arnd Bergmann Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: "Luck, Tony" Cc: Ralf Baechle Cc: Kyle McMartin Cc: Matthew Wilcox Cc: Grant Grundler Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Hirokazu Takata Cc: "David S. Miller" Cc: Chris Zankel Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Hans-Christian Egtvedt Cc: "H. Peter Anvin" Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4945b9ed472e8796e352f10df9dbc2841ba7b61 Author: Akinobu Mita Date: Wed Mar 23 16:41:47 2011 -0700 asm-generic: rename generic little-endian bitops functions As a preparation for providing little-endian bitops for all architectures, This renames generic implementation of little-endian bitops. (remove "generic_" prefix and postfix "_le") s/generic_find_next_le_bit/find_next_bit_le/ s/generic_find_next_zero_le_bit/find_next_zero_bit_le/ s/generic_find_first_zero_le_bit/find_first_zero_bit_le/ s/generic___test_and_set_le_bit/__test_and_set_bit_le/ s/generic___test_and_clear_le_bit/__test_and_clear_bit_le/ s/generic_test_le_bit/test_bit_le/ s/generic___set_le_bit/__set_bit_le/ s/generic___clear_le_bit/__clear_bit_le/ s/generic_test_and_set_le_bit/test_and_set_bit_le/ s/generic_test_and_clear_le_bit/test_and_clear_bit_le/ Signed-off-by: Akinobu Mita Acked-by: Arnd Bergmann Acked-by: Hans-Christian Egtvedt Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Andreas Schwab Cc: Greg Ungerer Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63ab595fb6b34234f116f05f95dc752dd5f8affb Author: Akinobu Mita Date: Wed Mar 23 16:41:46 2011 -0700 bitops: merge little and big endian definisions in asm-generic/bitops/le.h This patch series introduces little-endian bit operations in asm/bitops.h for all architectures and converts all ext2 non-atomic and minix bit operations to use little-endian bit operations. It enables us to remove ext2 non-atomic and minix bit operations from asm/bitops.h. The reason they should be removed from asm/bitops.h is as follows: For ext2 non-atomic bit operations, they are used for little-endian byte order bitmap access by some filesystems and modules. But using ext2_*() functions on a module other than ext2 filesystem makes some feel strange. For minix bit operations, they are only used by minix filesystem and are useless by other modules. Because byte order of inode and block bitmap is This patch: In order to make the forthcoming changes smaller, this merges macro definisions in asm-generic/bitops/le.h for big-endian and little-endian as much as possible. This also removes unused BITOP_WORD macro. Signed-off-by: Akinobu Mita Acked-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12ce22423abacca70bf1dfbcb8543b3e2b74aad4 Author: Akinobu Mita Date: Wed Mar 23 16:41:45 2011 -0700 rds: stop including asm-generic/bitops/le.h directly asm-generic/bitops/le.h is only intended to be included directly from asm-generic/bitops/ext2-non-atomic.h or asm-generic/bitops/minix-le.h which implements generic ext2 or minix bit operations. This stops including asm-generic/bitops/le.h directly and use ext2 non-atomic bit operations instead. It seems odd to use ext2_*_bit() on rds, but it will replaced with __{set,clear,test}_bit_le() after introducing little endian bit operations for all architectures. This indirect step is necessary to maintain bisectability for some architectures which have their own little-endian bit operations. Signed-off-by: Akinobu Mita Cc: Andy Grover Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5140a357ea77527f4a93c5846217417658fdb35d Author: Akinobu Mita Date: Wed Mar 23 16:41:44 2011 -0700 kvm: stop including asm-generic/bitops/le.h directly asm-generic/bitops/le.h is only intended to be included directly from asm-generic/bitops/ext2-non-atomic.h or asm-generic/bitops/minix-le.h which implements generic ext2 or minix bit operations. This stops including asm-generic/bitops/le.h directly and use ext2 non-atomic bit operations instead. It seems odd to use ext2_set_bit() on kvm, but it will replaced with __set_bit_le() after introducing little endian bit operations for all architectures. This indirect step is necessary to maintain bisectability for some architectures which have their own little-endian bit operations. Signed-off-by: Akinobu Mita Cc: Avi Kivity Cc: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 135a9fcf45f8d41b4ab008114792f4f6c6572675 Author: Andrew Morton Date: Wed Mar 23 16:41:43 2011 -0700 fs/adfs/adfs.h: fix unsigned comparison fs/adfs/adfs.h: In function 'append_filetype_suffix': fs/adfs/adfs.h:115: warning: comparison is always false due to limited range of data type Reported-by: Geert Uytterhoeven Cc: Stuart Swales Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f48fea035b439fa0c75138d0a113ef409dc9caa0 Author: Luck, Tony Date: Wed Mar 23 16:41:43 2011 -0700 ia64: fix build breakage in asm/thread_info.h In commit 504f52b5439aaf26d3e2c1d45ec10fce38c8dd27 mm: NUMA aware alloc_task_struct_node() Eric Dumazet forgot a "\". Add it. Signed-off-by: Tony Luck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 968b503e69a6b90aa4a3b9162960f605b6abd821 Author: Chris Wilson Date: Wed Mar 23 18:16:55 2011 +0000 Revert "drm/i915: Don't save/restore hardware status page address register" This reverts commit a7a75c8f70d6f6a2f16c9f627f938bbee2d32718. There are two different variations on how Intel hardware addresses the "Hardware Status Page". One as a location in physical memory and the other as an offset into the virtual memory of the GPU, used in more recent chipsets. (The HWS itself is a cacheable region of memory which the GPU can write to without requiring CPU synchronisation, used for updating various details of hardware state, such as the position of the GPU head in the ringbuffer, the last breadcrumb seqno, etc). These two types of addresses were updated in different locations of code - one inline with the ringbuffer initialisation, and the other during device initialisation. (The HWS page is logically associated with the rings, and there is one HWS page per ring.) During resume, only the ringbuffers were being re-initialised along with the virtual HWS page, leaving the older physical address HWS untouched. This then caused a hang on the older gen3/4 (915GM, 945GM, 965GM) the first time we tried to synchronise the GPU as the breadcrumbs were never being updated. Reported-and-tested-by: Linus Torvalds Reported-by: Jan Niehusmann Reported-by: Justin P. Mattock Reported-and-tested-by: Michael "brot" Groh Cc: Zhenyu Wang Signed-off-by: Chris Wilson Signed-off-by: Linus Torvalds commit 8c64b4cc0201cf05b218ea3271a2abb4f86acb7b Merge: e6937ee d88d6b0 Author: David S. Miller Date: Wed Mar 23 15:56:02 2011 -0700 Merge branch 'sfc-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6 commit 60e4b10c5a27182bc8ce7435050a17cb61c94d00 Author: Arnaldo Carvalho de Melo Date: Tue Mar 22 15:42:14 2011 -0300 perf symbols: Look at .dynsym again if .symtab not found The original intent of the code was to repeat the search with want_symtab = 0. But as the code stands now, we never hit the "default" case of the switch statement. Which means we never repeat the search. Tested-by: Srikar Dronamraju Reported-by: Arun Sharma Reported-by: Srikar Dronamraju Cc: Dave Martin Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit b25114817a73bbd2b84ce9dba02ee1ef8989a947 Author: Arnaldo Carvalho de Melo Date: Tue Mar 22 13:36:45 2011 -0300 perf build-id: Add quirk to deal with perf.data file format breakage The a1645ce1 changeset: "perf: 'perf kvm' tool for monitoring guest performance from host" Added a field to struct build_id_event that broke the file format. Since the kernel build-id is the first entry, process the table using the old format if the well known '[kernel.kallsyms]' string for the kernel build-id has the first 4 characters chopped off (where the pid_t sits). Reported-by: Han Pingtian Cc: Avi Kivity Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Zhang Yanmin Cc: stable@kernel.org LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 9e69c210822c4035708a6111567c96364ca244d5 Author: Arnaldo Carvalho de Melo Date: Tue Mar 15 15:44:01 2011 -0300 perf session: Pass evsel in event_ops->sample() Resolving the sample->id to an evsel since the most advanced tools, report and annotate, and the others will too when they evolve to properly support multi-event perf.data files. Good also because it does an extra validation, checking that the ID is valid when present. When that is not the case, the overhead is just a branch + function call (perf_evlist__id2evsel). Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 20b67dddcc5f29d3d0c900225d85e0ac655bc69d Author: Takashi Iwai Date: Wed Mar 23 22:54:32 2011 +0100 ALSA: hda - Fix SPDIF out regression on ALC889 The commit 5a8cfb4e8ae317d283f84122ed20faa069c5e0c4 ALSA: hda - Use ALC_INIT_DEFAULT for really default initialization changed to use the default initialization method for ALC889, but this caused a regression on SPDIF output on some machines. This seems due to the COEF setup included in the default init procedure. For making SPDIF working again, the COEF-setup has to be avoided for the id 0889. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=24342 Cc: Signed-off-by: Takashi Iwai commit cb6f4b55f5907528d8a1a927b850c9eb04d4ef90 Author: Keith A. Milner Date: Mon Mar 21 20:15:08 2011 +0000 ALSA: usb-audio - Support for Boss JS-8 Jam Station Signed-off-by: Keith A. Milner Signed-off-by: Takashi Iwai commit e19869204fca4ae28b6e4d8f5e20849e9f7b18bd Author: Clemens Ladisch Date: Thu Feb 17 14:26:51 2011 +0100 ALSA: usb-audio: add Cakewalk UM-1G support Add a quirk for the Cakewalk UM-1G USB MIDI interface in "advanced driver" mode. (It already works in standard mode.) Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 4d00135a680727f6c3be78f8befaac009030e4df Author: Dan Rosenberg Date: Wed Mar 23 11:42:57 2011 -0400 sound/oss/opl3: validate voice and channel indexes User-controllable indexes for voice and channel values may cause reading and writing beyond the bounds of their respective arrays, leading to potentially exploitable memory corruption. Validate these indexes. Signed-off-by: Dan Rosenberg Cc: stable@kernel.org Signed-off-by: Takashi Iwai commit b769f49463711205d57286e64cf535ed4daf59e9 Author: Dan Rosenberg Date: Wed Mar 23 10:53:41 2011 -0400 sound/oss: remove offset from load_patch callbacks Was: [PATCH] sound/oss/midi_synth: prevent underflow, use of uninitialized value, and signedness issue The offset passed to midi_synth_load_patch() can be essentially arbitrary. If it's greater than the header length, this will result in a copy_from_user(dst, src, negative_val). While this will just return -EFAULT on x86, on other architectures this may cause memory corruption. Additionally, the length field of the sysex_info structure may not be initialized prior to its use. Finally, a signed comparison may result in an unintentionally large loop. On suggestion by Takashi Iwai, version two removes the offset argument from the load_patch callbacks entirely, which also resolves similar issues in opl3. Compile tested only. v3 adjusts comments and hopefully gets copy offsets right. Signed-off-by: Dan Rosenberg Signed-off-by: Takashi Iwai commit d47d81c0e9abdc3c88653fabff5beae82c949b09 Author: Rafael J. Wysocki Date: Wed Mar 23 22:16:41 2011 +0100 Introduce ARCH_NO_SYSDEV_OPS config option (v2) Introduce Kconfig option allowing architectures where sysdev operations used during system suspend, resume and shutdown have been completely replaced with struct sycore_ops operations to avoid building sysdev code that will never be used. Make callbacks in struct sys_device and struct sysdev_driver depend on ARCH_NO_SYSDEV_OPS to allows us to verify if all of the references have been actually removed from the code the given architecture depends on. Make x86 select ARCH_NO_SYSDEV_OPS. Signed-off-by: Rafael J. Wysocki commit e00e56dfd3cf1d209ce630a2b440c91e4a30bbd3 Author: Rafael J. Wysocki Date: Wed Mar 23 22:16:32 2011 +0100 cpufreq: Use syscore_ops for boot CPU suspend/resume (v2) The cpufreq subsystem uses sysdev suspend and resume for executing cpufreq_suspend() and cpufreq_resume(), respectively, during system suspend, after interrupts have been switched off on the boot CPU, and during system resume, while interrupts are still off on the boot CPU. In both cases the other CPUs are off-line at the relevant point (either they have been switched off via CPU hotplug during suspend, or they haven't been switched on yet during resume). For this reason, although it may seem that cpufreq_suspend() and cpufreq_resume() are executed for all CPUs in the system, they are only called for the boot CPU in fact, which is quite confusing. To remove the confusion and to prepare for elimiating sysdev suspend and resume operations from the kernel enirely, convernt cpufreq to using a struct syscore_ops object for the boot CPU suspend and resume and rename the callbacks so that their names reflect their purpose. In addition, put some explanatory remarks into their kerneldoc comments. Signed-off-by: Rafael J. Wysocki commit fb3600cc50302c9577b76838fcac1ee78828007d Author: Rafael J. Wysocki Date: Wed Mar 23 22:16:23 2011 +0100 KVM: Use syscore_ops instead of sysdev class and sysdev KVM uses a sysdev class and a sysdev for executing kvm_suspend() after interrupts have been turned off on the boot CPU (during system suspend) and for executing kvm_resume() before turning on interrupts on the boot CPU (during system resume). However, since both of these functions ignore their arguments, the entire mechanism may be replaced with a struct syscore_ops object which is simpler. Signed-off-by: Rafael J. Wysocki Acked-by: Avi Kivity commit 134fac3f457f3dd753ecdb25e6da3e5f6629f696 Author: Rafael J. Wysocki Date: Wed Mar 23 22:16:14 2011 +0100 PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev The Intel IOMMU subsystem uses a sysdev class and a sysdev for executing iommu_suspend() after interrupts have been turned off on the boot CPU (during system suspend) and for executing iommu_resume() before turning on interrupts on the boot CPU (during system resume). However, since both of these functions ignore their arguments, the entire mechanism may be replaced with a struct syscore_ops object which is simpler. Signed-off-by: Rafael J. Wysocki Acked-by: Joerg Roedel commit e1a85b2c519551d4792180cdab4074d7e99bf2c9 Author: Rafael J. Wysocki Date: Wed Mar 23 22:16:04 2011 +0100 timekeeping: Use syscore_ops instead of sysdev class and sysdev The timekeeping subsystem uses a sysdev class and a sysdev for executing timekeeping_suspend() after interrupts have been turned off on the boot CPU (during system suspend) and for executing timekeeping_resume() before turning on interrupts on the boot CPU (during system resume). However, since both of these functions ignore their arguments, the entire mechanism may be replaced with a struct syscore_ops object which is simpler. Signed-off-by: Rafael J. Wysocki Reviewed-by: Thomas Gleixner commit f3c6ea1b06c71b43f751b36bd99345369fe911af Author: Rafael J. Wysocki Date: Wed Mar 23 22:15:54 2011 +0100 x86: Use syscore_ops instead of sysdev classes and sysdevs Some subsystems in the x86 tree need to carry out suspend/resume and shutdown operations with one CPU on-line and interrupts disabled and they define sysdev classes and sysdevs or sysdev drivers for this purpose. This leads to unnecessarily complicated code and excessive memory usage, so switch them to using struct syscore_ops objects for this purpose instead. Generally, there are three categories of subsystems that use sysdevs for implementing PM operations: (1) subsystems whose suspend/resume callbacks ignore their arguments entirely (the majority), (2) subsystems whose suspend/resume callbacks use their struct sys_device argument, but don't really need to do that, because they can be implemented differently in an arguably simpler way (io_apic.c), and (3) subsystems whose suspend/resume callbacks use their struct sys_device argument, but the value of that argument is always the same and could be ignored (microcode_core.c). In all of these cases the subsystems in question may be readily converted to using struct syscore_ops objects for power management and shutdown. Signed-off-by: Rafael J. Wysocki Reviewed-by: Thomas Gleixner Acked-by: Ingo Molnar commit e6937ee626dee9c66ae820f5cca11efca2933845 Author: Julia Lawall Date: Tue Mar 22 07:15:23 2011 +0000 drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region Request_mem_region should be used with release_mem_region, not release_resource. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,E; @@ *x = request_mem_region(...) ... when != release_mem_region(x) when != x = E * release_resource(x); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 88e87be6ba528bd73522ecf0468fe32f1ee199e6 Author: Julia Lawall Date: Tue Mar 22 07:15:21 2011 +0000 drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region Request_mem_region should be used with release_mem_region, not release_resource. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,E; @@ *x = request_mem_region(...) ... when != release_mem_region(x) when != x = E * release_resource(x); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 95c5c3ab7db0dcaeebeb771b90152cd47aa27243 Author: Jarkko Nikula Date: Mon Mar 21 16:27:30 2011 +0200 spi/omap_mcspi: Fix broken last word xfer Commit adef658 "spi/omap_mcspi: catch xfers of non-multiple SPI word size" broke the transmission of last word in cases where access is multiple of word size and word size is 16 or 32 bits. Fix this by replacing the test "c > (word_len>>3)" in do-while loops with "c >= 'pointer increment size'". This ensures that the last word is transmitted in above case and still allow to break the loop and prevent variable c underflow in cases where word size != 'pointer increment size'. Signed-off-by: Jarkko Nikula Tested-by: Sourav Poddar Acked-by: Michael Jones Signed-off-by: Grant Likely commit a9712bc12c40c172e393f85a9b2ba8db4bf59509 Author: Al Viro Date: Wed Mar 23 15:52:50 2011 -0400 deal with races in /proc/*/{syscall,stack,personality} All of those are rw-r--r-- and all are broken for suid - if you open a file before the target does suid-root exec, you'll be still able to access it. For personality it's not a big deal, but for syscall and stack it's a real problem. Fix: check that task is tracable for you at the time of read(). Signed-off-by: Al Viro commit a7006c9747ef225ab070d96c054e85682a09a13e Author: Andres Salomon Date: Thu Mar 17 17:32:35 2011 -0700 of/flattree: minor cleanups - static-ize some functions - add some additional comments Signed-off-by: Andres Salomon Signed-off-by: Grant Likely commit 1eed4c077c31450bfcd0249aebb21d96fc5d5d3c Author: Grant Likely Date: Fri Mar 18 10:21:29 2011 -0600 dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table There are no users of OF_NO_DEEP_PROBE, and of_match_node() now gracefully handles being passed a NULL pointer, so the checks at the top of of_platform_bus_probe can be dropped. While at it, consolidate the root node pointer check to be easier to read and tidy up related comments. Signed-off-by: Grant Likely commit a52f07ecd143baee51623b063be5007585748a4f Author: Grant Likely Date: Fri Mar 18 10:21:29 2011 -0600 dt: protect against NULL matches passed to of_match_node() There are a few use cases where it is convenient to pass NULL to of_match_node() and have it fail gracefully. The patch adds a null check to the beginning so taht it does so. Signed-off-by: Grant Likely commit 38e9e21dac33082f0440d24aefb3466bb18bfed6 Author: Grant Likely Date: Fri Mar 18 10:21:28 2011 -0600 dt: Refactor of_platform_bus_probe() The current implementation uses three copies of of basically identical code. This patch consolidates them to make the code simpler. Signed-off-by: Grant Likely commit 198214a7ee50375fa71a65e518341980cfd4b2f0 Author: Stephen Wilson Date: Sun Mar 13 15:49:24 2011 -0400 proc: enable writing to /proc/pid/mem With recent changes there is no longer a security hazard with writing to /proc/pid/mem. Remove the #ifdef. Signed-off-by: Stephen Wilson Signed-off-by: Al Viro commit 8b0db9db19858b08c46a84540acfd35f6e6487b8 Author: Stephen Wilson Date: Sun Mar 13 15:49:23 2011 -0400 proc: make check_mem_permission() return an mm_struct on success This change allows us to take advantage of access_remote_vm(), which in turn eliminates a security issue with the mem_write() implementation. The previous implementation of mem_write() was insecure since the target task could exec a setuid-root binary between the permission check and the actual write. Holding a reference to the target mm_struct eliminates this vulnerability. Signed-off-by: Stephen Wilson Signed-off-by: Al Viro commit 18f661bcf898742212182d75f22f05b048cc04bb Author: Stephen Wilson Date: Sun Mar 13 15:49:22 2011 -0400 proc: hold cred_guard_mutex in check_mem_permission() Avoid a potential race when task exec's and we get a new ->mm but check against the old credentials in ptrace_may_access(). Holding of the mutex is implemented by factoring out the body of the code into a helper function __check_mem_permission(). Performing this factorization now simplifies upcoming changes and minimizes churn in the diff's. Signed-off-by: Stephen Wilson Signed-off-by: Al Viro commit 26947f8c8f9598209001cdcd31bb2162a2e54691 Author: Stephen Wilson Date: Sun Mar 13 15:49:21 2011 -0400 proc: disable mem_write after exec This change makes mem_write() observe the same constraints as mem_read(). This is particularly important for mem_write as an accidental leak of the fd across an exec could result in arbitrary modification of the target process' memory. IOW, /proc/pid/mem is implicitly close-on-exec. Signed-off-by: Stephen Wilson Signed-off-by: Al Viro commit 5ddd36b9c59887c6416e21daf984fbdd9b1818df Author: Stephen Wilson Date: Sun Mar 13 15:49:20 2011 -0400 mm: implement access_remote_vm Provide an alternative to access_process_vm that allows the caller to obtain a reference to the supplied mm_struct. Signed-off-by: Stephen Wilson Signed-off-by: Al Viro commit 206cb636576b969e9b471cdedeaea7752e6acb33 Author: Stephen Wilson Date: Sun Mar 13 15:49:19 2011 -0400 mm: factor out main logic of access_process_vm Introduce an internal helper __access_remote_vm and base access_process_vm on top of it. This new method may be called with a NULL task_struct if page fault accounting is not desired. This code will be shared with a new address space accessor that is independent of task_struct. Signed-off-by: Stephen Wilson Signed-off-by: Al Viro commit e7f22e207bacdba5b73f2893a3abe935a5373e2e Author: Stephen Wilson Date: Sun Mar 13 15:49:18 2011 -0400 mm: use mm_struct to resolve gate vma's in __get_user_pages We now check if a requested user page overlaps a gate vma using the supplied mm instead of the supplied task. The given task is now used solely for accounting purposes and may be NULL. Signed-off-by: Stephen Wilson Signed-off-by: Al Viro commit cae5d39032acf26c265f6b1dc73d7ce6ff4bc387 Author: Stephen Wilson Date: Sun Mar 13 15:49:17 2011 -0400 mm: arch: rename in_gate_area_no_task to in_gate_area_no_mm Now that gate vma's are referenced with respect to a particular mm and not a particular task it only makes sense to propagate the change to this predicate as well. Signed-off-by: Stephen Wilson Reviewed-by: Michel Lespinasse Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Signed-off-by: Al Viro commit 83b964bbf82eb13a8f31bb49ca420787fe01f7a6 Author: Stephen Wilson Date: Sun Mar 13 15:49:16 2011 -0400 mm: arch: make in_gate_area take an mm_struct instead of a task_struct Morally, the question of whether an address lies in a gate vma should be asked with respect to an mm, not a particular task. Moreover, dropping the dependency on task_struct will help make existing and future operations on mm's more flexible and convenient. Signed-off-by: Stephen Wilson Reviewed-by: Michel Lespinasse Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Signed-off-by: Al Viro commit 31db58b3ab432f72ea76be58b12e6ffaf627d5db Author: Stephen Wilson Date: Sun Mar 13 15:49:15 2011 -0400 mm: arch: make get_gate_vma take an mm_struct instead of a task_struct Morally, the presence of a gate vma is more an attribute of a particular mm than a particular task. Moreover, dropping the dependency on task_struct will help make both existing and future operations on mm's more flexible and convenient. Signed-off-by: Stephen Wilson Reviewed-by: Michel Lespinasse Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Signed-off-by: Al Viro commit 375906f8765e131a4a159b1ffebf78c15db7b3bf Author: Stephen Wilson Date: Sun Mar 13 15:49:14 2011 -0400 x86: mark associated mm when running a task in 32 bit compatibility mode This patch simply follows the same practice as for setting the TIF_IA32 flag. In particular, an mm is marked as holding 32-bit tasks when a 32-bit binary is exec'ed. Both ELF and a.out formats are updated. Signed-off-by: Stephen Wilson Reviewed-by: Michel Lespinasse Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Signed-off-by: Al Viro commit c2ef45df3b98a027ec8f9081bd2a19dff520ef9d Author: Stephen Wilson Date: Sun Mar 13 15:49:13 2011 -0400 x86: add context tag to mark mm when running a task in 32-bit compatibility mode This tag is intended to mirror the thread info TIF_IA32 flag. Will be used to identify mm's which support 32 bit tasks running in compatibility mode without requiring a reference to the task itself. Signed-off-by: Stephen Wilson Reviewed-by: Michel Lespinasse Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Signed-off-by: Al Viro commit 2fadaef41283aad7100fa73f01998cddaca25833 Author: Al Viro Date: Tue Feb 15 22:52:11 2011 -0500 auxv: require the target to be tracable (or yourself) same as for environ, except that we didn't do any checks to prevent access after suid execve Signed-off-by: Al Viro commit d6f64b89d7ff22ce05896ab4a93a653e8d0b123d Author: Al Viro Date: Tue Feb 15 22:26:01 2011 -0500 close race in /proc/*/environ Switch to mm_for_maps(). Maybe we ought to make it r--r--r--, since we do checks on IO anyway... Signed-off-by: Al Viro commit ec6fd8a4355cda81cd9f06bebc048e83eb514ac7 Author: Al Viro Date: Tue Feb 15 22:22:54 2011 -0500 report errors in /proc/*/*map* sanely Signed-off-by: Al Viro commit ca6b0bf0e086513b9ee5efc0aa5770ecb57778af Author: Al Viro Date: Tue Feb 15 22:04:37 2011 -0500 pagemap: close races with suid execve just use mm_for_maps() Signed-off-by: Al Viro commit 26ec3c646e75ce7a69fda429d68fcbdcd5eacc62 Author: Al Viro Date: Tue Feb 15 21:24:05 2011 -0500 make sessionid permissions in /proc/*/task/* match those in /proc/* Signed-off-by: Al Viro commit 7e7797e7f6f7bfab73fca02c65e40eaa5bb9000c Author: Johan Hovold Date: Tue Mar 22 11:12:11 2011 +0100 USB: cdc-acm: fix potential null-pointer dereference on disconnect Fix potential null-pointer exception on disconnect introduced by commit 11ea859d64b69a747d6b060b9ed1520eab1161fe (USB: additional power savings for cdc-acm devices that support remote wakeup). Only access acm->dev after making sure it is non-null in control urb completion handler. Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 15e5bee33ffc11d0e5c6f819a65e7881c5c407be Author: Johan Hovold Date: Tue Mar 22 11:12:10 2011 +0100 USB: cdc-acm: fix potential null-pointer dereference Must check return value of tty_port_tty_get. Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 23b80550e2aa61d0ba3af98b831b9195be0db9ee Author: Johan Hovold Date: Tue Mar 22 11:12:09 2011 +0100 USB: cdc-acm: fix memory corruption / panic Prevent read urbs from being resubmitted from tasklet after port close. The receive tasklet was not disabled on port close, which could lead to corruption of receive lists on consecutive port open. In particular, read urbs could be re-submitted before port open, added to free list in open, and then added a second time to the free list in the completion handler. cdc-acm.c: Entering acm_tty_open. cdc-acm.c: acm_control_msg: rq: 0x22 val: 0x3 len: 0x0 result: 0 cdc-acm.c: Entering acm_rx_tasklet cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da280, rcv 0xf57fbc24, buf 0xf57fbd64 cdc-acm.c: set line: 115200 0 0 8 cdc-acm.c: acm_control_msg: rq: 0x20 val: 0x0 len: 0x7 result: 7 cdc-acm.c: acm_tty_close cdc-acm.c: acm_port_down cdc-acm.c: acm_control_msg: rq: 0x22 val: 0x0 len: 0x0 result: 0 cdc-acm.c: acm_ctrl_irq - urb shutting down with status: -2 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da300, rcv 0xf57fbc10, buf 0xf57fbd50 cdc-acm.c: Entering acm_read_bulk with status -2 cdc_acm 4-1:1.1: Aborting, acm not ready cdc-acm.c: Entering acm_read_bulk with status -2 cdc_acm 4-1:1.1: Aborting, acm not ready cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da380, rcv 0xf57fbbfc, buf 0xf57fbd3c cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da400, rcv 0xf57fbbe8, buf 0xf57fbd28 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da480, rcv 0xf57fbbd4, buf 0xf57fbd14 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da900, rcv 0xf57fbbc0, buf 0xf57fbd00 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da980, rcv 0xf57fbbac, buf 0xf57fbcec cdc-acm.c: acm_rx_tasklet: sending urb 0xf50daa00, rcv 0xf57fbb98, buf 0xf57fbcd8 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50daa80, rcv 0xf57fbb84, buf 0xf57fbcc4 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50dab00, rcv 0xf57fbb70, buf 0xf57fbcb0 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50dab80, rcv 0xf57fbb5c, buf 0xf57fbc9c cdc-acm.c: acm_rx_tasklet: sending urb 0xf50dac00, rcv 0xf57fbb48, buf 0xf57fbc88 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50dac80, rcv 0xf57fbb34, buf 0xf57fbc74 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50dad00, rcv 0xf57fbb20, buf 0xf57fbc60 cdc-acm.c: acm_rx_tasklet: sending urb 0xf50dad80, rcv 0xf57fbb0c, buf 0xf57fbc4c cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da880, rcv 0xf57fbaf8, buf 0xf57fbc38 cdc-acm.c: Entering acm_tty_open. cdc-acm.c: acm_control_msg: rq: 0x22 val: 0x3 len: 0x0 result: 0 cdc-acm.c: Entering acm_rx_tasklet cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da280, rcv 0xf57fbc24, buf 0xf57fbd64 cdc-acm.c: Entering acm_tty_write to write 3 bytes, cdc-acm.c: Get 3 bytes... cdc-acm.c: acm_write_start susp_count: 0 cdc-acm.c: Entering acm_read_bulk with status 0 ------------[ cut here ]------------ WARNING: at /home/johan/src/linux/linux-2.6/lib/list_debug.c:57 list_del+0x10c/0x120() Hardware name: Vostro 1520 list_del corruption. next->prev should be f57fbc10, but was f57fbaf8 Modules linked in: cdc_acm Pid: 3, comm: ksoftirqd/0 Not tainted 2.6.37+ #39 Call Trace: [] warn_slowpath_common+0x72/0xa0 [] ? list_del+0x10c/0x120 [] ? list_del+0x10c/0x120 [] warn_slowpath_fmt+0x33/0x40 [] list_del+0x10c/0x120 [] acm_rx_tasklet+0xef/0x3e0 [cdc_acm] [] ? net_rps_action_and_irq_enable+0x6d/0x80 [] tasklet_action+0xe6/0x140 [] __do_softirq+0xaf/0x210 [] ? __do_softirq+0x0/0x210 [] ? run_ksoftirqd+0x8a/0x1c0 [] ? run_ksoftirqd+0x0/0x1c0 [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x10 ---[ end trace efd9a11434f0082e ]--- ------------[ cut here ]------------ WARNING: at /home/johan/src/linux/linux-2.6/lib/list_debug.c:57 list_del+0x10c/0x120() Hardware name: Vostro 1520 list_del corruption. next->prev should be f57fbd50, but was f57fbdb0 Modules linked in: cdc_acm Pid: 3, comm: ksoftirqd/0 Tainted: G W 2.6.37+ #39 Call Trace: [] warn_slowpath_common+0x72/0xa0 [] ? list_del+0x10c/0x120 [] ? list_del+0x10c/0x120 [] warn_slowpath_fmt+0x33/0x40 [] list_del+0x10c/0x120 [] acm_rx_tasklet+0x106/0x3e0 [cdc_acm] [] ? net_rps_action_and_irq_enable+0x6d/0x80 [] tasklet_action+0xe6/0x140 [] __do_softirq+0xaf/0x210 [] ? __do_softirq+0x0/0x210 [] ? run_ksoftirqd+0x8a/0x1c0 [] ? run_ksoftirqd+0x0/0x1c0 [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x10 ---[ end trace efd9a11434f0082f ]--- cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da300, rcv 0xf57fbc10, buf 0xf57fbd50 cdc-acm.c: disconnected from network cdc-acm.c: acm_rx_tasklet: sending urb 0xf50da380, rcv 0xf57fbbfc, buf 0xf57fbd3c cdc-acm.c: Entering acm_rx_tasklet ------------[ cut here ]------------ WARNING: at /home/johan/src/linux/linux-2.6/lib/list_debug.c:48 list_del+0xd5/0x120() Hardware name: Vostro 1520 list_del corruption, next is LIST_POISON1 (00100100) Modules linked in: cdc_acm Pid: 3, comm: ksoftirqd/0 Tainted: G W 2.6.37+ #39 Call Trace: [] warn_slowpath_common+0x72/0xa0 [] ? list_del+0xd5/0x120 [] ? list_del+0xd5/0x120 [] warn_slowpath_fmt+0x33/0x40 [] list_del+0xd5/0x120 [] acm_rx_tasklet+0x2dc/0x3e0 [cdc_acm] [] ? trace_hardirqs_on+0xb/0x10 [] ? tasklet_action+0x60/0x140 [] tasklet_action+0xe6/0x140 [] __do_softirq+0xaf/0x210 [] ? __do_softirq+0x0/0x210 [] ? run_ksoftirqd+0x8a/0x1c0 [] ? run_ksoftirqd+0x0/0x1c0 [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x10 ---[ end trace efd9a11434f00830 ]--- BUG: unable to handle kernel paging request at 00200200 IP: [] list_del+0x1d/0x120 *pde = 00000000 Oops: 0000 [#1] PREEMPT SMP last sysfs file: /sys/devices/pci0000:00/0000:00:1a.1/usb4/4-1/4-1:1.0/tty/ttyACM0/uevent Modules linked in: cdc_acm Pid: 3, comm: ksoftirqd/0 Tainted: G W 2.6.37+ #39 0T816J/Vostro 1520 EIP: 0060:[] EFLAGS: 00010046 CPU: 0 EIP is at list_del+0x1d/0x120 EAX: f57fbd3c EBX: f57fb800 ECX: ffff8000 EDX: 00200200 ESI: f57fbe90 EDI: f57fbd3c EBP: f600bf54 ESP: f600bf3c DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 Process ksoftirqd/0 (pid: 3, ti=f600a000 task=f60791c0 task.ti=f6082000) Stack: c1527e84 00000030 c1527e54 00100100 f57fb800 f57fbd3c f600bf98 f8051fac f8053104 f8052b94 f600bf6c c106dbab f600bf80 00000286 f60791c0 c1042b30 f57fbda8 f57f5800 f57fbdb0 f57fbd80 f57fbe7c c1656b04 00000000 f600bfb0 Call Trace: [] ? acm_rx_tasklet+0x2dc/0x3e0 [cdc_acm] [] ? trace_hardirqs_on+0xb/0x10 [] ? tasklet_action+0x60/0x140 [] ? tasklet_action+0xe6/0x140 [] ? __do_softirq+0xaf/0x210 [] ? __do_softirq+0x0/0x210 [] ? run_ksoftirqd+0x8a/0x1c0 [] ? run_ksoftirqd+0x0/0x1c0 [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x10 Code: ff 48 14 e9 57 ff ff ff 90 90 90 90 90 90 55 89 e5 83 ec 18 81 38 00 01 10 00 0f 84 9c 00 00 00 8b 50 04 81 fa 00 02 20 00 74 33 <8b> 12 39 d0 75 5c 8b 10 8b 4a 04 39 c8 0f 85 b5 00 00 00 8b 48 EIP: [] list_del+0x1d/0x120 SS:ESP 0068:f600bf3c CR2: 0000000000200200 ---[ end trace efd9a11434f00831 ]--- Kernel panic - not syncing: Fatal exception in interrupt Pid: 3, comm: ksoftirqd/0 Tainted: G D W 2.6.37+ #39 Call Trace: [] ? printk+0x1d/0x24 [] panic+0x66/0x15c [] oops_end+0x8f/0x90 [] no_context+0xc6/0x160 [] __bad_area_nosemaphore+0x98/0x140 [] ? release_console_sem+0x1d8/0x210 [] bad_area_nosemaphore+0x17/0x20 [] do_page_fault+0x279/0x420 [] ? show_trace+0x1f/0x30 [] ? printk+0x1d/0x24 [] ? do_page_fault+0x0/0x420 [] error_code+0x5f/0x64 [] ? select_task_rq_fair+0x37b/0x6a0 [] ? do_page_fault+0x0/0x420 [] ? list_del+0x1d/0x120 [] acm_rx_tasklet+0x2dc/0x3e0 [cdc_acm] [] ? trace_hardirqs_on+0xb/0x10 [] ? tasklet_action+0x60/0x140 [] tasklet_action+0xe6/0x140 [] __do_softirq+0xaf/0x210 [] ? __do_softirq+0x0/0x210 [] ? run_ksoftirqd+0x8a/0x1c0 [] ? run_ksoftirqd+0x0/0x1c0 [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x10 panic occurred, switching back to text console ------------[ cut here ]------------ Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 878b753e32ca765cd346a5d3038d630178ec78ff Author: Robert Lukassen Date: Wed Mar 16 12:13:34 2011 +0100 USB: Fix 'bad dma' problem on WDM device disconnect In the WDM class driver a disconnect event leads to calls to usb_free_coherent to put back two USB DMA buffers allocated earlier. The call to usb_free_coherent uses a different size parameter (desc->wMaxCommand) than the corresponding call to usb_alloc_coherent (desc->bMaxPacketSize0). When a disconnect event occurs, this leads to 'bad dma' complaints from usb core because the USB DMA buffer is being pushed back to the 'buffer-2048' pool from which it has not been allocated. This patch against the most recent linux-2.6 kernel ensures that the parameters used by usb_alloc_coherent & usb_free_coherent calls in cdc-wdm.c match. Signed-off-by: Robert Lukassen Cc: stable Signed-off-by: Greg Kroah-Hartman commit 97ac01d8f1b8d1c9e5af32c2813ba771835961f9 Author: Oliver Neukum Date: Fri Mar 18 12:44:17 2011 +0100 usb: wwan: fix compilation without CONFIG_PM_RUNTIME The pm usage counter must be accessed with the proper wrappers to allow compilation under all configurations. Signed-off-by: Oliver Neukum Reported-by: Eric Dumazet Reported-by: Tao Ma Signed-off-by: Greg Kroah-Hartman commit adaa3c6342b249548ea830fe8e02aa5b45be8688 Author: Peter Holik Date: Fri Mar 18 18:47:44 2011 +0100 USB: uss720 fixup refcount position My testprog do a lot of bitbang - after hours i got following warning and my machine lockups: WARNING: at /build/buildd/linux-2.6.38/lib/kref.c:34 After debugging uss720 driver i discovered that the completion callback was called before usb_submit_urb returns. The callback frees the request structure that is krefed on return by usb_submit_urb. Signed-off-by: Peter Holik Acked-by: Thomas Sailer Cc: stable Signed-off-by: Greg Kroah-Hartman commit 45567c28d29a8766a67c53f898d502aef71b7ef0 Author: Mike Frysinger Date: Mon Mar 21 14:06:32 2011 -0400 usb: musb: blackfin: fix typo in new bfin_musb_vbus_status func The common code has a "get" in the middle, but each implementation does not have it. Cc: stable@kernel.org Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 8f7e7b87ec7c3202941ef2770bacd353ab93368b Author: Bob Liu Date: Mon Mar 21 14:06:31 2011 -0400 usb: musb: blackfin: fix typo in new dev_pm_ops struct Cc: stable@kernel.org Signed-off-by: Bob Liu Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 417ddf86c8c499fada439b8ee89bb4c6f282ed6c Author: Mike Frysinger Date: Tue Mar 22 14:43:37 2011 -0400 usb: musb: blackfin: fix typo in platform driver name The modularization of the Blackfin driver set the name to "musb-blackfin" in all the boards, but "musb-bfin" in the driver itself. Since the driver file name uses "blackfin", change the driver to "musb-blackfin". This is also easier as it's only one file to change. Cc: stable@kernel.org Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 5f1e8ce75c19b0433aba6e0ea28937f1ee5d849e Author: Hema HK Date: Thu Mar 17 16:11:58 2011 +0530 usb: musb: Fix for merge issue There was conflict while merging 2 patches. Enabling vbus code is wrongly moved to error check if loop. This is a fix to resolve the merge issue. Signed-off-by: Hema HK Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit b5a3b3d985493c173925907adfebf3edab236fe7 Author: Alan Stern Date: Wed Mar 16 10:57:15 2011 -0400 ehci-hcd: Bug fix: don't set a QH's Halt bit This patch (as1453) fixes a long-standing bug in the ehci-hcd driver. There is no need to set the Halt bit in the overlay region for an unlinked or blocked QH. Contrary to what the comment says, setting the Halt bit does not cause the QH to be patched later; that decision (made in qh_refresh()) depends only on whether the QH is currently pointing to a valid qTD. Likewise, setting the Halt bit does not prevent completions from activating the QH while it is "stopped"; they are prevented by the fact that qh_completions() temporarily changes qh->qh_state to QH_STATE_COMPLETING. On the other hand, there are circumstances in which the QH will be reactivated _without_ being patched; this happens after an URB beyond the head of the queue is unlinked. Setting the Halt bit will then cause the hardware to see the QH with both the Active and Halt bits set, an invalid combination that will prevent the queue from advancing and may even crash some controllers. Apparently the only reason this hasn't been reported before is that unlinking URBs from the middle of a running queue is quite uncommon. However Test 17, recently added to the usbtest driver, does exactly this, and it confirms the presence of the bug. In short, there is no reason to set the Halt bit for an unlinked or blocked QH, and there is a very good reason not to set it. Therefore the code that sets it is removed. Signed-off-by: Alan Stern Tested-by: Andiry Xu CC: David Brownell CC: Signed-off-by: Greg Kroah-Hartman commit 9d02b42614149ebccf12c9c580601ed01bd83070 Author: Michal Sojka Date: Tue Mar 15 16:41:47 2011 +0100 USB: Do not pass negative length to snoop_urb() When `echo Y > /sys/module/usbcore/parameters/usbfs_snoop` and usb_control_msg() returns error, a lot of kernel memory is dumped to dmesg until unhandled kernel paging request occurs. Signed-off-by: Michal Sojka Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman commit 880f57318450dbead6a03f9e31a1468924d6dd88 Author: Frederic Weisbecker Date: Wed Mar 23 19:29:39 2011 +0100 perf: Better fit max unprivileged mlock pages for tools needs The maximum kilobytes of locked memory that an unprivileged user can reserve is of 512 kB = 128 pages by default, scaled to the number of onlined CPUs, which fits well with the tools that use 128 data pages by default. However tools actually use 129 pages, because they need one more for the user control page. Thus the default mlock threshold is not sufficient for the default tools needs and we always end up to evaluate the constant mlock rlimit policy, which doesn't have this scaling with the number of online CPUs. Hence, on systems that have more than 16 CPUs, we overlap the rlimit threshold and fail to mmap: $ perf record ls Error: failed to mmap with 1 (Operation not permitted) Just increase the max unprivileged mlock threshold by one page so that it supports well perf tools even after 16 CPUs. Reported-by: Han Pingtian Reported-by: Peter Zijlstra Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Frederic Weisbecker Acked-by: Arnaldo Carvalho de Melo Cc: Stephane Eranian Cc: Stable LKML-Reference: <1300904979-5508-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 0ba0851714beebb800992e5105a79dc3a4c504b0 Author: Tao Ma Date: Wed Mar 23 15:48:11 2011 -0400 ext4: fix a BUG in mb_mark_used during trim. In a bs=4096 volume, if we call FITRIM with the following parameter as fstrim_range(start = 102400, len = 134144000, minlen = 10240), we will trigger this BUG_ON: BUG_ON(start + len > (e4b->bd_sb->s_blocksize << 3)); Mar 4 00:55:52 boyu-tm kernel: ------------[ cut here ]------------ Mar 4 00:55:52 boyu-tm kernel: kernel BUG at fs/ext4/mballoc.c:1506! Mar 4 01:21:09 boyu-tm kernel: Code: d4 00 00 00 00 49 89 fe 8b 56 0c 44 8b 7e 04 89 55 c4 48 8b 4f 28 89 d6 44 01 fe 48 63 d6 48 8b 41 18 48 c1 e0 03 48 39 c2 76 04 <0f> 0b eb fe 48 8b 55 b0 8b 47 34 3b 42 08 74 04 0f 0b eb fe 48 Mar 4 01:21:09 boyu-tm kernel: RIP [] mb_mark_used+0x47/0x26c [ext4] Mar 4 01:21:09 boyu-tm kernel: RSP Mar 4 01:21:09 boyu-tm kernel: ---[ end trace 9f461696f6a9dcf2 ]--- Fix this bug by doing the accounting correctly. Cc: Lukas Czerner Signed-off-by: Tao Ma Signed-off-by: "Theodore Ts'o" commit 1ddd5049545e0aa1a0ed19bca4d9c9c3ce1ac8a2 Author: Bud Brown Date: Wed Mar 23 20:47:11 2011 +0100 cciss: fix lost command issue Under certain workloads a command may seem to get lost. IOW, the Smart Array thinks all commands have been completed but we still have commands in our completion queue. This may lead to system instability, filesystems going read-only, or even panics depending on the affected filesystem. We add an extra read to force the write to complete. Testing shows this extra read avoids the problem. Signed-off-by: Mike Miller Cc: stable@kernel.org Signed-off-by: Jens Axboe commit 35d48903e9781975e823b359ee85c257c9ff5c1c Author: Jiri Pirko Date: Tue Mar 22 02:38:12 2011 +0000 bonding: fix rx_handler locking This prevents possible race between bond_enslave and bond_handle_frame as reported by Nicolas by moving rx_handler register/unregister. slave->bond is added to hold pointer to master bonding sructure. That way dev->master is no longer used in bond_handler_frame. Also, this removes "BUG: scheduling while atomic" message Reported-by: Nicolas de Pesloüan Signed-off-by: Jiri Pirko Signed-off-by: Andy Gospodarek Tested-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit 9d2e157d970a73b3f270b631828e03eb452d525e Author: Randy Dunlap Date: Wed Mar 23 20:44:18 2011 +0100 Documentation/iostats.txt: bit-size reference etc. - correction that disk stats values are native-word-sized 32-bit or 64-bit values, not always 32-bi values - drop "Last modified" entry; use git for that - fix a few typos - change "cpu" to "CPU" Reported-by: Linda Walsh Signed-off-by: Randy Dunlap Signed-off-by: Jens Axboe commit cda6587c21a887254c8ed4b58da8fcc4040ab557 Author: Stanislaw Gruszka Date: Wed Mar 23 02:44:30 2011 +0000 myri10ge: fix rmmod crash Rmmod myri10ge crash at free_netdev() -> netif_napi_del(), because napi structures are already deallocated. To fix call netif_napi_del() before kfree() at myri10ge_free_slices(). Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka Signed-off-by: David S. Miller commit cccb4d063b263ac0713ab27d98460fda3b4f83ff Author: Fred Isaman Date: Wed Mar 23 13:27:55 2011 +0000 NFSv4.1 remove temp code that prevented ds commits Now that all the infrastructure is in place, we will do the right thing if we remove this special casing. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 863a3c6c686d5773f7192a4818769e15db12ce08 Author: Andy Adamson Date: Wed Mar 23 13:27:54 2011 +0000 NFSv4.1: layoutcommit The filelayout driver sends LAYOUTCOMMIT only when COMMIT goes to the data server (as opposed to the MDS) and the data server WRITE is not NFS_FILE_SYNC. Only whole file layout support means that there is only one IOMODE_RW layout segment. Signed-off-by: Andy Adamson Signed-off-by: Alexandros Batsakis Signed-off-by: Boaz Harrosh Signed-off-by: Dean Hildebrand Signed-off-by: Fred Isaman Signed-off-by: Mingyang Guo Signed-off-by: Tao Guo Signed-off-by: Zhang Jingwang Tested-by: Boaz Harrosh Signed-off-by: Benny Halevy Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit e0c2b3801828aadb65dec9f67f7c6b7a675ad007 Author: Fred Isaman Date: Wed Mar 23 13:27:53 2011 +0000 NFSv4.1: filelayout driver specific code for COMMIT Implement all the hooks created in the previous patches. This requires exporting quite a few functions and adding a few structure fields. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 988b6dceb0ae6d642587c8594529b94f6be0c5ea Author: Fred Isaman Date: Wed Mar 23 13:27:52 2011 +0000 NFSv4.1: remove GETATTR from ds commits Any COMMIT compound directed to a data server needs to have the GETATTR calls suppressed. We here, make sure the field we are testing (data->lseg) is set and refcounted correctly. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit a861a1e1c398fe34701569fd8ac9225dfe0a9a7e Author: Fred Isaman Date: Wed Mar 23 13:27:51 2011 +0000 NFSv4.1: add generic layer hooks for pnfs COMMIT We create three major hooks for the pnfs code. pnfs_mark_request_commit() is called during writeback_done from nfs_mark_request_commit, which gives the driver an opportunity to claim it wants control over commiting a particular req. pnfs_choose_commit_list() is called from nfs_scan_list to choose which list a given req should be added to, based on where we intend to send it for COMMIT. It is up to the driver to have preallocated list headers for each destination it may need. pnfs_commit_list() is how the driver actually takes control, it is used instead of nfs_commit_list(). In order to pass information between the above functions, we create a union in nfs_page to hold a lseg (which is possible because the req is not on any list while in transition), and add some flags to indicate if we need to use the pnfs code. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 425eb736cd905181a4dd4dc8d66342a7c7ab2f27 Author: Fred Isaman Date: Wed Mar 23 13:27:50 2011 +0000 NFSv4.1: alloc and free commit_buckets Create a preallocated list header to hold nfs_pages for each non-MDS COMMIT destination. Note this is not necessarily each DS, but is basically each pair. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit c879513e91c9e38957f0d9647d22469f1887e4da Author: Fred Isaman Date: Wed Mar 23 13:27:49 2011 +0000 NFSv4.1: shift filelayout_free_lseg Move it up to avoid forward declaration in later patch. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 5917ce8440ba0b3f2adee613b5f1258ac5efff02 Author: Fred Isaman Date: Wed Mar 23 13:27:48 2011 +0000 NFSv4.1: pull out code from nfs_commit_release Create a separate support function for later use by data server commit code. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 64bfeb49bd1c2351a8415f7fe6b25eef208872a5 Author: Fred Isaman Date: Wed Mar 23 13:27:47 2011 +0000 NFSv4.1: pull error handling out of nfs_commit_list Create a separate support function for later use by data server commit code. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 5f452431e229ea14df61b0ac89eed5881414eef9 Author: Fred Isaman Date: Wed Mar 23 13:27:46 2011 +0000 NFSv4.1: add callback to nfs4_commit_done Add a callback that the pnfs layout driver can use to do its own error handling of the data server's COMMIT response. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 9ace33cdc6562699a780b4716d9d52c55dd2151a Author: Fred Isaman Date: Wed Mar 23 13:27:45 2011 +0000 NFSv4.1: rearrange nfs_commit_rpcsetup Reorder nfs_commit_rpcsetup, preparing for a pnfs entry point. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 465d52437d5ce8d4eb9da0d3e3818b51cff163a1 Author: Fred Isaman Date: Wed Mar 23 13:27:44 2011 +0000 NFSv4.1: don't send COMMIT to ds for data sync writes Based on consensus reached in Feb 2011 interim IETF meeting regarding use of LAYOUTCOMMIT, it has been decided that a NFS_DATA_SYNC return from a WRITE to data server should not initiate a COMMIT. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 61b85bf6060bfd205c218f5aeb71c19a24abb0cd Author: Yevgeny Petrilin Date: Tue Mar 22 22:39:05 2011 +0000 mlx4_en: updated driver version to 1.5.4.1 Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 87a5c3896f9cf3b7f374af95b342d1089989327a Author: Yevgeny Petrilin Date: Tue Mar 22 22:38:52 2011 +0000 mlx4_en: Using blue flame support Doorbell is used according to usage of BlueFlame. For Blue Flame to work in Ethernet mode QP number should have 0 at bits 6,7. Allocating range of QPs accordingly. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 9ace5e0176f165f04537497143506621d33a0139 Author: Eli Cohen Date: Tue Mar 22 22:38:48 2011 +0000 mlx4_core: reserve UARs for userspace consumers Do not allow a kernel consumer to allocate a UAR to serve for blue flame if the number of available UARs gets below MLX4_NUM_RESERVED_UARS (currently 8). This will allow userspace apps to open a device file and run things like ibv_devinfo. Signed-off-by: Eli Cohen Signed-off-by: David S. Miller commit 42d1e017e2f040c3e3d62b6cfa3a26351a865d04 Author: Eli Cohen Date: Tue Mar 22 22:38:45 2011 +0000 mlx4_core: maintain available field in bitmap allocator Add mlx4_bitmap_avail() to give the number of available resources. We want to use this as a hint to whether to allocate a resources or not. This patch is introduced to be used with allocation blue flame registers. Signed-off-by: Eli Cohen Signed-off-by: David S. Miller commit c1b43dca137f2154845122417fba86d4bae67182 Author: Eli Cohen Date: Tue Mar 22 22:38:41 2011 +0000 mlx4: Add blue flame support for kernel consumers Using blue flame can improve latency by allowing the HW to more efficiently access the WQE. This patch presents two functions that are used to allocate or release HW resources for using blue flame; the caller need to supply a struct mlx4_bf object when allocating resources. Consumers that make use of this API should post doorbells to the UAR object pointed by the initialized struct mlx4_bf; Signed-off-by: Eli Cohen Signed-off-by: David S. Miller commit 1679200f91da6a054b06954c9bd3eeed29b6731f Author: Yevgeny Petrilin Date: Tue Mar 22 22:38:31 2011 +0000 mlx4_en: Enabling new steering The mlx4_en module now uses the new steering mechanism. The RX packets are now steered through the MCG table instead of Mac table for unicast, and default entry for multicast. The feature is enabled through INIT_HCA Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit b12d93d63c3217f0ec923ff938b12a744e242ffa Author: Yevgeny Petrilin Date: Tue Mar 22 22:38:24 2011 +0000 mlx4: Add support for promiscuous mode in the new steering model. For Ethernet mode only, When we want to register QP as promiscuous, it must be added to all the existing steering entries and also to the default one. The promiscuous QP might also be on of "real" QPs, which means we need to monitor every entry to avoid duplicates and ensure we close an entry when all it has is promiscuous QPs. Same mechanism both for unicast and multicast. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 0345584e0b8be3735a950d17c7e463db20c6ce27 Author: Yevgeny Petrilin Date: Tue Mar 22 22:38:17 2011 +0000 mlx4: generalization of multicast steering. The same packet steering mechanism would be used both for IB and Ethernet, Both multicasts and unicasts. This commit prepares the general infrastructure for this. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 725c89997e03d71b09ea3c17c997da0712b9d835 Author: Yevgeny Petrilin Date: Tue Mar 22 22:38:07 2011 +0000 mlx4_en: Reporting HW revision in ethtool -i HW revision is derived from device ID and rev id. Signed-off-by: Eugenia Emantayev Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 14c07b1358ede1664652bb9b28d9ace5fe6f7f92 Author: Yevgeny Petrilin Date: Tue Mar 22 22:37:59 2011 +0000 mlx4: Wake on LAN support The driver queries the FW for WOL support. Ethtool get/set_wol is implemented accordingly. Only magic packets are supported at the time. Signed-off-by: Igor Yarovinsky Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 1fb9876e9bf895ea4127ff17180f1b2ab37771b6 Author: Yevgeny Petrilin Date: Tue Mar 22 22:37:52 2011 +0000 mlx4_en: using new mlx4 interrupt scheme Each RX ring will have its own interrupt vector, and TX rings will share one (we mostly use polling for TX completions). The vectors are assigned first time device is opened, and its name includes the interface name and ring number. Signed-off-by: Markuze Alex Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 0b7ca5a928e2271bbc225e9e1ac1f22e9fbee54f Author: Yevgeny Petrilin Date: Tue Mar 22 22:37:47 2011 +0000 mlx4: Changing interrupt scheme Adding a pool of MSI-X vectors and EQs that can be used explicitly by mlx4_core customers (mlx4_ib, mlx4_en). The consumers will assign their own names to the interrupt vectors. Those vectors are not opened at mlx4 device initialization, opened by demand. Changed the max number of possible EQs according to the new scheme, no longer relies on on number of cores. The new functionality is exposed through mlx4_assign_eq() and mlx4_release_eq(). Customers that do not use the new API will get completion vectors as before. Signed-off-by: Markuze Alex Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 908222655b38005483d64385e06341a38647fdf1 Author: Yevgeny Petrilin Date: Tue Mar 22 22:37:41 2011 +0000 mlx4_en: bringing link up when registering netdevice Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 46afd0fb01d62ee217f142ab9c26054304ab7454 Author: Yevgeny Petrilin Date: Tue Mar 22 22:37:36 2011 +0000 mlx4_en: optimize adaptive moderation algorithm for better latency Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 39f17b44aaaa6bc47ded0bbb17fc617ec6cf08bb Author: Yevgeny Petrilin Date: Tue Mar 22 22:37:28 2011 +0000 mlx4_en: moderation parameters are not reseted. Instead of reseting the module parameters each ifup or mtu change, they are being set once at device initialization Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit b6055006b26de15aaa66870809b3d63b334737ce Author: Yevgeny Petrilin Date: Tue Mar 22 22:37:23 2011 +0000 mlx4_en: going out of range of TX rings when reporting stats Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit a2e8461a2ce5e8140b7374eb68af0d09e36e07ff Author: Thomas Gleixner Date: Wed Mar 23 13:10:31 2011 +0100 genirq: Provide locked setter for chip, handler, name Some irq_set_type() callbacks need to change the chip and the handler when the trigger mode changes. We have already a (misnomed) setter function for the handler which can be called from irq_set_type(). Provide one which allows to set chip and name as well. Put the misnomed function under the COMPAT switch and provide a replacement. Signed-off-by: Thomas Gleixner commit d3e17deb1790ee2123e9d11420be6411d1768b47 Author: Thomas Gleixner Date: Tue Mar 22 17:08:15 2011 +0100 genirq: Provide a lockdep helper Some irq chips need to call genirq functions for nested chips from their callbacks. That upsets lockdep. So they need to set a different lock class for those nested chips. Provide a helper function to avoid open access to irq_desc. Signed-off-by: Thomas Gleixner commit 3b9038912828384e38d82409c281124631c8533b Author: Thomas Gleixner Date: Wed Mar 23 00:24:11 2011 +0100 genirq; Remove the last leftovers of the old sparse irq code All users converted. Get rid of it. Signed-off-by: Thomas Gleixner commit d78f4b3e2c4dfb9487624f7157af04ab4260e189 Author: Senthil Balasubramanian Date: Wed Mar 23 23:07:22 2011 +0530 ath9k: Fix TX queue stuck issue. commit 86271e460a66003dc1f4cbfd845adafb790b7587 introduced a regression that caused mac80211 queues in stopped state. ath_drain_all_txq is called in driver flush which would reset the stopped flag and the mac80211 queues were never started after that. iperf traffic is completely stalled due to this issue. Restart the mac80211 queues in driver flush only if the txqs were drained. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 19b9675069cb06ae17d1595ac517d475d75e6bb9 Author: Senthil Balasubramanian Date: Wed Mar 23 23:07:21 2011 +0530 ath9k: Fix kernel panic caused by invalid rate index access. With the recent tx status optimization in mac80211, we bail out as and and when invalid rate index is found. So the behavior of resetting rate idx to -1 and count to 0 has changed for the rate indexes that were not part of the driver's retry series. This has resulted in ath9k using incorrect rate table index which caused the system to panic. Ideally ath9k need to loop only for the indexes that were part of the retry series and so simply use hw->max_rates as the loop counter. Pasted the stack trace of the panic issue for reference. [ 754.093192] BUG: unable to handle kernel paging request at ffff88046a9025b0 [ 754.093256] IP: [] ath_tx_status+0x209/0x2f0 [ath9k] [ 754.094888] Call Trace: [ 754.094903] [ 754.094928] [] ieee80211_tx_status+0x203/0x9e0 [mac80211] [ 754.094975] [] ? __ieee80211_wake_queue+0x125/0x140 [mac80211] [ 754.095017] [] ath_tx_complete_buf+0x1b9/0x370 [ath9k] [ 754.095054] [] ath_tx_complete_aggr+0x51f/0xb50 [ath9k] [ 754.095098] [] ? ieee80211_prepare_and_rx_handle+0x173/0xab0 [mac80211] [ 754.095148] [] ? _raw_spin_unlock_irqrestore+0x32/0x40 [ 754.095186] [] ath_tx_tasklet+0x365/0x4b0 [ath9k] [ 754.095224] [] ? clockevents_program_event+0x62/0xa0 [ 754.095261] [] ath9k_tasklet+0x168/0x1c0 [ath9k] [ 754.095298] [] tasklet_action+0x6b/0xe0 [ 754.095331] [] __do_softirq+0x98/0x120 [ 754.095361] [] call_softirq+0x1c/0x30 [ 754.095393] [] do_softirq+0x65/0xa0 [ 754.095423] [] irq_exit+0x8d/0x90 [ 754.095453] [] do_IRQ+0x61/0xe0 [ 754.095482] [] ret_from_intr+0x0/0x15 [ 754.095513] [ 754.095531] [] ? native_sched_clock+0x15/0x70 [ 754.096475] [] ? acpi_idle_enter_bm+0x24d/0x285 [processor] [ 754.096475] [] ? acpi_idle_enter_bm+0x246/0x285 [processor] [ 754.096475] [] cpuidle_idle_call+0x82/0x100 [ 754.096475] [] cpu_idle+0xa6/0xf0 [ 754.096475] [] rest_init+0x91/0xa0 [ 754.096475] [] start_kernel+0x3fd/0x408 [ 754.096475] [] x86_64_start_reservations+0x132/0x136 [ 754.096475] [] x86_64_start_kernel+0x106/0x115 [ 754.096475] RIP [] ath_tx_status+0x209/0x2f0 [ath9k] Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit a3ad38e87eead6ce748c6e4eec0571ce53b5a0c2 Author: armadefuego@gmail.com Date: Tue Mar 22 09:49:15 2011 -0700 orinoco: Clear dangling pointer on hardware busy On hardware busy the scan request pointer should be cleared, as higher levels will release. This avoids a crash when that pointer is erroneously used later. Signed-off-by: Joseph J. Gunn Signed-off-by: John W. Linville commit be36cacdddcc119ef7b33ae0b91631c3535a75ca Author: Johannes Berg Date: Tue Mar 22 11:00:37 2011 +0100 iwlagn: fix error in command waiting Clearly a mistake, since pointers won't suddenly change their value... Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit eb49a97363f020c1d7eef8bcd93865726b1fa11d Author: Eric Dumazet Date: Wed Mar 23 12:18:15 2011 -0700 ipv4: fix ip_rt_update_pmtu() commit 2c8cec5c10bc (Cache learned PMTU information in inetpeer) added an extra inet_putpeer() call in ip_rt_update_pmtu(). This results in various problems, since we can free one inetpeer, while it is still in use. Ref: http://www.spinics.net/lists/netdev/msg159121.html Reported-by: Alexander Beregalov Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 406b6f974dae76a5b795d5c251d11c979a4e509b Author: David S. Miller Date: Tue Mar 22 21:56:23 2011 -0700 ipv4: Fallback to FIB local table in __ip_dev_find(). In commit 9435eb1cf0b76b323019cebf8d16762a50a12a19 ("ipv4: Implement __ip_dev_find using new interface address hash.") we reimplemented __ip_dev_find() so that it doesn't have to do a full FIB table lookup. Instead, it consults a hash table of addresses configured to interfaces. This works identically to the old code in all except one case, and that is for loopback subnets. The old code would match the loopback device for any IP address that falls within a subnet configured to the loopback device. Handle this corner case by doing the FIB lookup. We could implement this via inet_addr_onlink() but: 1) Someone could configure many addresses to loopback and inet_addr_onlink() is a simple list traversal. 2) We know the old code works. Reported-by: Julian Anastasov Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8ef2ce3e16d9bec6cf015207c1c82a5b864046ac Author: Bryan Schumaker Date: Wed Mar 23 15:04:31 2011 -0400 NFS: Detect loops in a readdir due to bad cookies Some filesystems (such as ext4) can return the same cookie value for multiple files. If we try to start a readdir with one of these cookies, the server will return the first file found with a cookie of the same value. This can cause the client to enter an infinite loop. Signed-off-by: Bryan Schumaker Signed-off-by: Trond Myklebust commit 480c2006ebb44ae03165695db7b3e38c04e0d102 Author: Bryan Schumaker Date: Wed Mar 23 14:48:29 2011 -0400 NFS: Create nfs_open_dir_context nfs_opendir() created a context that held much more information than we need for a readdir. This patch introduces a slimmed-down nfs_open_dir_context that contains only the cookie and the cred used for RPC operations. The new context will eventually be used to help detect readdir loops. Signed-off-by: Bryan Schumaker Signed-off-by: Trond Myklebust commit e47c085afb3d16cbc6a4bfb10a3b074bb7c58998 Author: Trond Myklebust Date: Wed Mar 23 08:43:09 2011 -0400 NFS: Ensure that we update the readdir filp->f_pos correctly If we're doing a search by readdir cookie, we need to ensure that the resulting f_pos is updated. To do so, we need to update the desc->current_index, in the same way that we do in the search by file offset case. Signed-off-by: Trond Myklebust commit ba82638247c10cfda32268c894f78f8124f54084 Merge: 7f9e5c48 748bfd9 071c778 Author: Roland Dreier Date: Wed Mar 23 11:13:37 2011 -0700 Merge branches 'misc', 'nes' and 'srp' into for-next commit 3703b2c5d041a68095cdd22380c23ce27d449ad7 Author: Nicholas Bellinger Date: Fri Mar 18 15:39:17 2011 -0700 [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module This patch adds the TCM_Loop Linux/SCSI LLD fabric module for accessing TCM device backstores as locally accessable SCSI LUNs in virtual SAS, FC, and iSCSI Target ports using the generic fabric TransportID and Target Port WWN naming handlers from TCM's target_core_fabric_lib.c The TCM_Loop module uses the generic fabric configfs infratructure provided by target_core_fabric_configfs.c and adds a module dependent attribute for the creation/release of the virtual I_T Nexus connected the TCM_Loop Target and Initiator Ports. TCM_Loop can also be used with scsi-generic and BSG drivers so that STGT userspace fabric modules, QEMU-KVM and other hypervisor SCSI passthrough support can access TCM device backstore and control CDB emulation. For more information please see: http://linux-iscsi.org/wiki/Tcm_loop [jejb: fixed up checkpatch stuff] Signed-off-by: Nicholas A. Bellinger Reviewed-by: Christoph Hellwig Signed-off-by: James Bottomley commit 65922cb5ced76ba7182e955d4aada96f93446b1a Author: Sergey Senozhatsky Date: Wed Mar 23 14:08:27 2011 -0400 ext4: unused variables cleanup in fs/ext4/extents.c ext4 extents cleanup: . remove unused `*ex' from check_eofblocks_fl . remove unused `*eh' from ext4_ext_map_blocks Signed-off-by: Sergey Senozhatsky Signed-off-by: "Theodore Ts'o" commit 6de9843dab3f2a1d4d66d80aa9e5782f80977d20 Author: Feng Tang Date: Wed Mar 23 14:05:03 2011 -0400 ext4: remove redundant set_buffer_mapped() in ext4_da_get_block_prep() The map_bh() call will have already set the buffer_head to mapped. Signed-off-by: Feng Tang Signed-off-by: "Theodore Ts'o" commit 5fa8b573134108a333a317378998a9f1299c4dd6 Author: Sarang Radke Date: Wed Mar 23 08:07:33 2011 -0700 [SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion Disable Interrupt MBX completion will disable the interrupt on successful completion. Fixed the bug where driver was waiting for Interrupt to come in for its completion. Now driver will poll for disable interrupt MBX completion. Signed-off-by: Sarang Radke Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 3dea642afd9187728d119fce5c82a7ed9faa9b6a Author: James Bottomley Date: Wed Mar 23 09:58:28 2011 -0500 [SCSI] Revert "[SCSI] Retrieve the Caching mode page" This reverts commit 24d720b726c1a85f1962831ac30ad4d2ef8276b1. Previously we thought there was little possibility that devices would crash with this, but some have been found. Reported-by: Alan Stern Cc: Luben Tuikov Signed-off-by: James Bottomley commit fee787129d4d6a5e967a69ea3dea3e38ba556b3d Author: Bhanu Gollapudi Date: Mon Mar 21 18:51:13 2011 -0700 [SCSI] bnx2fc: IO completion not processed due to missed wakeup Driver does not detect a new CQE (completion queue entry) if a thread receives the wakup when it is in TASK_RUNNING state. Fix is to set the state to TASK_INTERRUPTIBLE while holding the fp_work_lock. Also, Use __set_current_task() since it is now set inside a spinlock with synchronization. Two other related optimizations: 1. After we exit the while (!kthread_should_stop()) loop, use __set_current_state() since synchronization is no longer needed. 2. Remove set_current_state(TASK_RUNNING) after schedule() since it should always be TASK_RUNNING after schedule(). Reviewed-by: Michael Chan Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: James Bottomley commit 2dcb0a61041a003f439bbd38005b6e454c368be0 Author: Vikas Chaudhary Date: Mon Mar 21 03:34:36 2011 -0700 [SCSI] qla4xxx: Update driver version to 5.02.00-k6 Signed-off-by: Vikas Chaudhary Signed-off-by: James Bottomley commit d32cee3c2d742784ec6ac0b4ca5732e98b17bc5c Author: Prasanna Mumbai Date: Mon Mar 21 03:34:35 2011 -0700 [SCSI] qla4xxx: masking required bits of add_fw_options during initialization Signed-off-by: Vikas Chaudhary Signed-off-by: Prasanna Mumbai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 2d7924e6be8b994f718429001457e677a2159445 Author: Vikas Chaudhary Date: Mon Mar 21 03:34:33 2011 -0700 [SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices Move relogin to all devices code from do_dpc to new fuction qla4xxx_relogin_all_devices() Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 3038727c8391ab1f3e5f5cf764f9f74164e6b47a Author: Vikas Chaudhary Date: Mon Mar 21 03:34:32 2011 -0700 [SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param Target Session Recovery Timeout Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 8bb4033d2b91e055a32e905e10a7034a4b077b7a Author: Vikas Chaudhary Date: Mon Mar 21 03:34:31 2011 -0700 [SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter This provides the flexibility to modify the qdepth based on different target devices to make the best use of system resources. Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit fc7657c9d98c250c9fd212348e6e156c73885cc4 Author: Vikas Chaudhary Date: Mon Mar 21 03:34:30 2011 -0700 [SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed We don't need to check ddb old state we can take action based on ddb new state. Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 7eece5a084264c1bff908b0d6a1b176b39dd272f Author: Karen Higgins Date: Mon Mar 21 03:34:29 2011 -0700 [SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter remove ha flag AF_HBA_GOING_AWAY and added flag AF_HA_REMOVAL to mark the other ISP-4xxx port to indicate that the driver is being removed, so that the other port will not re-initialize while in the process of removing the ha due to driver unload or hba hotplug. Signed-off-by: Karen Higgins Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 58da51dcfc13b2222ce8565e308852aef001f5d2 Author: Vikas Chaudhary Date: Mon Mar 21 03:34:28 2011 -0700 [SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 7edd9a7b28f57d8a5bcdb1a0def2aa09d1dd49d4 Author: Karen Higgins Date: Mon Mar 21 03:34:27 2011 -0700 [SCSI] qla4xxx: cleanup DDB relogin logic during initialization Driver has capability to add device dynamically and present them to OS, driver no longer need to wait for DDBs to come online during driver initialization. Driver still issues a relogin for DDBs that are not online, but no longer wait for DDB to come online. Signed-off-by: Vikas Chaudhary Signed-off-by: Karen Higgins Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit f9880e76fd15795b5917b20f54eeca764b0f3ccb Author: Prasanna Mumbai Date: Mon Mar 21 03:34:26 2011 -0700 [SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed Signed-off-by: Vikas Chaudhary Signed-off-by: Prasanna Mumbai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 99b53bf50cc4711a3c82dfc704911ff738a41758 Author: Prasanna Mumbai Date: Mon Mar 21 03:34:25 2011 -0700 [SCSI] qla4xxx: Do not send mbox command if FW is in failed state FW is not able to process mbox command if FW state is failed. This will cause mbox command to timeout and adapter reset. We have separate function to detect FW failed state and do adapter reset. So to avoid mbox command timeout, do not process mbox command in case of FW state failed. Signed-off-by: Vikas Chaudhary Signed-off-by: Prasanna Mumbai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 9640de2099a3c7936b65bf3a45e67a324de950c8 Author: Vikas Chaudhary Date: Mon Mar 21 03:34:24 2011 -0700 [SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list() Remove process all aen code from qla4xxx_initialize_ddb_list() as DPC activities should be done in DPC only. Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 5a4b65ab506398ba5a35c37e06edddd387cc0add Author: Richard Henderson Date: Wed Mar 23 17:42:49 2011 +0000 MN10300: gcc 4.6 vs am33 inline assembly GCC 4.6 explicitly represents the MDR register. It may be accessed via the "z" constraint. Perhaps more importantly, it tracks when the MDR register is clobbered and uses the RETF instruction if the incoming value is still valid. Thus it is important to (at least) clobber the MDR register in relevant inline assembly fragments, lest RETF be used incorrectly. The only instances I could find are here. There are reads of the MDR register in kernel/gdb-stub.c, but that's harmless. Although, frankly, __builtin_return_address(0) might be a better thing in those cases. Certainly MDR isn't going to contain anything else that might be useful... Signed-off-by: Richard Henderson Signed-off-by: David Howells commit 8c3adc796f32fa4878ec843f8960717ba377e024 Author: James Bottomley Date: Fri Mar 18 11:24:23 2011 -0400 [SCSI] ses: add subenclosure support There have been many complaints that an enclosure with subenclosures isn't attached to by the ses driver. Until now, though, no-one had been willing to provide access to one. Subenclosures are added simply by flattening the tree (i.e. all subenclosure devices show up under the one main device). This may have consequences if the naming is only unique per subenclosure, but that's a bug for another day. The tested array had no page 7, so no device naming at all. It also only had the disk devices on one of its subenclosures (all the others had power, fans, temperature and various sensors), so testing of this is fairly rudimentary. Signed-off-by: James Bottomley commit d9f7f37b90e7b0180961cb6567ae423ac3757db8 Author: Nithin Sujir Date: Thu Mar 17 17:13:37 2011 -0700 [SCSI] bnx2fc: Bump version to 1.0.1 Signed-off-by: Nithin Nayak Sujir Signed-off-by: Michael Chan Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: James Bottomley commit c94460fd29a9893eb677d2e0831a247a185c7a22 Author: Bhanu Gollapudi Date: Thu Mar 17 17:13:35 2011 -0700 [SCSI] bnx2fc: Remove unnecessary module state checks The check for module state MODULE_STATE_LIVE is no longer required for LLDs, as libfcoe transport takes care of it. Reference: http://marc.info/?l=linux-scsi&m=129989565903046&w=2 Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: James Bottomley commit 1294bfe60960c89a0c875cffb90c3bacf1d675d2 Author: Bhanu Gollapudi Date: Thu Mar 17 17:13:34 2011 -0700 [SCSI] bnx2fc: Fix MTU issue by using static MTU bnx2x now uses seperate MTUs for networking and FCoE. FCoE MTU is fixed to 2500 and bnx2fc now needs to match this logic by using FCOE_MTU instead of netdev->mtu. Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: James Bottomley commit 26ce67c3df46a8253e3bbf3eb87cc6782f6a6c91 Author: Michael Chan Date: Thu Mar 17 17:13:32 2011 -0700 [SCSI] bnx2fc: Remove network bonding checking bnx2fc only operates on bnx2x hardware devices and not master bonding devices, so there is no need to check for bonding. Even if the bnx2x device is "enslaved" into a bonding device, FCoE is unaffected as it has its own MAC address and queues. Signed-off-by: Michael Chan Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: James Bottomley commit 686959736a8543265930c8d777a73b052bc57f87 Author: Nithin Sujir Date: Thu Mar 17 17:13:31 2011 -0700 [SCSI] bnx2fc: Call bnx2fc_return_rqe and bnx2fc_get_next_rqe with tgt lock held tgt lock is needed during - bnx2fc_return_rqe to protect the rq_prod_idx. bnx2fc_get_next_rqe to protect rq_cons_idx Signed-off-by: Nithin Nayak Sujir Signed-off-by: Michael Chan Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: James Bottomley commit 0ea5c27583e1cc164bba7ca29fe48a225f52d19b Author: Bhanu Gollapudi Date: Thu Mar 17 17:13:29 2011 -0700 [SCSI] bnx2fc: common free list for cleanup commands Cleanup commands are issued to the firmware to cleanup any stuck ios that are supposed to be implicitly aborted. In the worst case we can have all scsi ios filling up the free_list and we may not be able to allocate cleanup tasks. So the driver has to reserve free_list entries to be able to allocate the cleanup tasks. This reserve free_list common to all cpus is allocated as one additional entry in the per cpu free_lists. In bnx2fc_cmd_alloc(), there is a related fix to use get_cpu() for the free_list_index. This will prevent using the wrong index if the CPU is preempted. Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Nithin Nayak Sujir Signed-off-by: Michael Chan Signed-off-by: James Bottomley commit 6702ca1dffbc864497b6f2c68543aad9bbf0bcee Author: Nithin Sujir Date: Thu Mar 17 17:13:27 2011 -0700 [SCSI] bnx2fc: Remove rtnl_trylock/restart_syscall checks Call rtnl_lock instead of rtnl_trylock & restart_syscall. This is bnx2fc counterpart of fcoe fixes, here is the reference: https://lists.open-fcoe.org/pipermail/devel/2011-March/011199.html Signed-off-by: Nithin Nayak Sujir Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: James Bottomley commit 839900c69d5b8a07a4df8e9bd9d1e59a5c556811 Author: Bhanu Gollapudi Date: Thu Mar 17 17:13:26 2011 -0700 [SCSI] bnx2fc: Avoid holding cq_lock when iounmap() is called With kernel debugging enabled, holding cq_lock when calling bnx2fc_free_session_resc() which calls iounmap() leads to a warning stack trace [INFO: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected]. iounmap() grabs a HARDIRQ-unsafe vmlist lock, so holding spin_lock_bh(cq_lock) when calling iounmap() will trigger the LOCKDEP warning. Since cq_lock is required only to guard against deletion, hold the lock just before freeing the cq. Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Nithin Nayak Sujir Signed-off-by: Michael Chan Signed-off-by: James Bottomley commit 70c7c88a1a65ca683eb7f3fe3ce79c72f29d845e Author: Mike Christie Date: Thu Mar 17 16:22:17 2011 -0500 [SCSI] libiscsi_tcp: use kmap in xmit path The xmit path can sleep with a page kmapped in the network xmit code while it waits for space to open up, so we have to use kmap instead of kmap atomic in that path. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit e8b12f0fb8352237525961f14ec933e915848840 Author: Mahesh Rajashekhara Date: Thu Mar 17 02:10:32 2011 -0700 [SCSI] aacraid: Add new code for PMC-Sierra's SRC based controller family Added new hardware device 0x28b interface for PMC-Sierra's SRC based controller family. - new src.c file for 0x28b specific functions - new XPORT header required - sync. command interface: doorbell bits shifted (SRC_ODR_SHIFT, SRC_IDR_SHIFT) - async. Interface: different inbound queue handling, no outbound I2O queue available, using doorbell ("PmDoorBellResponseSent") and response buffer on the host ("host_rrq") for status - changed AIF (adapter initiated FIBs) interface: "DoorBellAifPending" bit to inform about pending AIF, "AifRequest" command to read AIF, "NoMoreAifDataAvailable" to mark the end of the AIFs Signed-off-by: Mahesh Rajashekhara Signed-off-by: James Bottomley commit 0a2385cea9a715e11df10fce1f1442d933008a40 Author: Kashyap, Desai Date: Tue Mar 15 20:04:26 2011 +0530 [SCSI] mpt2sas : Added customer specific display support Added Vendor specific branding message support. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 12d233842987d9972957419e427987b94f7bd7b4 Author: Nicholas Bellinger Date: Mon Mar 14 04:06:11 2011 -0700 [SCSI] target: add initial statistics This patch adds a target_core_mib.c statistics conversion for backend context struct se_subsystem_dev + struct se_device config_group based statistics in target_core_device.c using CONFIGFS_EATTR() based struct config_item_types from target_core_stat.c code. The conversion from backend /proc/scsi_target/mib/ context output to configfs default groups+attributes include scsi_dev, scsi_lu, and scsi_tgt_dev output from within individual: /sys/kernel/config/target/core/$HBA/DEV/ The legacy procfs output now appear as individual configfs attributes under: *) $HBA/$DEV/statistics/scsi_dev: |-- indx |-- inst |-- ports `-- role *) $HBA/$DEV/statistics/scsi_lu: |-- creation_time |-- dev |-- dev_type |-- full_stat |-- hs_num_cmds |-- indx |-- inst |-- lu_name |-- lun |-- num_cmds |-- prod |-- read_mbytes |-- resets |-- rev |-- state_bit |-- status |-- vend `-- write_mbytes *) $HBA/$DEV/statistics/scsi_tgt_dev: |-- indx |-- inst |-- non_access_lus |-- num_lus |-- resets `-- status The conversion from backend /proc/scsi_target/mib/ context output to configfs default groups+attributes include scsi_port, scsi_tgt_port and scsi_transport output from within individual: /sys/kernel/config/target/fabric/$WWN/tpgt_$TPGT/lun/lun_$LUN_ID/statistics/ The legacy procfs output now appear as individual configfs attributes under: *) fabric/$WWN/tpgt_$TPGT/lun/lun_$LUN_ID/statistics/scsi_port |-- busy_count |-- dev |-- indx |-- inst `-- role *) fabric/$WWN/tpgt_$TPGT/lun/lun_$LUN_ID/statistics/scsi_tgt_port |-- dev |-- hs_in_cmds |-- in_cmds |-- indx |-- inst |-- name |-- port_index |-- read_mbytes `-- write_mbytes *) fabric/$WWN/tpgt_$TPGT/lun/lun_$LUN_ID/statistics/scsi_transport |-- dev_name |-- device |-- indx `-- inst The conversion from backend /proc/scsi_target/mib/ context output to configfs default groups+attributes include scsi_att_intr_port and scsi_auth_intr output from within individual: /sys/kernel/config/target/fabric/$WWN/tpgt_$TPGT/acls/$INITIATOR_WWN/lun_$LUN_ID/statistics/ The legacy procfs output now appear as individual configfs attributes under: *) acls/$INITIATOR_WWN/lun_$LUN_ID/statistics/scsi_att_intr_port |-- dev |-- indx |-- inst |-- port |-- port_auth_indx `-- port_ident *) acls/$INITIATOR_WWN/lun_$LUN_ID/statistics/scsi_auth_intr |-- att_count |-- creation_time |-- dev |-- dev_or_port |-- hs_num_cmds |-- indx |-- inst |-- intr_name |-- map_indx |-- num_cmds |-- port |-- read_mbytes |-- row_status `-- write_mbytes Also, this includes adding struct target_fabric_configfs_template-> tfc_wwn_fabric_stats_cit and ->tfc_tpg_nacl_stat_cit respectively for use during target_core_fabric_configfs.c:target_fabric_setup_cits() Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 15fb48cc40be170423fe8ddd17666aa6175315e3 Author: Nicholas Bellinger Date: Mon Mar 14 04:06:10 2011 -0700 [SCSI] target: update version to v4.0.0-rc7-ml Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 54550fabfecdb71e0deb51999cca7d28bb4299ed Author: Axel Lin Date: Mon Mar 14 04:06:09 2011 -0700 [SCSI] target: Add __init/__exit annotation for target_core_[init,exit]_configfs This patch fixes the follownig section mismatch warning: WARNING: vmlinux.o(.text+0x21617a): Section mismatch in reference from the function target_core_init_configfs() to the function .init.text:rd_module_init() The function target_core_init_configfs() references the function __init rd_module_init(). This is often because target_core_init_configfs() lacks a __init annotation or the annotation of rd_module_init is wrong. Signed-off-by: Axel Lin Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 58c3e6477f3840df7d9b346627420bc7b246cdc8 Author: Nicholas Bellinger Date: Mon Mar 14 04:06:08 2011 -0700 [SCSI] target: Fix FILEIO fd_buffered_io= token typo This patch fixes a token typo for the TCM/FILEIO match_table_t used for toggling O_SYNC usage for individual struct file backend access. Reported-by: Christophe Fergeau Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit f45934e08c9640faa5d960633eaf840c29ea33a8 Author: Fubo Chen Date: Mon Mar 14 04:06:07 2011 -0700 [SCSI] tcm_mod_builder.py: Fix generated *_drop_nodeacl() handler This patch adds the missing core_tpg_del_initiator_node_acl() call required by fabric modules for struct se_node_acl->acl_group context shutdown via target_core_fabric_configfs.c:target_fabric_nacl_base_release() -> struct target_core_fabric_ops->fabric_drop_nodeacl() for tcm_mod_builder.py generated $FABRIC_MOD_configfs.c skeleton code. Signed-off-by: Fubo Chen Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 12a18bdc27f81ba9d0a08a2462a49d339fff8b2d Author: Nicholas Bellinger Date: Mon Mar 14 04:06:06 2011 -0700 [SCSI] target: Fix bogus return in transport_add_device_to_core_hba failure path This patch removes a bogus conditional+return check within the failure path of transport_add_device_to_core_hba(). This breakage was introduced during the v4 conversion to remove struct se_cmd passthrough ops for INQUIRY / READ_CAPCITY during struct se_device creation and registration process. Reported-by: Julia Lawall Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 872105689eeccbcd77377d6a29f69bba3b0cbe3b Author: Jesper Juhl Date: Mon Mar 14 04:06:05 2011 -0700 [SCSI] target: Avoid mem leak and needless work in transport_generic_get_mem In drivers/target/target_core_transport.c::transport_generic_get_mem() there are a few potential memory leaks in the error paths. This patch makes sure that we free previously allocated memory when other allocations fail. It also moves some work (INIT_LIST_HEAD() and assignment to se_mem->se_len) below all the allocations so that if something fails we don't do the work at all. Signed-off-by: Jesper Juhl Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 5c6cd613196558ba50ba97268b6d225c8d2f56d6 Author: Nicholas Bellinger Date: Mon Mar 14 04:06:04 2011 -0700 [SCSI] target: Convert TMR REQ/RSP definitions to target namespace This patch changes include/target/target_core_tmr.h code to use target specific 'TMR_*' prefixed definitions for fabric independent SCSI Task Management Request/Request naming in include/scsi/scsi.h definitions for mainline target code. Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 065f97161b2da30b13000b1d9f64adff7e01e270 Author: Dan Carpenter Date: Mon Mar 14 04:06:03 2011 -0700 [SCSI] target: Convert rd_build_device_space() to use errno This patch converts rd_build_device_space() to return errno usage for failures in rd_create_virtdevice(). Signed-off-by: Dan Carpenter Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 35ce9e26d7e0674892f77a9172c898dfcba50064 Author: Nicholas Bellinger Date: Mon Mar 14 04:06:02 2011 -0700 [SCSI] target: Remove spurious double cast from structure macro accessors Reported-by: Fubo Chen Cc: James Bottomley Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 5dd7ed2e811d5cd12f31fb7f0c5ad0107d494a12 Author: Dan Carpenter Date: Mon Mar 14 04:06:01 2011 -0700 [SCSI] target: Minor sparse warning fixes and annotations This patch addresses the majority of sparse warnings and adds proper locking annotations. It also fixes the dubious one-bit signed bitfield, for which the signed one-bit types can be 0 or -1 which can cause a problem if someone ever checks if (foo->lu_gp_assoc == 1). The current code is fine because everyone just checks zero vs non-zero. But Sparse complains about it so lets change it. The warnings look like this: include/target/target_core_base.h:228:26: error: dubious one-bit signed bitfield Signed-off-by: Dan Carpenter Signed-off-by: Fubo Chen Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 05aea6e7e497ab418239ae54fe5966d52cbd8550 Author: Fubo Chen Date: Mon Mar 14 04:06:00 2011 -0700 [SCSI] target: Remove unnecessary hba_dev_list walk and se_clear_dev_ports legacy code This patch removes a legacy struct se_hba->hba_dev_list -> se_release_device_for_hba() list walk in core_delete_hba(), which is no longer required while using configfs VFS level parent/child struct config_group dependency referencing. The reason is because any struct se_hba->hba_dev_list-> struct se_device members are going to have to be released via: rmdir /sys/kernel/config/target/core/$HBA/* before rmdir release of struct se_hba via target_core_configfs.c: target_core_call_delhbafromtarget() -> core_delete_hba() rmdir /sys/kernel/config/target/core/$HBA to release struct se_hba in core_delete_hba(). This patch also removes the legacy se_clear_dev_ports() function, which is left-over pre-configfs shutdown logic for when se_free_virtual_device() was responsible for walking struct se_device->dev_sep_list and calling core_dev_del_lun() for each individual active struct se_port->se_lun. The reason this can be removed is because all struct se_device->dev_sep_list -> struct se_port communication is done via configfs symlinks, which means that an target fabric module's endpoints containg active struct se_port(s) will have to be released via target_core_fabric_configfs.c: target_fabric_port_unlink() via: unlink /sys/kernel/config/target/$FABRIC_MOD/$ENDPOINT/tpgt_$TPGT/lun/lun_$LUN_ID/ before rmdir release of struct se_device in target_core_configfs.c: target_core_drop_subdev() -> se_free_virtual_device() can happen via: rmdir /sys/kernel/config/target/core/$HBA/* to release struct se_subsystem_dev in target_core_drop_subdev() Reported-by: Stefan Richter Reported-by: Fubo Chen Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 613640e4e1b5358ce880d16f10ecc2550b32b250 Author: Nicholas Bellinger Date: Mon Mar 14 04:05:59 2011 -0700 [SCSI] target: Convert backend ->create_virtdevice() call to return ERR_PTR This patch converts the target_core_store_dev_enable() -> struct se_subsystem_api->create_virtdevice() call to return proper ERR_PTR values back up to configfs logic during backend dependent struct se_device ENABLE exception conditions. Along with the change to target_core_configfs.c, this includes converting IBLOCK, FILEIO, pSCSI, and RAMDISK_* backend subsystem plugins to obtain upper level PTR_ERR return codes (where available), and return via ERR_PTR during a *_create_virtdev() failure. Reported-by: Fubo Chen Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 5e8de4f3199446f5eeb371312da20534ebfe9979 Author: Christoph Hellwig Date: Mon Mar 14 04:05:58 2011 -0700 [SCSI] target: remove EXTRA_CFLAGS Add the current directory is superflous in general, and no includes in drivers/scsi are needed either. Signed-off-by: Christoph Hellwig Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 10635c8b71957449b4c53c5f6b9210cc1a7d984d Author: Nicholas Bellinger Date: Mon Mar 14 04:05:57 2011 -0700 [SCSI] target: tcm_mod_builder.py generated Makefile cleanups This patch converts the tcm_mod_builder.py generation script to create a new drivers/target/$TCM_FABRIC_MOD/Makefile and update drivers/target/Makefile, instead of creating+updating a 'Kbuild' filename. It also removes the remaining EXTRA_CFLAGS includes from tcm_mod_build_kbuild(), and converts fabric module generated .c code to us ""-style includes for $FABRIC_MOD_[base,fabric].h Reported-by: Christoph Hellwig Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 6d1802539d218e24492c651bd0687ebfe7e14831 Author: Jesper Juhl Date: Mon Mar 14 04:05:56 2011 -0700 [SCSI] target: Fix match_strdup() memory leaks match_strdup() dynamically allocates memory and it is the responsabillity of the caller to free that memory. The following three cases: drivers/target/target_core_file.c:fd_set_configfs_dev_params() drivers/target/target_core_iblock.c:iblock_set_configfs_dev_params() drivers/target/target_core_configfs.c:target_core_dev_pr_store_attr_res_aptpl_metadata() should be kfree()'ing the allocated memory once it is no longer needed. It also makes sure to return -ENOMEM if the memory allocation in match_strdup() should fail. For target_core_configfs.c, this patch adds kfree()'s around Opt_initiator_fabric, Opt_initiator_node, Opt_initiator_sid, Opt_sa_res_key, Opt_target_fabric, and Opt_target_node for the Persistent Reservations Activate Persistence across Target Power Loss (APTPL=1) token parsing. Signed-off-by: Jesper Juhl Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 8fc1858a42663248d5b362edc313786e0be7a639 Author: Roland Dreier Date: Mon Mar 14 04:05:55 2011 -0700 [SCSI] target: Fix memory leak on error path in pscsi_alloc_task If allocation of pt->pscsi_cdb fails, we need to free the just-allocated pt or else it will be leaked. Signed-off-by: Roland Dreier Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 4b3203052494ea7b0a445ace676cd2013917c807 Author: James Smart Date: Fri Mar 11 16:06:58 2011 -0500 [SCSI] lpfc 8.3.22: Update driver version to 8.3.22 Update driver version to 8.3.22 Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 792581de597c78ee353b6e2a06490f0ef576032e Author: James Smart Date: Fri Mar 11 16:06:44 2011 -0500 [SCSI] lpfc 8.3.22: Update Copyright Dates Update Copyright Dates Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 546fc854d0faa76358d1deffd2c4f6b8598bf5f2 Author: James Smart Date: Fri Mar 11 16:06:29 2011 -0500 [SCSI] lpfc 8.3.22: FC Discovery fixes FC Discovery fixes - In lpfc_sli4_bpl2sgl byte swapping the SGL in word2. - In lpfc_sli4_iocb2wqe byteswap the data for CMD_GEN_REQUEST64_CR type WQE. - In lpfc_sli4_seq_abort_acc do not set the oxid into the iocb's xritag field. - In lpfc_sli4_seq_abort_acc check the return value of lpfc_sli_issue_iocb. - Inprove messages in this area. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 9940b97bb30d7435c881418c809ed652eb329583 Author: James Smart Date: Fri Mar 11 16:06:12 2011 -0500 [SCSI] lpfc 8.3.22: Add support for PCI Adapter Failure Periodically poll adapter registers to detect pci adapter failure (reads return -1). On failure, take port offline, set error indicators and wake up worker threads. Threads will take adapter offline. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 7f86059ac016d8662e5fbfab4875529510977b47 Author: James Smart Date: Fri Mar 11 16:05:52 2011 -0500 [SCSI] lpfc 8.3.22: T10-DIF corrections T10-DIF corrections - Add selective reset jump table entry - Split T10-DIF BDEs that cross 4K boundary Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 5a6f133eea2d0b4f8f75367b803fef0f03acf268 Author: James Smart Date: Fri Mar 11 16:05:35 2011 -0500 [SCSI] lpfc 8.3.22: Add new mailbox command and new BSG fix - Add new Queue Create Mailbox version support - Make lpfc_bsg_wake_mbox_wait routine check the mailboxes job reference before using it. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit d1e12de804f9d8ad114786ca7c2ce593cba79891 Author: Krishnasamy, Somasundaram Date: Mon Feb 28 18:13:22 2011 -0500 [SCSI] ses: Avoid kernel panic when lun 0 is not mapped During device discovery, scsi mid layer sends INQUIRY command to LUN 0. If the LUN 0 is not mapped to host, it creates a temporary scsi_device with LUN id 0 and sends REPORT_LUNS command to it. After the REPORT_LUNS succeeds, it walks through the LUN table and adds each LUN found to sysfs. At the end of REPORT_LUNS lun table scan, it will delete the temporary scsi_device of LUN 0. When scsi devices are added to sysfs, it calls add_dev function of all the registered class interfaces. If ses driver has been registered, ses_intf_add() of ses module will be called. This function calls scsi_device_enclosure() to check the inquiry data for EncServ bit. Since inquiry was not allocated for temporary LUN 0 scsi_device, it will cause NULL pointer exception. To fix the problem, sdev->inquiry is checked for NULL before reading it. Signed-off-by: Somasundaram Krishnasamy Signed-off-by: Babu Moger Cc: stable@kernel.org Signed-off-by: James Bottomley commit 463b8977ecebf8cf590c33191d43ea0b059381c6 Author: HighPoint Linux Team Date: Wed Feb 23 16:28:44 2011 +0800 [SCSI] mvsas: Add support for HighPoint RR27xx series HBA This patch is to add support for HighPoint RR27xx SAS/SATA HBA which is based on Marvell 88SE9480 chipset. Signed-off-by: HighPoint Linux Team Signed-off-by: James Bottomley commit 523f3c80bc41d663d5b35c0cd6ce0fad7f3e7188 Author: Vasiliy Kulikov Date: Fri Feb 4 15:24:14 2011 +0300 [SCSI] scsi_transport_iscsi: make priv_sess file writeable only by root Signed-off-by: Vasiliy Kulikov Acked-by: Mike Christie Signed-off-by: James Bottomley commit 877a55979c189c590e819a61cbbe2b7947875f17 Author: John Hughes Date: Wed Nov 4 19:01:22 2009 +0100 [SCSI] ses: show devices for enclosures with no page 7 enclosure page 7 gives us the "pretty" names of the enclosure slots. Without a page 7, we can still use the enclosure code as long as we make up numeric names for the slots. Unfortunately, the current code fails to add any devices because the check for page 10 is in the wrong place if we have no page 7. Fix it so that devices show up even if the enclosure has no page 7. Cc: stable@kernel.org Signed-off-by: James Bottomley commit 7415982732bcb30100582cff8d2aca12a55123b4 Merge: 9f6af27 9298168 Author: Tony Luck Date: Wed Mar 23 09:13:47 2011 -0700 Merge branches 'pstore-fixes' and 'syscalls2' into release commit 68cacd29167b1926d237bd1b153aa2a990201729 Author: Stephane Eranian Date: Wed Mar 23 16:03:06 2011 +0100 perf_events: Fix stale ->cgrp pointer in update_cgrp_time_from_cpuctx() This patch solves a stale pointer problem in update_cgrp_time_from_cpuctx(). The cpuctx->cgrp was not cleared on all possible event exit paths, including: close() perf_release() perf_release_kernel() list_del_event() This patch fixes list_del_event() to clear cpuctx->cgrp when there are no cgroup events left in the context. [ This second version makes the code compile when CONFIG_CGROUP_PERF is not enabled. We unconditionally define perf_cpu_context->cgrp. ] Signed-off-by: Stephane Eranian Cc: peterz@infradead.org Cc: perfmon2-devel@lists.sf.net Cc: paulus@samba.org Cc: davem@davemloft.net LKML-Reference: <20110323150306.GA1580@quad> Signed-off-by: Ingo Molnar commit 4bbba111d94781d34081c37856bbc5eb33f6c72a Merge: 2130781 ce24f58 Author: Linus Torvalds Date: Wed Mar 23 07:58:09 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: HDA: Realtek: Avoid unnecessary volume control index on Surround/Side ASoC: Support !REGULATOR build for sgtl5000 ALSA: hda - VIA: Fix VT1708 can't build up Headphone control issue ALSA: hda - VIA: Correct stream names for VT1818S ALSA: hda - VIA: Fix codec type for VT1708BCE at the right timing ALSA: hda - VIA: Fix invalid A-A path volume adjust issue ALSA: hda - VIA: Add missing support for VT1718S in A-A path ALSA: hda - VIA: Fix independent headphone no sound issue ALSA: hda - VIA: Fix stereo mixer recording no sound issue ALSA: hda - Set EAPD for Realtek ALC665 ALSA: usb - Remove trailing spaces from USB card name strings sound: read i_size with i_size_read() ASoC: Remove bogus check for register validity in debugfs write ASoC: mini2440: Fix uda134x codec problem. commit 2130781e2aaab66e5a9f2fdc8af35da0153f405c Author: Cesar Eduardo Barros Date: Tue Mar 22 23:03:13 2011 -0300 sys_swapon: fix inode locking A conflict between 52c50567d8ab ("mm: swap: unlock swapfile inode mutex before closing file on bad swapfiles") and 83ef99befc32 ("sys_swapon: remove did_down variable") caused a double unlock of the inode mutex (once in bad_swap: before the filp_close, once at the end just before returning). The patch which added the extra unlock cleared did_down to avoid unlocking twice, but the other patch removed the did_down variable. To fix, set inode to NULL after the first unlock, since it will be used after that point only for the final unlock. While checking this patch, I found a path which could unlock without locking, in case the same inode was added as a swapfile twice. To fix, move the setting of the inode variable further down, to just before claim_swapfile, which will lock the inode before doing anything else. Cc: Mel Gorman Cc: Hugh Dickins Cc: Eric B Munson Cc: KAMEZAWA Hiroyuki Cc: Andrew Morton Signed-off-by: Cesar Eduardo Barros Signed-off-by: Linus Torvalds commit 04948c7f80b9446009c1c4791bb93e79729724fb Author: Heiko Carstens Date: Wed Mar 23 08:24:58 2011 +0100 smp: add missing init.h include Commit 34db18a054c6 ("smp: move smp setup functions to kernel/smp.c") causes this build error on s390 because of a missing init.h include: CC arch/s390/kernel/asm-offsets.s In file included from /home2/heicarst/linux-2.6/arch/s390/include/asm/spinlock.h:14:0, from include/linux/spinlock.h:87, from include/linux/seqlock.h:29, from include/linux/time.h:8, from include/linux/timex.h:56, from include/linux/sched.h:57, from arch/s390/kernel/asm-offsets.c:10: include/linux/smp.h:117:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'setup_nr_cpu_ids' include/linux/smp.h:118:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'smp_init' Fix it by adding the include statement. Signed-off-by: Heiko Carstens Acked-by: WANG Cong Signed-off-by: Linus Torvalds commit 05a5f01c68e70f2b290db5faed00990daaff3990 Author: Guennadi Liakhovetski Date: Wed Mar 23 09:29:16 2011 +0000 ARM: mach-shmobile: add coherent DMA mask to CEU camera devices Cameras are currently broken on ARM sh-mobile platforms. They need a suitable coherent DMA mask. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 1fbdfcdeac3ec49b5fbb5a882ed8ce3309a73b6d Author: Magnus Damm Date: Mon Mar 21 07:49:45 2011 +0000 ARM: mach-shmobile: Dynamic backlight control for Mackerel Use GPIO_PORT31 to control the backlight on the Mackerel board. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit bd23a539d0733c9f9ec3f9fc628491fad2658e82 Author: Al Viro Date: Wed Mar 23 09:56:30 2011 -0400 fix leaks in path_lookupat() Signed-off-by: Al Viro commit fb7f045ace0624f1e59a7db8497e460bd54b1cbc Author: David Engraf Date: Wed Mar 23 11:35:42 2011 +0000 sh: Fix ptrace hw_breakpoint handling Since commit 34d0b5af50a063cded842716633501b38ff815fb it is no longer possible to debug an application using singlestep. The old commit converted singlestep handling via ptrace to hw_breakpoints. The hw_breakpoint is disabled when an event is triggered and not re-enabled again. This patch re-enables the existing hw_breakpoint before the existing breakpoint is reused. Signed-off-by: David Engraf Cc: stable@kernel.org Signed-off-by: Paul Mundt commit c49b6ecf0870e78fa40497cd8b142915c1d5c7c9 Author: Phil Edworthy Date: Fri Mar 18 14:16:31 2011 +0000 sh: Fix ptrace fpu state initialisation Commit 0ea820cf introduced the PTRACE_GETFPREGS/SETFPREGS cmds, but gdb-server still accesses the FPU state using the PTRACE_PEEKUSR/POKEUSR commands. In this case, xstate was not initialised. Signed-off-by: Phil Edworthy Cc: stable@kernel.org Signed-off-by: Paul Mundt commit 1232d6132a986125f6a687ab9b61a4330e319270 Author: Borislav Petkov Date: Tue Mar 22 18:46:18 2011 +0100 sched, doc: Update sched-design-CFS.txt Correct ->dequeue_tree() thinko into sched_class->dequeue_task and drop all references to ->task_new() since it is obviously gone. Signed-off-by: Borislav Petkov Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <1300815978-16618-1-git-send-email-bp@amd64.org> Signed-off-by: Ingo Molnar commit dec2960827c85253d76938dbfa909df3be34958b Author: Sergey Senozhatsky Date: Wed Mar 23 14:38:28 2011 +0200 lockdep: Remove unused 'factor' variable from lockdep_stats_show() Signed-off-by: Sergey Senozhatsky Cc: Peter Zijlstra LKML-Reference: <20110323123828.GB4244@swordfish.minsk.epam.com> Signed-off-by: Ingo Molnar commit 20dd67407160eac577656cd2f8ee9a1fead960b8 Author: Sergey Senozhatsky Date: Wed Mar 23 13:17:23 2011 +0200 sched: Remove unused 'rq' variable and cpu_rq() call from alloc_fair_sched_group() Signed-off-by: Sergey Senozhatsky Cc: Steven Rostedt Cc: Peter Zijlstra LKML-Reference: <20110323111722.GA4244@swordfish.minsk.epam.com> Signed-off-by: Ingo Molnar commit e815f0a84fc9a98e5cc3ef0b520122e5e18520e7 Author: Jonathan Neuschäfer Date: Mon Mar 21 20:24:47 2011 +0100 sched.h: Fix a typo ("its") The sentence uses the possessive pronoun, which is spelled without an apostrophe. Signed-off-by: Jonathan Neuschäfer Cc: Jiri Kosina Cc: Peter Zijlstra LKML-Reference: <1300735487-2406-1-git-send-email-j.neuschaefer@gmx.net> Signed-off-by: Ingo Molnar commit ce24f58a1187ca3058d72c3f897e3b574209ab20 Merge: 5a88264 333802e Author: Takashi Iwai Date: Wed Mar 23 12:05:01 2011 +0100 Merge branch 'topic/asoc' into for-linus commit 3f4caa8157449b96f8b166c7a98ee40c4bc35a55 Author: Paul Mundt Date: Wed Mar 23 19:16:34 2011 +0900 sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED. Now that the in-tree offenders have seemingly all caught up, we can finally unconditionally select this. Signed-off-by: Paul Mundt commit d4cc183f7b9f639a048291e9cd95f0c255664b98 Author: Paul Mundt Date: Wed Mar 23 19:05:18 2011 +0900 sh: pmb: Use struct syscore_ops instead of sysdevs This converts the PMB code over to use the new syscore_ops and kills off the old sysdev utilization, as per Rafael's example. Signed-off-by: Paul Mundt commit a696b89c582e3201ef10bfb0d0b3594e29b75e0f Author: Rafael J. Wysocki Date: Tue Mar 22 20:19:28 2011 +0000 sh: Use struct syscore_ops instead of sysdevs Convert the SuperH clocks framework and shared interrupt handling code to using struct syscore_ops instead of a sysdev classes and sysdevs for power managment. This reduces the code size significantly and simplifies it. The optimizations causing things not to be restored after creating a hibernation image are removed, but they might lead to undesirable effects during resume from hibernation (e.g. the clocks would be left as the boot kernel set them, which might be not the same way as the hibernated kernel had seen them before the hibernation). This also is necessary for removing sysdevs from the kernel entirely in the future. Signed-off-by: Rafael J. Wysocki Signed-off-by: Paul Mundt commit 316b6cc081b112546842d44ded21512bd8454a85 Author: Mark Brown Date: Fri Mar 18 12:50:10 2011 +0000 mfd: Push byte swaps out of wm8994 bulk read path For consistency with the write path push byte swaps of the WM8994 register data out of the bulk read data path into the per-register APIs. The only user of the bulk register read is the interrupt code which is updated to do the swaps itself part of this patch. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 8bd4d7c4c500e88bff975bbcb7fe0d89da319cdd Author: Linus Walleij Date: Tue Mar 15 14:26:37 2011 +0100 mfd: Rename ab8500 gpadc header Rename AB8500 GPADC header so as not to be redunantly named. Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 07e73fbb2d52434e6b61019326f35040357e8efb Author: Mark Brown Date: Thu Mar 17 21:42:30 2011 +0000 mfd: Constify WM8994 write path Allow const buffers to be passed in without type safety issues. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 4277163c2a451fd8db0883cde5e55cf61a70fe85 Author: Mark Brown Date: Thu Mar 17 21:42:29 2011 +0000 mfd: Push byte swap out of WM8994 bulk I/O For bulk I/O it is both convenient and more sensible to pre-swap the data rather than doing the swap as part of the I/O operation so move the byte swaps we're currently doing into the core write function into the register based functions, giving the bulk write function a straight pass through to the chip. This leaves reads inconsistent, this will be addressed as a followup patch. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 334e9ab8f9bb90ddf1eff0b07609961a628064b6 Author: Mark Brown Date: Thu Mar 17 21:42:28 2011 +0000 mfd: Avoid copying data in WM8994 I2C write As well as providing a trivial performance optimisation this also avoids allocating a copy of the message on the stack which is beneficial when doing large transfers. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 4c4d887822070410e3be519e1a4ff933fb899ba8 Author: Mark Brown Date: Thu Mar 17 21:40:51 2011 +0000 mfd: Remove copy from WM831x I2C write function This saves us allocating an array on the stack, giving a meaningless performance improvement and ensuring that if drivers ever do large writes we'll not allocate large arrays on the stack. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit aad343107b4c153dd9f3ffc3d0f32558a25438e9 Author: Mark Brown Date: Thu Mar 17 16:33:49 2011 +0000 mfd: Staticise WM8994 PM ops They're not exported. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 2edd3b692404efc2d3915175a2ed553e783de763 Author: Linus Walleij Date: Wed Mar 9 12:02:55 2011 +0000 regulator: Add a subdriver for TI TPS6105x regulator portions v2 This adds a subdriver for the regulator found inside the TPS61050 and TPS61052 chips. Cc: Samuel Ortiz Cc: Ola Lilja Cc: Jonas Aberg Signed-off-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit 798a8eee44da56b4f2e000ff81dfb49d09c65b71 Author: Linus Walleij Date: Wed Mar 9 13:02:38 2011 +0100 mfd: Add a core driver for TI TPS61050/TPS61052 chips v2 The TPS61050/TPS61052 are boost converters, LED drivers, LED flash drivers and a simple GPIO pin chips. Cc: Liam Girdwood Cc: Mark Brown Cc: Jonas Aberg Cc: Ola Lilja Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit f04ddfcd24bf3c1f987eaf634a84998044e616d3 Author: Denis Turischev Date: Mon Mar 14 12:53:05 2011 +0200 gpio: Add Tunnel Creek support to sch_gpio Almost the same driver for both Poulsbo and Tunnel Creek. The difference is in quantity of GPIOs powered by the core power rail and by suspend power supply, default values for some GPIOs, etc. Detect actual hardware by platform device ID assigned in lpc_sch and set configuration accordingly. Signed-off-by: Denis Turischev Acked-by: Grant Likely Signed-off-by: Samuel Ortiz commit e967f77d9818df884bdffb3e801eb12e0fd52b1c Author: Denis Turischev Date: Sun Mar 13 17:28:59 2011 +0200 mfd: Add Tunnel Creek support to lpc_sch Intel Poulsbo SCH and Tunnel Creek provide almost the same LPC interface. Use the same driver for both devices while storing PCI ID to distinguish between platforms to apply plarform related quirks. Signed-off-by: Denis Turischev Signed-off-by: Samuel Ortiz commit c4fdd1163a37b498890564135cb61643ec93e5a3 Author: Denis Turischev Date: Sun Mar 13 17:26:40 2011 +0200 pci_ids: Add Intel Tunnel Creek LPC Bridge device ID. Signed-off-by: Denis Turischev Acked-by: Jesse Barnes Signed-off-by: Samuel Ortiz commit bd6ca2cf50fbe3cc63513d026343035c3bd2e352 Author: MyungJoo Ham Date: Fri Mar 11 11:34:44 2011 +0900 regulator: MAX8997/8966 support This patch supports PMIC/Regulator part of MAX8997/MAX8966 MFD. In this initial release, selecting voltages or current-limit and switching on/off the regulators are supported. Controlling voltages for DVS with GPIOs is not implemented fully and requires more considerations: it controls multiple bucks (selection of 1, 2, and 5) at the same time with SET1~3 gpios. Thus, when DVS-GPIO is activated, we lose the ability to control the voltage of a single buck regulator independently; i.e., contolling a buck affects other two bucks. Therefore, using the conventional regulator framework directly might be problematic. However, in this driver, we try to choose a setting without such side effect of affecting other regulators and then try to choose a setting with the minimum side effect (the sum of voltage changes in other regulators). On the other hand, controlling all the three bucks simultenously based on the voltage set table may help build cpufreq and similar system more robust; i.e., all the three voltages are consistent every time without glitches during transition. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit e93c53870c6d77c40de8981da238af947d6aa084 Author: Mark Brown Date: Thu Mar 10 13:54:07 2011 +0000 mfd: Add WM8994 bulk register write operation Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 09b034191acd1f95a749630fe366a84d3029930c Author: Haojian Zhuang Date: Mon Mar 7 23:43:16 2011 +0800 mfd: Append additional read write on 88pm860x Append the additional read/write operation on 88pm860x for accessing test page in 88PM860x. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit c9f560b3d0222f6a6e3faeda324e786e230e4f20 Author: Haojian Zhuang Date: Mon Mar 7 23:43:12 2011 +0800 mfd: Adopt mfd_data in 88pm860x input driver Copy 88pm860x platform data into different mfd_data structure for onkey/touch/codec/power driver. So move the identification of device node from those drivers to mfd driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 22aad0011e4728a29bf3775b6f5e2f9677abd8c0 Author: Haojian Zhuang Date: Mon Mar 7 23:43:11 2011 +0800 mfd: Adopt mfd_data in 88pm860x regulator Copy 88pm860x platform data into different mfd_data structure for regulator driver. So move the identification of device node from regulator driver to mfd driver. Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit 3154c344696e58b7e15317cd624816dbe3832ad1 Author: Haojian Zhuang Date: Mon Mar 7 23:43:10 2011 +0800 mfd: Adopt mfd_data in 88pm860x led Copy 88pm860x platform data into different mfd_data structure for led driver. So move the identification of device node from led driver to mfd driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit adb70483f4d560323db9aaca5f066fde4d96f339 Author: Haojian Zhuang Date: Mon Mar 7 23:43:09 2011 +0800 mfd: Adopt mfd_data in 88pm860x backlight Copy 88pm860x platform data into different mfd_data structure for backlight driver. So move the identification of device node from backlight driver to mfd driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit d7e8c01a97429101cb0ca2c09380e683c3814af8 Author: Randy Dunlap Date: Mon Mar 14 11:28:37 2011 +0100 mfd: Fix MAX8997 Kconfig entry typos Signed-off-by: Samuel Ortiz commit 0ea3e83bd8d198f2a18e0066542f8670b2883890 Author: Axel Lin Date: Mon Mar 7 11:02:29 2011 +0800 mfd: Add "platform:" prefix for twl4030-madc platform modalias Since 43cc71eed1250755986da4c0f9898f9a635cb3bf (platform: prefix MODALIAS with "platform:"), the platform modalias is prefixed with "platform:". Signed-off-by: Axel Lin Signed-off-by: Samuel Ortiz commit 4aad5a918c919c04b6c3136f3c4dcafada3b6319 Author: Karl Komierowski Date: Sat Mar 5 11:46:45 2011 +0100 mfd: Fix ab8500-gpadc to measure charger current The GPADC in the AB8500 was incorrectly configured when a charger current channel was selected. Signed-off-by: Karl Komierowski Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 586f3318adceee4857e82cafc3610070368754e3 Author: Johan Palsson Date: Sat Mar 5 11:46:37 2011 +0100 mfd: Calibrate ab8500 gpadc using OTP values The GPADC found in the AB8500 needs to be calibrated to work properly. This is done by writing a number of special OTP (one-time-programmable) registers at production. This patch makes sure that these values are used to calibrate the returned value from the GPADC so that it is correct. Signed-off-by: Johan Palsson Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 633e0fa59072f5d78227191b212cb12ad3d21902 Author: Daniel Willerud Date: Sat Mar 5 11:46:27 2011 +0100 mfd: Free dangling irq in ab8500 gpadc probe error path Signed-off-by: Daniel Willerud Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 6321992cd3c56bab6cc52e3384951e12616805a1 Author: Daniel Willerud Date: Sat Mar 5 11:46:13 2011 +0100 mfd: Reentrance and revamp ab8500 gpadc fetching interface This revamps the interface so that AB8500 GPADCs are fetched by name. Probed GPADCs are added to a list and this list is searched for a matching GPADC. This makes it possible to have multiple AB8500 GPADC instances instead of it being a singleton, and rids the need to keep a GPADC pointer around in the core AB8500 MFD struct. Currently the match is made to the device name which is by default numbered from the device instance such as "ab8500-gpadc.0" but by using the .init_name field of the device a more intiutive naming for the GPADC blocks can be achieved if desired. Signed-off-by: Daniel Willerud Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit cf16943947cef089c564d2be0ae9d96a285f495e Author: Daniel Willerud Date: Sat Mar 5 11:46:01 2011 +0100 mfd: Move ab8500 gpadc header to subdir This moves the ab8500-gpadc.h header down into the ab8500/ subdir in include/linux/mfd and fixes some whitespace in the header in the process. Signed-off-by: Daniel Willerud Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 527e7e9a82ec95cdb8f694855004b3d262efd09f Author: MyungJoo Ham Date: Fri Mar 4 15:50:26 2011 +0900 mfd: MAX8997/8966 support MAX8997/MAX8966 chip is a multi-function device with I2C bussses. The chip includes PMIC, RTC, Fuel Gauge, MUIC, Haptic, Flash control, and Battery (charging) control. This patch is an initial release of a MAX8997/8966 driver that supports to enable the chip with its primary I2C bus that connects every device mentioned above except for Fuel Gauge, which uses another I2C bus. The fuel gauge is not supported by this mfd driver and is supported by a seperated driver of MAX17042 Fuel Gauge (yes, the fuel gauge part is compatible with MAX17042). Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Reviewed-by: Mark Brown Signed-off-by: Samuel Ortiz commit f77289ac25b0c81acbed6f9c17cb14809a04e18b Author: Andres Salomon Date: Thu Mar 3 09:51:58 2011 -0800 mfd: Rename mfd_shared_cell_{en,dis}able to drop the "shared" part As requested by Samuel, there's not really any reason to have "shared" in the name. This also modifies the only user of the function, as well. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 7e5dc1f7004832f797999dfb3498a68a6c16ef73 Author: Andres Salomon Date: Tue Mar 1 13:55:07 2011 -0800 w1: Silence ds1wm warnings related to mfd_get_cell changes mfd_get_cell returns a const, so change the ds1wm client to store a const mfd cell. This silences type mismatch warnings. Since we're guaranteed to have the mfd_cell, we can also simplify the code a bit to get rid of a temporary variable and NULL check. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit e5c238c3fde93afdddef36aec2642155c709d93a Author: Mattias Wallin Date: Wed Mar 2 11:52:36 2011 +0100 mfd: ab8500-core switch off status added This patch adds a sysfs file with the ab8500 switch off status. The switch off status contains information of what caused the ab8500 chip to power off. A print during boot is also added. Signed-off-by: Mattias Wallin Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz commit adceed6263887e04721b477e6504aa24789f827d Author: Mattias Wallin Date: Wed Mar 2 11:51:11 2011 +0100 mfd: ab8500 chip revision 3.0 support This patch adds support for ab8500 chip revision cut 3.0. Also rephrased from Changes to Author in the header. Signed-off-by: Mattias Wallin Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz commit e9300066bbd21c4fba3c8c5475c6a21d9c97694e Author: Andres Salomon Date: Tue Mar 1 13:35:48 2011 -0800 jz4740: silence warnings related to mfd_get_cell changes mfd_get_cell returns a const, so change the jz4740 clients to store a const mfd cell. This silences type mismatch warnings. Signed-off-by: Andres Salomon Acked-by: Anton Vorontsov Signed-off-by: Samuel Ortiz commit 944dc03551f6e812c00e586edba84b28c52ffe8c Author: Andres Salomon Date: Tue Mar 1 12:32:20 2011 -0800 tmio: Silence warnings introduced by mfd changes This silences warnings such as drivers/video/tmiofb.c: In function 'tmiofb_hw_init': drivers/video/tmiofb.c:270: warning: initialization discards qualifiers from pointer target type These were added by me in commit 2a79bb1d. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 93619c2106e2c968a260ebffb75ddc5efa567c16 Author: Mark Brown Date: Tue Mar 1 20:12:46 2011 +0000 mfd: Add platform data to support multiple WM831x devices per board If a system contains multiple WM831x devices we need to pass a device number through to the MFD so that we use unique device IDs when we instantiate child devices. In order to get support for this into 2.6.39 add some platform data to support the configuration, but no implementation as yet. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit d664f20020e0a3564d7aaba6625aa58d24283b7d Author: Mark Brown Date: Tue Mar 1 20:12:45 2011 +0000 mfd: Convert WM8994/58 interrupt masking to enable/disable operations The WM8994/58 interrupt masking support is a much better match for the genirq enable and disable operations than for the mask and unmask operations. The latter are intended to used during interrupt handling for temporary changes which isn't really practical on a slow bus. Convert the operations over to match this. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit f624effb7354814d062f149c8a1e2c46a44acb1f Author: Mark Brown Date: Tue Mar 1 20:12:44 2011 +0000 mfd: Convert WM831x interrupt masking to enable/disable operations The WM831x interrupt masking support is a much better match for the genirq enable and disable operations than for the mask and unmask operations. The latter are intended to used during interrupt handling for temporary changes which isn't really practical on a slow bus. Convert the operations over to match this. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 0070bddfe7275e5bc763884a8ac59651f4e79eab Author: Keerthy Date: Tue Mar 1 19:12:36 2011 +0530 hwmon: twl4030: Hwmon Driver for TWL4030 MADC This driver exposes the sysfs nodes of the TWL4030 MADC module. All the voltage channel values are expressed in terms of mV. Channel 13 and channel 14 are reserved. There are channels which represent temperature and current the output is represented by celcius and mA respectively. Signed-off-by: Keerthy Acked-by: Guenter Roeck Signed-off-by: Samuel Ortiz commit f99c1d4f94f91fd3a20bd2eaa3be9c5e7d2668eb Author: Keerthy Date: Tue Mar 1 19:12:26 2011 +0530 mfd: Add twl4030 madc driver Introducing a driver for MADC on TWL4030 powerIC. MADC stands for monitoring ADC. This driver monitors the real time conversion of analog signals like battery temperature, battery cuurent etc. Signed-off-by: Keerthy Signed-off-by: Samuel Ortiz commit bcd2f639629b58fbc702bb8be348a03e75472021 Author: Axel Lin Date: Mon Feb 28 14:34:27 2011 +0800 mfd: Add MODULE_DEVICE_TABLE to vx855 The device table is required to load modules based on modaliases. After adding the MODULE_DEVICE_TABLE, below entries will be added to modules.pcimap: vx855 0x00001106 0x00008409 0xffffffff 0xffffffff 0x00000000 0x00000000 0x0 Signed-off-by: Axel Lin Acked-by: Harald Welte Signed-off-by: Samuel Ortiz commit 7679089debfbffc9243b41664e348412f9df1639 Author: Axel Lin Date: Mon Feb 28 14:33:12 2011 +0800 mfd: Add MODULE_DEVICE_TABLE to pcf50633-core The device table is required to load modules based on modaliases. After adding the MODULE_DEVICE_TABLE, below entries will be added to modules.alias: alias i2c:pcf50633 pcf50633 Signed-off-by: Axel Lin Acked-by: Harald Welte Signed-off-by: Samuel Ortiz commit 6991ec255af960e1349a21ec2782ea67408b7eb6 Author: Axel Lin Date: Mon Feb 28 14:32:15 2011 +0800 mfd: Add MODULE_DEVICE_TABLE to mc13xxx-core The device table is required to load modules based on modaliases. After adding the MODULE_DEVICE_TABLE, below entries will be added to modules.alias: alias spi:mc13892 mc13xxx_core alias spi:mc13783 mc13xxx_core Signed-off-by: Axel Lin Acked-by: Uwe Kleine-König Signed-off-by: Samuel Ortiz commit 1310e6d638b302bd9cd064f8de7dcd546bb7f597 Author: Andres Salomon Date: Thu Feb 17 19:07:36 2011 -0800 mfd: Add sharing for cs5535 acpi/pms cells This enables sharing of cs5535-mfd cells via the new mfd_shared_* API. Hooks for enable/disble of resources are added, with refcounting of resources being automatically handled so that cs5535_mfd_res_enable/disable are only called when necessary. Clients of cs5535-mfd (in this case, olpc-xo1.c) are also modified to use the mfd_shared API. The platform drivers are also renamed to olpc-xo1-{pms,acpi}, and resource enabling/disabling is replaced with mfd_shared API calls. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit a9bbba996302344b1fac7773cf8198f6fee35ac1 Author: Andres Salomon Date: Thu Feb 17 19:07:35 2011 -0800 mfd: add platform_device sharing support for mfd This adds functions to enable platform_device sharing for mfd clients. Each platform driver (mfd client) that wants to share an mfd_cell's platform_device uses the mfd_shared_platform_driver_{un,}register() functions instead of platform_driver_{un,}register(). Along with registering the platform driver, these also register a new platform device with the same characteristics as the original cell, but a different name. Given an mfd_cell with the name "foo", drivers that want to share access to its resources can call mfd_shared_platform_driver_register with platform drivers named (for example) "bar" and "baz". This will register two platform devices and drivers named "bar" and "baz" that share the same cell as the platform device "foo". The drivers can then call "foo" cell's enable hooks (or mfd_shared_cell_enable) to enable resources, and obtain platform resources as they normally would. This deals with platform handling only; mfd driver-specific details, hardware handling, refcounting, etc are all dealt with separately. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 1e29af62f2b285bd18685da93c3ce8c33ca2d1db Author: Andres Salomon Date: Thu Feb 17 19:07:34 2011 -0800 mfd: Add refcounting support to mfd_cells This provides convenience functions for sharing of cells across multiple mfd clients. Mfd drivers can provide enable/disable hooks to actually tweak the hardware, and clients can call mfd_shared_cell_{en,dis}able without having to worry about whether or not another client happens to have enabled or disabled the cell/hardware. Note that this is purely optional; drivers can continue to use the mfd_cell's enable/disable hooks for their own purposes, if desired. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit dcb50e83bb86d66d3554ba9c365488669c84d037 Author: Andres Salomon Date: Thu Feb 17 19:07:33 2011 -0800 mfd: Remove driver_data field from mfd_cell All users of this have now been switched over to using mfd_data; it can go away now. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 46673ed2cdca85afa7c69d126e3778bba2dbd2d5 Author: Andres Salomon Date: Thu Feb 17 19:07:32 2011 -0800 rdc321x-southbridge: Use mfd_data instead of driver_data Use mfd_data for passing information from mfd drivers to soc clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 6d90bdde4b7b8e0f403bc3641fcddea733bddf77 Author: Andres Salomon Date: Thu Feb 17 19:07:31 2011 -0800 fb: Use mfd_data instead of driver_data for tmio-fb Use mfd_data for passing information from mfd drivers to mfd clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). This changes tmio-fb only; mfd drivers with other cells are not modified. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit d9d01f4b2697b410625fce288bd1196927994093 Author: Andres Salomon Date: Thu Feb 17 19:07:30 2011 -0800 mtd: Use mfd_data instead of driver_data for tmio_nand Use mfd_data for passing information from mfd drivers to mfd clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). This changes tmio-nand only; mfd drivers with other cells are not modified. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 4f95bf404870cccb08ff6d59e1986d43aee5efb6 Author: Andres Salomon Date: Thu Feb 17 19:07:29 2011 -0800 mmc: Use mfd_data instead of driver_data for tmio-mmc Use mfd_data for passing information from mfd drivers to mfd clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). This changes tmio-mmc only; mfd drivers with other cells are not modified. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit fcd67979d3808afbe357048d928470ef9b37cd4b Author: Andres Salomon Date: Thu Feb 17 19:07:28 2011 -0800 w1: Use mfd_data instead of driver_data for dsw1wm.c Use mfd_data for passing information from mfd drivers to mfd clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). This changes ds1wm only; mfd drivers with other cells are not modified, with the exception of led_cell. The led_cell.driver_data line is dropped from htc-pasic3.c in this patch as well. It's not used in mainline (there's no leds-pasic3 platform driver), so it should be safe to take care of that here. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit dab1547a011b221308b6e991405677c78e1a8956 Author: Andres Salomon Date: Thu Feb 17 19:07:27 2011 -0800 asoc: wm8400-codec: Use mfd_data instead of driver_data Use mfd_data for passing information from mfd drivers to soc clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). Signed-off-by: Andres Salomon Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit d57763370e1e12dd72e5a7bc6d6a7644e0003593 Author: Andres Salomon Date: Mon Feb 28 17:24:03 2011 +0100 asoc: davinci_voicecodec: use mfd_data instead of driver_data Use mfd_data for passing information from mfd drivers to soc clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). Signed-off-by: Andres Salomon Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit 65e523595a31813c0f20ffd249792c60e253438e Author: Andres Salomon Date: Thu Feb 17 19:07:25 2011 -0800 mfd: Rename platform_data field of mfd_cell to mfd_data Rename the platform_data variable to imply a distinction between common platform_data driver usage (typically accessed via pdev->dev.platform_data) and the way MFD passes data down to clients (using a wrapper named mfd_get_data). All clients have already been changed to use the wrapper function, so this can be a quick single-commit change that only touches things in drivers/mfd. Signed-off-by: Andres Salomon Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 40e03f571b2e63827f2afb90ea9aa459612c29e3 Author: Andres Salomon Date: Thu Feb 17 19:07:24 2011 -0800 mfd: Drop data_size from mfd_cell struct Now that there are no more users of this, drop it. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 4ec1b54c4d082d4bad19b55ca709da7e7138d542 Author: Andres Salomon Date: Thu Feb 17 19:07:23 2011 -0800 mfd: mfd_cell is now implicitly available to mc13xxx drivers The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Note that mfd-core no longer makes a copy of platform_data, but the mc13xxx-core driver creates the pdata structures on the stack. In order to get around that, the various ARM mach types that set the pdata have been changed to hold the variable in static (global) memory. Also note that __initdata references in aforementioned pdata structs have been dropped. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 8615e4cba1d3a0f15b9a4da9f32f8fbc3488fa54 Author: Andres Salomon Date: Thu Feb 17 19:07:22 2011 -0800 mfd: mfd_cell is now implicitly available to janz drivers The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 6a3521ad3db45066d4ca38652dd0b57ea2fd0a30 Author: Andres Salomon Date: Thu Feb 17 19:07:21 2011 -0800 mfd: mfd_cell is now implicitly available to tc6387xb drivers No need to explicitly set the cell's platform_data/data_size. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 0638d56fbb6cf8367fcf01a1febf6a191b0e0704 Author: Andres Salomon Date: Thu Feb 17 19:07:20 2011 -0800 mfd: mfd_cell is now implicitly available to twl4030 drivers The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon Acked-by: Peter Ujfalusi Signed-off-by: Samuel Ortiz commit 7d76ac15ad1a8d8b1a7b7b4f6be7a9d8dfd225bf Author: Andres Salomon Date: Thu Feb 17 19:07:19 2011 -0800 mfd: mfd_cell is now implicitly available to tc6393xb drivers No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 410b09172787a930753fa5ed904d820e3a9d7a1f Author: Andres Salomon Date: Thu Feb 17 19:07:18 2011 -0800 mfd: mfd_cell is now implicitly available to sh_mobile_sdhi drivers No need to explicitly set the cell's platform_data/data_size. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 15de7a41d30cfe8090efdc5fd6a92ed7a2d80ce7 Author: Andres Salomon Date: Thu Feb 17 19:07:17 2011 -0800 mfd: mfd_cell is now implicitly available to wl1273 drivers The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit a23090ada44889322fe39142fb58ebc5794f709c Author: Andres Salomon Date: Thu Feb 17 19:07:16 2011 -0800 mfd: mfd_cell is now implicitly available to t7166xb drivers No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit e46dccff341068d8530610a822965794f70b998f Author: Andres Salomon Date: Thu Feb 17 19:07:15 2011 -0800 mfd: mfd_cell is now implicitly available to timberdale drivers The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Note that the mfd's platform_data is marked __devinitdata. This is still correct in all cases except for the timbgpio driver, whose remove hook has been changed to no longer reference the pdata. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 07ae2a08deb141f22d7974615bd3006e8dce3883 Author: Andres Salomon Date: Thu Feb 17 19:07:14 2011 -0800 mfd: mfd_cell is now implicitly available to htc-pasic3 drivers No need to explicitly set the cell's platform_data/data_size. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit d24f36d352bb9fb72b6611bdca41adbb41cb13ba Author: Andres Salomon Date: Thu Feb 17 19:07:13 2011 -0800 mfd: mfd_cell is now implicitly available to asic3 drivers No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 5528e40f973ac427c857593ea0f636b6f65058b0 Author: Andres Salomon Date: Thu Feb 17 19:07:12 2011 -0800 mfd: mfd_cell is now implicitly available to ab3100 drivers The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 0ce5fabe59d7c4f51b5ad51ed178ba92531ec04d Author: Andres Salomon Date: Thu Feb 17 19:07:11 2011 -0800 mfd: mfd_cell is now implicitly available to ab3550 driver No clients (in mainline kernel, I'm told that drivers exist in external trees that are planned for mainline inclusion) make use of this, nor do they make use of platform_data, so nothing really had to change here. The .data_size field is unused, so its usage gets removed. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 6a54ac2149ab5b8972bb4f77bd42b43dbeabb56f Author: Andres Salomon Date: Thu Feb 17 19:07:10 2011 -0800 mfd: mfd_cell is now implicitly available to jz4740 drivers No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon Acked-by: Jean Delvare Signed-off-by: Samuel Ortiz commit fe891a008f3310be47786e87c158edebdb71e265 Author: Andres Salomon Date: Thu Feb 17 19:07:09 2011 -0800 mfd-core: Unconditionally add mfd_cell to every platform_device Previously, one would set the mfd_cell's platform_data/data_size to point to the current mfd_cell in order to pass that information along to drivers. This causes the current mfd_cell to always be available to drivers. It also adds a wrapper function for fetching the mfd cell from a platform device, similar to what originally existed for mfd devices. Drivers who previously used platform_data for other purposes can still use it; the difference is that mfd_get_data() must be used to access it (and the pdata structure is no longer allocated in mfd_add_devices). Note that mfd_get_data is intentionally vague (in name) about where the data is stored; variable name changes can come later without having to touch brazillions of drivers. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 2798e226ad7db82725ba03da933638e981b472f7 Author: Andres Salomon Date: Thu Feb 17 19:07:08 2011 -0800 mfd-core: Fix up typos/vagueness in comment Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 153617fdd3e88fc9f8ea0bcd664671054645180f Author: Keerthy Date: Wed Feb 23 16:26:54 2011 +0530 mfd: Enabling twl4030_wdt and pwrbutton only for Triton Enabling twl4030_wdt and twl4030_pwrbutton only for Triton i.e for TWL4030 and TWL5030. This is to be excluded for Phoenix TWL6030. Tested OMAP4 blaze, OMAP2430, OMAP3630 boot up. Signed-off-by: Keerthy Reviewed-by: Balaji T K Signed-off-by: Samuel Ortiz commit f40dff9edbf1daa14068542d60ae22df78e8c74a Author: Mark Brown Date: Mon Feb 21 18:30:31 2011 +0000 mfd: Put WM8994 into reset when suspending Ensure that the chip is in the lowest power mode possible when suspended by performing a soft reset on it. On early silicon revisions the lowest power modes can't be entered without using reset so we can't achieve equivalent results within the individual drivers. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit f66ea457f616258777cb3349f33745b0240e54fd Author: Mark Brown Date: Sun Feb 13 20:06:06 2011 +0000 mfd: Remove bitrotted genirq comment from wm831x IRQ code Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 8af1b0d72f7b65f0ed34f0b2c5d1774fabca24a2 Author: Balaji T K Date: Thu Feb 10 18:45:26 2011 +0530 OMAP4: add clk32kg data to omap4panda and blaze board file In Blaze and Panda, 32KHz clock - CLK32KG to WLAN is supplied from Phoenix TWL6030. Add CLK32KG platform data to blaze and omap4panda board file. Signed-off-by: Balaji T K Acked-by: Mark Brown Acked-by: Tony Lindgren Signed-off-by: Samuel Ortiz commit 8e6de4a30294809420ac9a974b4f28b38ebdb38f Author: Balaji T K Date: Thu Feb 10 18:44:50 2011 +0530 regulator: twl: add clk32kg to twl-regulator In OMAP4 Blaze and Panda, 32KHz clock to WLAN is supplied from Phoenix TWL6030. The 32KHz clock state (ON/OFF) is configured in CLK32KG_CFG_[GRP, TRANS, STATE] register. This follows the same register programming model as other regulators in TWL6030. So add CLK32KG as pseudo regulator. Signed-off-by: Balaji T K Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit dae2db30c114cd0dec59b4130c315c9cce351741 Author: Arun Murthy Date: Tue Feb 22 10:11:13 2011 +0100 mfd: Add new ab8500 GPADC driver AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage Signed-off-by: Arun Murthy Acked-by: Linus Walleij Acked-by: Mattias Wallin Signed-off-by: Samuel Ortiz commit 44bdcb54df2714da18c4a0c6f711a350ab4ed93c Author: Vasiliy Kulikov Date: Fri Feb 4 15:23:43 2011 +0300 mfd: ab8500: world-writable debugfs register-* files Don't allow everybody to interact with hardware registers. Signed-off-by: Vasiliy Kulikov Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 90c861c2a83d974684974441093ff8a50e6b430b Author: Vasiliy Kulikov Date: Fri Feb 4 15:23:39 2011 +0300 mfd: ab3500: world-writable debugfs register-* files Don't allow everybody to interact with hardware registers. Signed-off-by: Vasiliy Kulikov Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz commit f8a0697722d12a201588225999cfc8bfcbc82781 Author: Vasiliy Kulikov Date: Fri Feb 4 15:23:36 2011 +0300 mfd: ab3100: world-writable debugfs *_priv files Don't allow everybody to change device hardware registers. Signed-off-by: Vasiliy Kulikov Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 90550d1903da8dac851d220b794e44c90a11c6ce Author: Mattias Nilsson Date: Mon Feb 14 11:17:12 2011 +0100 mfd: AB8500 system control driver This adds a pretty straight-forward system control driver for the AB8500. This driver will be used from the core platform, e.g the clock tree implementation in the machine code, and is by nature singleton. There are a few simple functions to read, write, set and clear registers so that the machine code can control its own foundation. Cc: Mattias Wallin Signed-off-by: Mattias Nilsson Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 8546bd4af1251d17d16b0ef682d84fd23c8beaca Author: Mark Brown Date: Tue Feb 1 11:46:13 2011 +0000 mfd: Add fast path for WM831x touchscreen interrupts The WM831x interrupt controller provides reporting of the touchscreen related interrupts in the primary interrupt status register as a performance optimisation - use this to avoid reading the secondary status registers for those interrupts. For code simplicity and to avoid iterating over all interrupts we open code for the two affected interrupt sources. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 87d1906df4ecf6df0832e78e5189a39c7ea09a29 Author: Mark Brown Date: Tue Feb 1 11:46:12 2011 +0000 mfd: Convert WM831x SPI to use dev_pm_ops There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the WM831x SPI driver. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 6f9f13bf9b9fabf2da2028cb7c1e732ef2efa26d Author: Vincent Palatin Date: Mon Jan 31 11:31:49 2011 -0500 mfd: Invert tps6586x GPIO and subdevices initialization When using a fixed voltage regulator triggered by a TPS6586x GPIO, this allows to declare and initialize it conveniently from the "subdev" list. Signed-off-by: Vincent Palatin Signed-off-by: Samuel Ortiz commit de8c8b0683043e81d2001e446f2bcb143affb0b2 Author: Jochen Friedrich Date: Sun Jan 30 13:40:56 2011 +0100 mfd: Add BTN_TOUCH event to ucb1x00-ts Add BTN_TOUCH event reporting to ucb1x00_ts touchscreen driver. This will make this touchscreen driver behave consistently wrt. BTN_TOUCH. Signed-off-by: Jochen Friedrich Acked-by: Dmitry Torokhov Signed-off-by: Samuel Ortiz commit ce5d4a435af2839771210aeda2b649f5a183b63c Author: Wolfram Sang Date: Mon Jan 24 11:44:27 2011 +0100 mfd: Remove obsolete cleanup for wl1273 clientdata A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit or error. This is obsolete meanwhile, the core will do it. Signed-off-by: Wolfram Sang Signed-off-by: Samuel Ortiz commit b103e0b3c52e6edb4839ccc961cf335ca6b88918 Author: Mark Brown Date: Fri Jan 21 13:26:46 2011 +0000 mfd: Support configuration of WM831x /IRQ output in CMOS mode Provide platform data allowing the system to set the /IRQ pin into CMOS mode rather than the default open drain. The default value of this platform data reflects the default hardware configuration so there should be no change to existing users. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 939941d44dcaa138241d2182bd9e10f2b5d52665 Author: Mark Brown Date: Thu Jan 20 21:52:42 2011 +0000 mfd: Convert pcf50633 to dev_pm_ops There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the pcf50633 driver. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 44be0a40d8666d9f3acee2a329e50f925e32d8b0 Author: Mark Brown Date: Thu Jan 20 21:47:31 2011 +0000 mfd: Staticise non-exported symbols in MAX8998 driver No need to have them in the global namespace and sparse complains. Signed-off-by: Mark Brown Acked-by: Kyungmin Park Signed-off-by: Samuel Ortiz commit dc781454690d7e5857afd84845b6402e03493ee1 Author: Mark Brown Date: Thu Jan 20 21:45:46 2011 +0000 mfd: Convert adp5520 to dev_pm_ops There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the adp5520 driver. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit df508450870cd5b4478156dcde8e68e6bf0d6661 Author: Mark Brown Date: Fri Jan 14 13:38:16 2011 +0000 mfd: Leave acknowledgement of WM831x touchscreen IRQs to the driver The WM831x touchscreen interrupts need acknowledgement even when using direct signals to the CPU (which don't go through the core) so leave the acknowledgement up to the touchscreen driver for simplicity. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit ce2d17ca7f85dcade62cd608601a0d52ccdaf0e6 Author: Akihiro Nagai Date: Wed Mar 23 16:29:39 2011 +0900 perf top: Fix uninitialized 'counter' variable builtin-top.c has an uninitialized variable. gcc(version 4.5.1) warns about it and it results in build failure: builtin-top.c: In function 'display_thread': builtin-top.c:518:9: error: 'counter' may be used uninitialized This situation can indeed trigger, if the getline() call in prompt_integer() fails. Signed-off-by: Akihiro Nagai Cc: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <20110323072939.11638.50173.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit e1eb029081f9cd4f73bdd05d495e5011839546f5 Merge: fc66c52 1106b69 Author: Ingo Molnar Date: Wed Mar 23 10:35:17 2011 +0100 Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent commit f6e47884e7f588094bf7b824c839a9ee33f2aa55 Author: Chris Wilson Date: Sun Mar 20 21:09:12 2011 +0000 drm/i915: Avoid unmapping pages from a NULL address space Found by gem_stress. As we perform retirement from a workqueue, it is possible for us to free and unbind objects after the last close on the device, and so after the address space has been torn down and reset to NULL: BUG: unable to handle kernel NULL pointer dereference at 00000054 IP: [] mutex_lock+0xf/0x27 *pde = 00000000 Oops: 0002 [#1] SMP last sysfs file: /sys/module/vt/parameters/default_utf8 Pid: 5, comm: kworker/u:0 Not tainted 2.6.38+ #214 EIP: 0060:[] EFLAGS: 00010206 CPU: 1 EIP is at mutex_lock+0xf/0x27 EAX: 00000054 EBX: 00000054 ECX: 00000000 EDX: 00012fff ESI: 00000028 EDI: 00000000 EBP: f706fe20 ESP: f706fe18 DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 Process kworker/u:0 (pid: 5, ti=f706e000 task=f7060d00 task.ti=f706e000) Stack: f5aa3c60 00000000 f706fe74 c107e7df 00000246 dea55380 00000054 f5aa3c60 f706fe44 00000061 f70b4000 c13fff84 00000008 f706fe54 00000000 00000000 00012f00 00012fff 00000028 c109e575 f6b36700 00100000 00000000 f706fe90 Call Trace: [] unmap_mapping_range+0x7d/0x1e6 [] ? mntput_no_expire+0x52/0xb6 [] i915_gem_release_mmap+0x49/0x58 [] i915_gem_object_unbind+0x4c/0x125 [] i915_gem_free_object_tail+0x1d/0xdb [] i915_gem_free_object+0x3d/0x41 [] ? drm_gem_object_free+0x0/0x27 [] drm_gem_object_free+0x25/0x27 [] kref_put+0x39/0x42 [] drm_gem_object_unreference+0x16/0x18 [] i915_gem_object_move_to_inactive+0xba/0xbe [] i915_gem_retire_requests_ring+0x16e/0x1a5 [] i915_gem_retire_requests+0x48/0x63 [] i915_gem_retire_work_handler+0x4c/0x117 [] process_one_work+0x140/0x21b [] ? __need_more_worker+0x13/0x2a [] ? need_to_create_worker+0x1c/0x35 [] ? i915_gem_retire_work_handler+0x0/0x117 [] worker_thread+0xd4/0x14b [] ? worker_thread+0x0/0x14b [] kthread+0x68/0x6d [] ? kthread+0x0/0x6d [] kernel_thread_helper+0x6/0x10 Code: 00 e8 98 fe ff ff 5d c3 55 89 e5 3e 8d 74 26 00 ba 01 00 00 00 e8 84 fe ff ff 5d c3 55 89 e5 53 8d 64 24 fc 3e 8d 74 26 00 89 c3 ff 08 79 05 e8 ab ff ff ff 89 e0 25 00 e0 ff ff 89 43 10 58 EIP: [] mutex_lock+0xf/0x27 SS:ESP 0068:f706fe18 CR2: 0000000000000054 Signed-off-by: Chris Wilson Reviewed-by: Keith Packard commit 26e12f894317bf0221fed40bef6f937538a78c0b Author: Chris Wilson Date: Sun Mar 20 11:20:19 2011 +0000 drm/i915: Fix use after free within tracepoint Detected by scripts/coccinelle/free/kfree.cocci. Signed-off-by: Chris Wilson Reviewed-by: Keith Packard commit 36d527deadf7d0c302e3452dde39465e74a65a08 Author: Chris Wilson Date: Sat Mar 19 22:26:49 2011 +0000 drm/i915: Restore missing command flush before interrupt on BLT ring We always skipped flushing the BLT ring if the request flush did not include the RENDER domain. However, this neglects that we try to flush the COMMAND domain after every batch and before the breadcrumb interrupt (to make sure the batch is indeed completed prior to the interrupt firing and so insuring CPU coherency). As a result of the missing flush, incoherency did indeed creep in, most notable when using lots of command buffers and so potentially rewritting an active command buffer (i.e. the GPU was still executing from it even though the following interrupt had already fired and the request/buffer retired). As all ring->flush routines now have the same preconditions, de-duplicate and move those checks up into i915_gem_flush_ring(). Fixes gem_linear_blit. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35284 Signed-off-by: Chris Wilson Reviewed-by: Daniel Vetter Tested-by: mengmeng.meng@intel.com commit d4aeee776017b6da6dcd12f453cd82a3c951a0dc Author: Chris Wilson Date: Mon Mar 14 15:11:24 2011 +0000 drm/i915: Disable pagefaults along execbuffer relocation fast path Along the fast path for relocation handling, we attempt to copy directly from the user data structures whilst holding our mutex. This causes lockdep to warn about circular lock dependencies if we need to pagefault the user pages. [Since when handling a page fault on a mmapped bo, we need to acquire the struct mutex whilst already holding the mm semaphore, it is then verboten to acquire the mm semaphore when already holding the struct mutex. The likelihood of the user passing in the relocations contained in a GTT mmaped bo is low, but conceivable for extreme pathology.] In order to force the mm to return EFAULT rather than handle the pagefault, we therefore need to disable pagefaults across the relocation fast path. Signed-off-by: Chris Wilson Cc: stable@kernel.org Reviewed-by: Daniel Vetter commit ed0291fd16f6349ef43d3f25a4626c2f7baf568b Author: Chris Wilson Date: Sat Mar 19 08:21:45 2011 +0000 drm/i915: Fix computation of pitch for dumb bo creator Cc: Dave Airlie Signed-off-by: Chris Wilson commit e281fcaa287fb39ce26d9aa33a716c2a7bb8484e Author: Jesse Barnes Date: Fri Mar 18 10:32:07 2011 -0700 drm/i915: report correct render clock frequencies on SNB Fix up the debug file to report the right frequencies. On SNB, we program the PCU with a frequency ratio, which is multiplied by 100MHz on the CPU side. But GFX only runs at half that, so report it as such to avoid confusion. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson Reviewed-by: Keith Packard commit 48898b038b69ef4801f0e059026c8f6920684677 Author: Takashi Iwai Date: Fri Mar 18 09:06:49 2011 +0000 drm/i915/dp: Correct the order of deletion for ghost eDP devices The order of the calls does matter indeed. Swapping the call order of intel_dp_destroy() and intel_dp_encoder_destroy() fixes the problem. This is because i2c_del_adapter unregisters the device which parent is intel_connector, and connectors are removed in intel_dp_destroy(). Thus intel_dp_encoder_destroy() must be called before intel_dp_destroy(). Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=24822 Signed-off-by: Takashi Iwai Signed-off-by: Chris Wilson Reviewed-by: Keith Packard commit 54eaae3028e6b09de0bd2232a8176fc0d0a2397a Author: Heiko Carstens Date: Wed Mar 23 10:16:06 2011 +0100 [S390] cmpxchg: implement cmpxchg64() We have a cmpxchg64_local() implementation but strange enough the SMP capable variant cmpxchg64() is missing. So implement it. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a2c9dbe8dbb8591ae6fd142e562813cd95d06609 Author: Heiko Carstens Date: Wed Mar 23 10:16:05 2011 +0100 [S390] xchg/cmpxchg: move to own header file Move xchg() and cmpxchg() functions to own header file like some other architectures have done. With this we make sure that system.h now really looks like a place where everything is gathered that doesn't fit anywhere else. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 3c190c51f55eab691e5d096747262d2653e67de1 Author: Sebastian Ott Date: Wed Mar 23 10:16:04 2011 +0100 [S390] ccwgroup_driver: remove duplicate members Remove the owner and name members of struct ccwgroup_driver and convert all drivers to store this data in the embedded struct device_driver. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit d5ab5276baf9fd8b581cfbf41b10b6d4eae55960 Author: Sebastian Ott Date: Wed Mar 23 10:16:03 2011 +0100 [S390] ccw_bus_type: make it static Make ccw_bus_type static. ccw_device drivers have to use ccw_driver_register. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 3bda058b0c39fc72188116d2fd71af08dd0fe5b0 Author: Sebastian Ott Date: Wed Mar 23 10:16:02 2011 +0100 [S390] ccw_driver: remove duplicate members Remove the owner and name members of struct ccw_driver and convert all drivers to store this data in the embedded struct device_driver. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 9a26513eb67ec4b2cb1744834076afad21b68aac Author: Jan Glauber Date: Wed Mar 23 10:16:01 2011 +0100 [S390] qdio: prevent handling of buffers if count is zero Exit do_QDIO early if the buffer count is zero to prevent side effects in the following functions. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 4cc69531f91dfa1668af5e9d8efe9e3bc7b64548 Author: Heiko Carstens Date: Wed Mar 23 10:16:00 2011 +0100 [S390] setup: register bss section as resource Make kernel bss section visible via /proc/iomem like on other architectures. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 71189284e61fd818547430186f524c1db54fb7c7 Author: Heiko Carstens Date: Wed Mar 23 10:15:59 2011 +0100 [S390] setup: simplify setup_resources() Simplify setup_resources() and make it more generic. That way it is easier to add additional resources. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d0d2e31af691ed3dbb4e556bf939b86ef745e6a3 Author: Heiko Carstens Date: Wed Mar 23 10:15:58 2011 +0100 [S390] wire up sys_syncfs Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 26e8a33989183e81d6692aec1a77dffa266b91a2 Author: Heiko Carstens Date: Wed Mar 23 10:15:57 2011 +0100 [S390] wire up sys_clock_adjtime Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 5069496ec40946da413646f9cd5dcb28d9b3324f Author: Heiko Carstens Date: Wed Mar 23 10:15:56 2011 +0100 [S390] wire up sys_open_by_handle_at Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 737fd5f1f64271999b791cbe76f1f720f10e8bb8 Author: Heiko Carstens Date: Wed Mar 23 10:15:55 2011 +0100 [S390] wire up sys_name_to_handle_at Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 984e8486c155cf53c255e2b501de91b39a049613 Author: Heiko Carstens Date: Wed Mar 23 10:15:00 2011 +0100 [S390] oprofile: disable hw sampling for CONFIG_32BIT Doesn't work and build for CONFIG_32BIT. So disable it. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 894e491e427ae40af62b871e05f9a3f80bbddb6c Author: Heiko Carstens Date: Wed Mar 23 10:14:59 2011 +0100 [S390] early: limit savesys cmd string handling Use snprintf() here as well so we won't have to deal with this again. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 69ac43b05eef4b8555e84ad51ceb6c58b5a3bc75 Author: Chen Liu Date: Wed Mar 23 10:14:58 2011 +0100 [S390] early: Fix possible overlapping data buffer This patch fixed bugzilla #12965: https://bugzilla.kernel.org/show_bug.cgi?id=12965 The original code contains some inproper use of sprintf function where a buffer is used both as input string as well as output string. It should remember the written bytes in the previous and use that as the offset for later writing. Also replace sprintf with snprintf. Signed-off-by: Chen Liu Signed-off-by: Martin Schwidefsky commit 29c5a587284195278e233eec5c2234c24fb2c204 Author: Chris Wilson Date: Thu Mar 17 15:23:22 2011 +0000 drm/i915: Fix tiling corruption from pipelined fencing ... even though it was disabled. A mistake in the handling of fence reuse caused us to skip the vital delay of waiting for the object to finish rendering before changing the register. This resulted in us changing the fence register whilst the bo was active and so causing the blits to complete using the wrong stride or even the wrong tiling. (Visually the effect is that small blocks of the screen look like they have been interlaced). The fix is to wait for the GPU to finish using the memory region pointed to by the fence before changing it. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34584 Cc: Andy Whitcroft Cc: Daniel Vetter Reviewed-by: Daniel Vetter [Note for 2.6.38-stable, we need to reintroduce the interruptible passing] Signed-off-by: Chris Wilson Tested-by: Dave Airlie commit 5a8826463c19b0d1a2fc60b2adac0ec318047844 Author: David Henningsson Date: Wed Mar 23 08:35:07 2011 +0100 ALSA: HDA: Realtek: Avoid unnecessary volume control index on Surround/Side Similar to commit 7e59e097c09b82760bb0fe08b0fa2b704d76c3f4, this patch avoids unnecessary volume control indices for more Realtek auto-parsers, e g the ALC66x family, on the "Surround" and "Side" controls. These indices cause these volume controls to be ignored by PulseAudio and vmaster and should be removed whenever possible. Cc: stable@kernel.org Reported-by: Jan Losinski Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit c4ade94fc00f8b34589719d8a347f658b6d3951e Author: Li, Shaohua Date: Wed Mar 23 08:30:34 2011 +0100 cfq-iosched: removing unnecessary think time checking Removing think time checking. A high thinktime queue might means the queue dispatches several requests and then do away. Limitting such queue seems meaningless. And also this can simplify code. This is suggested by Vivek. Signed-off-by: Shaohua Li Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit 62a37f6badd1ac97ba07d543b5d4be2f9cb17217 Author: Justin TerAvest Date: Wed Mar 23 08:25:44 2011 +0100 cfq-iosched: Don't clear queue stats when preempt. For v2, I added back lines to cfq_preempt_queue() that were removed during updates for accounting unaccounted_time. Thanks for pointing out that I'd missed these, Vivek. Previous commit "cfq-iosched: Don't set active queue in preempt" wrongly cleared stats for preempting queues when it shouldn't have, because when we choose a queue to preempt, it still isn't necessarily scheduled next. Thanks to Vivek Goyal for figuring this out and understanding how the preemption code works. Signed-off-by: Justin TerAvest Signed-off-by: Jens Axboe commit 7ccb4a53eb03c9196646ca0c2a97558313e886f1 Author: Yuanhan Liu Date: Fri Mar 18 07:37:35 2011 +0000 drm/i915: Re-enable self-refresh A broken implementation of is_pot() prevented the detection of when a singular pipe was enabled. Eric Anholt pointed out the existence of is_power_of_2() so use that instead of our broken code! Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35402 Signed-off-by: Yuanhan Liu Tested-by: xunx.fang@intel.com Reviewed-by: Keith Packard Signed-off-by: Chris Wilson commit 09bfa51773c1e90f13000dc2fc0c4b84047009bc Author: Herton Ronaldo Krzesinski Date: Thu Mar 17 13:45:12 2011 +0000 drm/i915: Prevent racy removal of request from client list When i915_gem_retire_requests_ring calls i915_gem_request_remove_from_client, the client_list for that request may already be removed in i915_gem_release. So we may call twice list_del(&request->client_list), resulting in an oops like this report: [126167.230394] BUG: unable to handle kernel paging request at 00100104 [126167.230699] IP: [] i915_gem_retire_requests_ring+0xd4/0x240 [i915] [126167.231042] *pdpt = 00000000314c1001 *pde = 0000000000000000 [126167.231314] Oops: 0002 [#1] SMP [126167.231471] last sysfs file: /sys/devices/LNXSYSTM:00/device:00/PNP0C0A:00/power_supply/BAT1/current_now [126167.231901] Modules linked in: snd_seq_dummy nls_utf8 isofs btrfs zlib_deflate libcrc32c ufs qnx4 hfsplus hfs minix ntfs vfat msdos fat jfs xfs exportfs reiserfs cryptd aes_i586 aes_generic binfmt_misc vboxnetadp vboxnetflt vboxdrv parport_pc ppdev snd_hda_codec_hdmi snd_hda_codec_conexant snd_hda_intel snd_hda_codec snd_hwdep arc4 snd_pcm snd_seq_midi snd_rawmidi snd_seq_midi_event snd_seq uvcvideo videodev snd_timer snd_seq_device joydev iwlagn iwlcore mac80211 snd cfg80211 soundcore i915 drm_kms_helper snd_page_alloc psmouse drm serio_raw i2c_algo_bit video lp parport usbhid hid sky2 sdhci_pci ahci sdhci libahci [126167.232018] [126167.232018] Pid: 1101, comm: Xorg Not tainted 2.6.38-6-generic-pae #34-Ubuntu Gateway MC7833U / [126167.232018] EIP: 0060:[] EFLAGS: 00213246 CPU: 0 [126167.232018] EIP is at i915_gem_retire_requests_ring+0xd4/0x240 [i915] [126167.232018] EAX: 00200200 EBX: f1ac25b0 ECX: 00000040 EDX: 00100100 [126167.232018] ESI: f1a2801c EDI: e87fc060 EBP: ef4d7dd8 ESP: ef4d7db0 [126167.232018] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 [126167.232018] Process Xorg (pid: 1101, ti=ef4d6000 task=f1ba6500 task.ti=ef4d6000) [126167.232018] Stack: [126167.232018] f1a28000 f1a2809c f1a28094 0058bd97 f1aa2400 f1a2801c 0058bd7b 0058bd85 [126167.232018] f1a2801c f1a28000 ef4d7e38 f8c2e995 ef4d7e30 ef4d7e60 c14d1ebc f6b3a040 [126167.232018] f1522cc0 000000db 00000000 f1ba6500 ffffffa1 00000000 00000001 f1a29214 [126167.232018] Call Trace: Unfortunately the call trace reported was cut, but looking at debug symbols the crash is at __list_del, when probably list_del is called twice on the same request->client_list, as the dereferenced value is LIST_POISON1 + 4, and by looking more at the debug symbols before list_del call it should have being called by i915_gem_request_remove_from_client And as I can see in the code, it seems we indeed have the possibility to remove a request->client_list twice, which would cause the above, because we do list_del(&request->client_list) on both i915_gem_request_remove_from_client and i915_gem_release As Chris Wilson pointed out, it's indeed the case: "(...) I had thought that the actual insertion/deletion was serialised under the struct mutex and the intention of the spinlock was to protect the unlocked list traversal during throttling. However, I missed that i915_gem_release() is also called without struct mutex and so we do need the double check for i915_gem_request_remove_from_client()." This change does the required check to avoid the duplicate remove of request->client_list. Bugzilla: http://bugs.launchpad.net/bugs/733780 Cc: stable@kernel.org # 2.6.38 Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Chris Wilson commit 00d70b15125030391d17baab2c2f70f93b3339a6 Author: Chris Wilson Date: Thu Mar 17 07:18:29 2011 +0000 drm/i915: skip redundant operations whilst enabling pipes and planes If the pipe or plane is already enabled, then we do not need to enable it again and can skip the delay. Similarly if it is already disabled when we want to disable it, we can also skip it. This fixes a regression from b24e717988, which caused the LVDS output on one PineView machine to become corrupt after changing orientation several times. References: https://bugs.freedesktop.org/show_bug.cgi?id=34601 Cc: Jesse Barnes Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Tested-by: mengmeng.meng@intel.com commit 762237bb714b0cd93ce2405ccc891fadb405c26e Author: Chris Wilson Date: Thu Mar 17 07:20:20 2011 +0000 drm/i915: Remove surplus POSTING_READs before wait_for_vblank ... as wait_for_vblank (and friends) will do a flush of the MMIO writes anyway. References: https://bugs.freedesktop.org/show_bug.cgi?id=34601 Cc: Jesse Barnes Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Reviewed-by: Jesse Barnes commit 3d26678e8009b03f27674c2f9e5b236c2f627b14 Merge: 02e2407 c3146df Author: Len Brown Date: Wed Mar 23 02:35:02 2011 -0400 Merge branch 'sysdev' into release commit 02e2407858fd62053bf60349c0e72cd1c7a4a60e Merge: 96e1c40 6447f55d Author: Len Brown Date: Wed Mar 23 02:34:54 2011 -0400 Merge branch 'linus' into release Conflicts: arch/x86/kernel/acpi/sleep.c Signed-off-by: Len Brown commit 96e1c408ea8a556c5b51e0e7d56bd2afbfbf5fe9 Merge: f7f28f7 25be582 Author: Len Brown Date: Wed Mar 23 02:34:18 2011 -0400 Merge branch 'battery-sysfs-notifier' into release commit f7f28f7e8c42c67c4bce24415c6cd6da222a1798 Merge: 5c129a8 95cf3e1 Author: Len Brown Date: Wed Mar 23 02:34:15 2011 -0400 Merge branch 'reset' into release commit 5c129a8600100a5d0f5fdbc1014c5dba1d307bc4 Merge: 797b10a 521cb40 Author: Len Brown Date: Wed Mar 23 02:33:54 2011 -0400 Merge commit 'v2.6.38' into release commit 797b10a07069e153d41aedb4ae8e76660279e2ee Merge: 8a9026d 4fdfbe8 Author: Len Brown Date: Wed Mar 23 02:33:46 2011 -0400 Merge branch 'bugfix-thermal' into release commit 8a9026d2e91b2c46744396222b0e878b2622c567 Merge: 3c7ef21 cdf2a4e Author: Len Brown Date: Wed Mar 23 02:19:58 2011 -0400 Merge branch 'misc' into release commit cdf2a4eeded69f66ec8c5098c375fe49e0820127 Author: Naga Chumbalkar Date: Wed Feb 2 23:27:04 2011 +0000 ACPI: minor printk format change in acpi_pad Minor format change. Signed-off-by: Naga Chumbalkar Signed-off-by: Len Brown commit 32297abd90a5d181e8e026c8b8e65ef41e9ffc07 Author: Naga Chumbalkar Date: Wed Feb 2 23:26:58 2011 +0000 ACPI: make acpi_pad /sys output more readable Make /sys output from acpi_pad more readable. Before the fix: # cat idlecpus idlepct rrtime 00000000510 After the fix: # cat idlecpus idlepct rrtime 00000000 5 10 Signed-off-by: Naga Chumbalkar Signed-off-by: Len Brown commit 3c7ef2138aff285e376aefb74330392442cb2f2d Merge: 2935b54 d8d75b0 Author: Len Brown Date: Wed Mar 23 00:18:32 2011 -0400 Merge branch 'acpica' into release commit d8d75b0ee6dbd65c8a2189aef50a03667d81c937 Author: Bob Moore Date: Tue Mar 22 11:27:29 2011 +0800 ACPICA: Update version to 20110316 Version 20110316. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 5cf4d7338ba23aa8d9eeaf313f16bb50494be369 Author: Bob Moore Date: Fri Mar 18 09:49:41 2011 +0800 ACPICA: Header support for SLIC table We finally have the definition for this table. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 64146f8b2af1ba77fe3c21d9d6d7213b9bb72b40 Author: Alex Deucher Date: Tue Mar 22 01:46:12 2011 -0400 drm/radeon/kms: prefer legacy pll algo for tv-out ntsc seems to work fine with either algo, some pal TVs seem pickier. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=30832 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 95cf3e12e7f659e536215b37c67d46f3e2ce95cc Author: Matthew Garrett Date: Fri Mar 11 16:12:20 2011 -0500 ACPI: Make sure the FADT is at least rev 2 before using the reset register The reset register was only introduced with version 2 of the FADT, so we should check that the FADT revision before trusting its contents. Signed-off-by: Matthew Garrett Signed-off-by: Len Brown commit 6734fe57a07b2dd23ef1ef2ac1f790747e53eefc Author: Matthew Garrett Date: Fri Mar 11 16:12:19 2011 -0500 ACPI: Bug compatibility for Windows on the ACPI reboot vector Windows ignores the bit_offset and bit_width, despite the spec requiring that they be validated. Drop the checks so that we match this behaviour. Windows also goes straight for the keyboard controller if the ACPI reboot fails, so we shouldn't sleep if we're still alive. Signed-off-by: Matthew Garrett Signed-off-by: Len Brown commit f17d9cbf20c4734c4199caa6dee87047f2f8278f Author: Matthew Garrett Date: Fri Mar 11 16:12:18 2011 -0500 ACPICA: Fix access width for reset vector Section 4.7.3.6 of the ACPI specification requires that the register width of the reset vector be 8 bits. Windows simply hardcodes the access to be a byte and ignores the width provided in the FADT, so make sure that we do the same. Signed-off-by: Matthew Garrett Signed-off-by: Len Brown commit 25be5821521640eb00b7eb219ffe59664510d073 Author: Kyle McMartin Date: Tue Mar 22 16:19:50 2011 -0400 ACPI battery: fribble sysfs files from a resume notifier Commit da8aeb92 re-poked the battery on resume, but Linus reports that it broke his eee and partially reverted it in b23fffd7. Unfortunately this also results in my x201s giving crack values until the sysfs files are poked again. In the revert message, it was suggested that we poke it from a PM notifier, so let's do that. With this in place, I haven't noticed the units going nutty on my gnome-power-manager across a dozen suspends or so... Signed-off-by: Kyle McMartin Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 2935b544041bbdc32a6864ba9350a7629c56d722 Merge: 2507624 912b742 Author: Len Brown Date: Tue Mar 22 23:20:49 2011 -0400 Merge branch 'button-cleanup' into release commit 912b7427fc13467bac042cc72f2eccbdbc39d773 Author: Zhang Rui Date: Wed Mar 23 10:21:40 2011 +0800 ACPI button: remove unused procfs I/F Remove unused ACPI button procfs interface. Only /proc/acpi/button/lid/LID/state remains. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit f6152737a95bd6c22f0c664b20831aefd48085a8 Author: David S. Miller Date: Tue Mar 22 19:37:11 2011 -0700 tcp: Make undo_ssthresh arg to tcp_undo_cwr() a bool. Signed-off-by: David S. Miller commit 67d4120a1793138bc9f4a6eb61d0fc5298ed97e0 Author: Yuchung Cheng Date: Mon Mar 14 10:57:03 2011 +0000 tcp: avoid cwnd moderation in undo In the current undo logic, cwnd is moderated after it was restored to the value prior entering fast-recovery. It was moderated first in tcp_try_undo_recovery then again in tcp_complete_cwr. Since the undo indicates recovery was false, these moderations are not necessary. If the undo is triggered when most of the outstanding data have been acknowledged, the (restored) cwnd is falsely pulled down to a small value. This patch removes these cwnd moderations if cwnd is undone a) during fast-recovery b) by receiving DSACKs past fast-recovery Signed-off-by: Yuchung Cheng Signed-off-by: David S. Miller commit a7bff75b087e7a355838a32efe61707cfa73c194 Author: Linus Lüssing Date: Tue Mar 22 11:40:32 2011 +0000 bridge: Fix possibly wrong MLD queries' ethernet source address The ipv6_dev_get_saddr() is currently called with an uninitialized destination address. Although in tests it usually seemed to nevertheless always fetch the right source address, there seems to be a possible race condition. Therefore this commit changes this, first setting the destination address and only after that fetching the source address. Reported-by: Jan Beulich Signed-off-by: Linus Lüssing Signed-off-by: David S. Miller commit 6a1fef6d000944911df0f160f366111daa10740a Author: Sriram Date: Tue Mar 22 02:31:03 2011 +0000 net: davinci_emac:Fix translation logic for buffer descriptor With recent changes to the driver(switch to new cpdma layer), the support for buffer descriptor address translation logic is broken. This affects platforms where the physical address of the descriptors as seen by the DMA engine is different from the physical address. Original Patch adding translation logic support: Commit: ad021ae8862209864dc8ebd3b7d3a55ce84b9ea2 Signed-off-by: Sriramakrishnan A G Tested-By: Sekhar Nori Signed-off-by: David S. Miller commit 9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec Author: Florian Westphal Date: Tue Mar 22 19:17:36 2011 -0700 ipv6: ip6_route_output does not modify sk parameter, so make it const This avoids explicit cast to avoid 'discards qualifiers' compiler warning in a netfilter patch that i've been working on. Signed-off-by: Florian Westphal Signed-off-by: David S. Miller commit d88d6b05fee3cc78e5b0273eb58c31201dcc6b76 Author: Steve Hodgson Date: Tue Mar 22 19:46:43 2011 +0000 sfc: Siena: Disable write-combining when SR-IOV is enabled If SR-IOV is enabled by firmware, even if it is not enabled in the PCI capability, TX pushes using write-combining may be corrupted. We want to know whether it is enabled before mapping the NIC registers, and even if PCI extended capabilities are not accessible. Therefore, we look for the MSI capability, which is removed if SR-IOV is enabled. Signed-off-by: Ben Hutchings commit de55aa33ca6928881ca5c402bb0f5db242fbcdba Author: Mike Frysinger Date: Tue Mar 22 21:06:16 2011 -0400 Blackfin: bf54x: re-enable anomaly 05000353 for all revs Even though the anomaly sheet says that the the bootrom is fixed, tests have shown that the fix itself does not handle all cases. So until we get a ROM update, assume the reset code is still broken and we need to handle things ourselves. Signed-off-by: Mike Frysinger commit bee18bebda46bc112916a5124a23a9c7b244b82d Author: Mike Frysinger Date: Mon Mar 21 02:39:10 2011 -0400 Blackfin: enable atomic64_t support Signed-off-by: Mike Frysinger commit 4e3d96deff59d126cfa289645e136e295e65480f Author: Mike Frysinger Date: Tue Mar 22 13:41:22 2011 -0400 Blackfin: wire up new syncfs syscall Signed-off-by: Mike Frysinger commit 1e924e2f1e073684b845c95886183bac6a992fb0 Author: Graf Yang Date: Fri Mar 19 08:01:27 2010 +0000 Blackfin: SMP: flush CoreB cache when shutting down When CoreB wakes up, it needs to read variables that CoreA might have modified, and might be in CoreB's cache. So kill CoreB's cache before going to sleep so that when we wake up, we are in a coherent state. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 6447f55da90b77faec1697d499ed7986bb4f6de6 Merge: c50e3f5 3ea205c Author: Linus Torvalds Date: Tue Mar 22 17:53:13 2011 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (66 commits) avr32: at32ap700x: fix typo in DMA master configuration dmaengine/dmatest: Pass timeout via module params dma: let IMX_DMA depend on IMX_HAVE_DMA_V1 instead of an explicit list of SoCs fsldma: make halt behave nicely on all supported controllers fsldma: reduce locking during descriptor cleanup fsldma: support async_tx dependencies and automatic unmapping fsldma: fix controller lockups fsldma: minor codingstyle and consistency fixes fsldma: improve link descriptor debugging fsldma: use channel name in printk output fsldma: move related helper functions near each other dmatest: fix automatic buffer unmap type drivers, pch_dma: Fix warning when CONFIG_PM=n. dmaengine/dw_dmac fix: use readl & writel instead of __raw_readl & __raw_writel avr32: at32ap700x: Specify DMA Flow Controller, Src and Dst msize dw_dmac: Setting Default Burst length for transfers as 16. dw_dmac: Allow src/dst msize & flow controller to be configured at runtime dw_dmac: Changing type of src_master and dest_master to u8. dw_dmac: Pass Channel Priority from platform_data dw_dmac: Pass Channel Allocation Order from platform_data ... commit c50e3f512a5a15a73acd94e6ec8ed63cd512e04f Author: Jean Delvare Date: Tue Mar 22 16:35:13 2011 -0700 bloat-o-meter: include read-only data section in report I'm not sure why the read-only data section is excluded from the report, it seems as relevant as the other data sections (b and d). I've stripped the symbols starting with __mod_ as they can have their names dynamically generated and thus comparison between binaries is not possible. Signed-off-by: Jean Delvare Cc: Andi Kleen Acked-by: Nathan Lynch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 565d76cb7d5fd7cb010fd690602280a69ab116ef Author: Jim Keniston Date: Tue Mar 22 16:35:12 2011 -0700 zlib: slim down zlib_deflate() workspace when possible Instead of always creating a huge (268K) deflate_workspace with the maximum compression parameters (windowBits=15, memLevel=8), allow the caller to obtain a smaller workspace by specifying smaller parameter values. For example, when capturing oops and panic reports to a medium with limited capacity, such as NVRAM, compression may be the only way to capture the whole report. In this case, a small workspace (24K works fine) is a win, whether you allocate the workspace when you need it (i.e., during an oops or panic) or at boot time. I've verified that this patch works with all accepted values of windowBits (positive and negative), memLevel, and compression level. Signed-off-by: Jim Keniston Cc: Herbert Xu Cc: David Miller Cc: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b12d12596992f608f5506a8dabe4d1299594bd1e Author: Andrey Vagin Date: Tue Mar 22 16:35:11 2011 -0700 fs/devpts/inode.c: correctly check d_alloc_name() return code in devpts_pty_new() d_alloc_name return NULL in case error, but we expect errno in devpts_pty_new. Addresses http://bugzilla.openvz.org/show_bug.cgi?id=1758 Signed-off-by: Andrey Vagin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e91f90bb0bb10be9cc8efd09a3cf4ecffcad0db1 Author: Roland Dreier Date: Tue Mar 22 16:35:10 2011 -0700 aio: wake all waiters when destroying ctx The test program below will hang because io_getevents() uses add_wait_queue_exclusive(), which means the wake_up() in io_destroy() only wakes up one of the threads. Fix this by using wake_up_all() in the aio code paths where we want to make sure no one gets stuck. // t.c -- compile with gcc -lpthread -laio t.c #include #include #include #include static const int nthr = 2; void *getev(void *ctx) { struct io_event ev; io_getevents(ctx, 1, 1, &ev, NULL); printf("io_getevents returned\n"); return NULL; } int main(int argc, char *argv[]) { io_context_t ctx = 0; pthread_t thread[nthr]; int i; io_setup(1024, &ctx); for (i = 0; i < nthr; ++i) pthread_create(&thread[i], NULL, getev, ctx); sleep(1); io_destroy(ctx); for (i = 0; i < nthr; ++i) pthread_join(thread[i], NULL); return 0; } Signed-off-by: Roland Dreier Reviewed-by: Jeff Moyer Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77d1c8eb8a8e0989f4c46e9a40bbd4185d34974e Author: Alexander Gordeev Date: Tue Mar 22 16:35:06 2011 -0700 pps: remove unreachable code Remove code enabled only when CONFIG_PREEMPT_RT is turned on because it is not used in the vanilla kernel. Signed-off-by: Alexander Gordeev Cc: john stultz Cc: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da23ef0549d4205ca9b576cf6cce9a80d0c3e43a Author: Stuart Swales Date: Tue Mar 22 16:35:06 2011 -0700 adfs: add hexadecimal filetype suffix option ADFS (FileCore) storage complies with the RISC OS filetype specification (12 bits of file type information is stored in the file load address, rather than using a file extension). The existing driver largely ignores this information and does not present it to the end user. It is desirable that stored filetypes be made visible to the end user to facilitate a precise copy of data and metadata from a hard disc (or image thereof) into a RISC OS emulator (such as RPCEmu) or to a network share which can be accessed by real Acorn systems. This patch implements a per-mount filetype suffix option (use -o ftsuffix=1) to present any filetype as a ,xyz hexadecimal suffix on each file. This type suffix is compatible with that used by RISC OS systems that access network servers using NFS client software and by RPCemu's host filing system. Signed-off-by: Stuart Swales Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a9730af9c596749425a98eba136152e5be4602a Author: Stuart Swales Date: Tue Mar 22 16:35:05 2011 -0700 adfs: improve timestamp precision ADFS (FileCore) storage complies with the RISC OS timestamp specification (40-bit centiseconds since 01 Jan 1900 00:00:00). It is desirable that stored timestamp precision be maintained to facilitate a precise copy of data and metadata from a hard disc (or image thereof) into a RISC OS emulator (such as RPCEmu). This patch implements a full-precision conversion from ADFS to Unix timestamp as the existing driver, for ease of calculation with old 32-bit compilers, uses the common trick of shifting the 40-bits representing centiseconds around into 32-bits representing seconds thereby losing precision. Signed-off-by: Stuart Swales Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f09719af705db56032ae480a2d9c32c2a3fcbd3 Author: Stuart Swales Date: Tue Mar 22 16:35:04 2011 -0700 adfs: fix E+/F+ dir size > 2048 crashing kernel Kernel crashes in fs/adfs module when accessing directories with a large number of objects on mounted Acorn ADFS E+/F+ format discs (or images) as the existing code writes off the end of the fixed array of struct buffer_head pointers. Additionally, each directory access that didn't crash would leak a buffer as nr_buffers was not adjusted correctly for E+/F+ discs (was always left as one less than required). The patch fixes this by allocating a dynamically-sized set of struct buffer_head pointers if necessary for the E+/F+ case (many directories still do in fact fit in 2048 bytes) and sets the correct nr_buffers so that all buffers are released. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=26072 Tested by tar'ing the contents of my RISC PC's E+ format 20Gb HDD which contains a number of large directories that previously crashed the kernel. Signed-off-by: Stuart Swales Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12da58b0c89e27617aaedde7dcf99a8690875e91 Author: Chen Gong Date: Tue Mar 22 16:35:03 2011 -0700 Documentation/vm/page-types.c: auto debugfs mount for hwpoison operation page-types.c doesn't supply a way to specify the debugfs path and the original debugfs path is not usual on most machines. This patch supplies a way to auto mount debugfs if needed. This patch is heavily inspired by tools/perf/utils/debugfs.c [akpm@linux-foundation.org: make functions static] [akpm@linux-foundation.org: fix debugfs_mount() signature] Signed-off-by: Chen Gong Reviewed-by: KOSAKI Motohiro Reviewed-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e06c374400148849cbf496fce7a28680c3604457 Author: Christian Kujau Date: Tue Mar 22 16:35:02 2011 -0700 Documentation/Changes: minor corrections I noticed the 'mcelog' program had no comment and then ended up "fixing" a few more things: * reiserfsck -V does not print "reiserfsprogs" (any more?) * is "udevinfo" still shipped? udevd certainly is * grub2 doesn't have a 'grub' binary * add a "# how to get the mcelog version" comment Signed-off-by: Christian Kujau Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38829dc9d7b46b195ab99d62c8c53c21a7adc36b Author: Harry Wei Date: Tue Mar 22 16:35:01 2011 -0700 Documentation/CodingStyle: flesh out if-else examples There is a missing case for "Chapter 3: Placing Braces and Spaces". We often know we should not use braces where a single statement. The first case is: if (condition) action(); Another case is: if (condition) do_this(); else do_that(); However, I can not find a description of the second case. Signed-off-by: Harry Wei Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bc825d240abcaf5ed6e9d59b44215b51718ef5b Author: Rakib Mullick Date: Tue Mar 22 16:35:00 2011 -0700 codafs: fix compile warning when CONFIG_SYSCTL=n When CONFIG_SYSCTL=n, we get the following warning: fs/coda/sysctl.c:18: warning: `coda_tabl' defined but not used Fix the warning by making sure coda_table and it's callee function are in the same context. Also clean up the code by removing extra #ifdef. [akpm@linux-foundation.org: remove unneeded stub macros] Signed-off-by: Rakib Mullick Cc: Jan Harkes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c00f0161f5e5bf1a441ea834c923f4102456489 Author: David Rientjes Date: Tue Mar 22 16:34:59 2011 -0700 x86: allow CONFIG_ISA_DMA_API to be disabled Not all 64-bit systems require ISA-style DMA, so allow it to be configurable. x86 utilizes the generic ISA DMA allocator from kernel/dma.c, so require it only when CONFIG_ISA_DMA_API is enabled. Disabling CONFIG_ISA_DMA_API is dependent on x86_64 since those machines do not have ISA slots and benefit the most from disabling the option (and on CONFIG_EXPERT as required by H. Peter Anvin). When disabled, this also avoids declaring claim_dma_lock(), release_dma_lock(), request_dma(), and free_dma() since those interfaces will no longer be provided. Signed-off-by: David Rientjes Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: Bjorn Helgaas Cc: Russell King Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8df3bd9e18cdc3539edea550be34605a240e15d4 Author: David Rientjes Date: Tue Mar 22 16:34:58 2011 -0700 x86: only compile floppy driver if CONFIG_ISA_DMA_API is enabled The generic floppy disk driver utilizies the interface provided by CONFIG_ISA_DMA_API, specifically claim_dma_lock(), release_dma_lock(), request_dma(), and free_dma(). Thus, there's a strict dependency on the config option and the driver should only be loaded if the kernel supports ISA-style DMA. Signed-off-by: David Rientjes Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: Bjorn Helgaas Cc: Russell King Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4061d68e1a59ffacdf216a55f254cb01d4d1f840 Author: David Rientjes Date: Tue Mar 22 16:34:57 2011 -0700 x86: only compile 8237A if CONFIG_ISA_DMA_API is enabled 8237A utilizes the interface provided by CONFIG_ISA_DMA_API, specifically claim_dma_lock() and release_dma_lock(). Thus, there's a strict dependency on the config option and the module should only be loaded if the kernel supports ISA-style DMA. Signed-off-by: David Rientjes Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: Bjorn Helgaas Cc: Russell King Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 586f83e2b4c080073b115c1a0fcc2757f52839b8 Author: David Rientjes Date: Tue Mar 22 16:34:56 2011 -0700 pnp: only assign IORESOURCE_DMA if CONFIG_ISA_DMA_API is enabled IORESOURCE_DMA cannot be assigned without utilizing the interface provided by CONFIG_ISA_DMA_API, specifically request_dma() and free_dma(). Thus, there's a strict dependency on the config option and limits IORESOURCE_DMA only to architectures that support ISA-style DMA. ia64 is not one of those architectures, so pnp_check_dma() no longer needs to be special-cased for that architecture. pnp_assign_resources() will now return -EINVAL if IORESOURCE_DMA is attempted on such a kernel. Signed-off-by: David Rientjes Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: Bjorn Helgaas Cc: Russell King Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff859ba6d166202d6fd8d6344a41be54e4c8a2b6 Author: Andrew Chew Date: Tue Mar 22 16:34:55 2011 -0700 rtc: add real-time clock driver for NVIDIA Tegra This is a platform driver that supports the built-in real-time clock on Tegra SOCs. Signed-off-by: Andrew Chew Acked-by: Alessandro Zummo Acked-by: Wan ZongShun Acked-by: Jon Mayo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49d50fb1c28738ef6bad0c2b87d5355a1653fed5 Author: Vasiliy Kulikov Date: Tue Mar 22 16:34:53 2011 -0700 drivers/rtc/rtc-ds1511.c: world-writable sysfs nvram file Don't allow everybogy to write to NVRAM. Signed-off-by: Vasiliy Kulikov Cc: Andy Sharp Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf044f0ed526752b8c2aaae748220759608b3fc8 Author: Ryan Mallon Date: Tue Mar 22 16:34:53 2011 -0700 drivers/rtc/rtc-isl1208.c: add alarm support Add alarm/wakeup support to rtc isl1208 driver Signed-off-by: Ryan Mallon Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc96ba7414ca4456661d0873856e0f363d32ba67 Author: Mark Brown Date: Tue Mar 22 16:34:52 2011 -0700 rtc: convert DS1374 to dev_pm_ops There is a general move to replace bus-specific PM ops with dev_pm_ops in order to facilitate core improvements. Do this conversion for DS1374. Signed-off-by: Mark Brown Cc: Alessandro Zummo Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea611b2699b51a762ef03f805f9616e65d98f68e Author: Davidlohr Bueso Date: Tue Mar 22 16:34:49 2011 -0700 init: return proper error code in do_mounts_rd() In do_mounts_rd() if memory cannot be allocated, return -ENOMEM. Signed-off-by: Davidlohr Bueso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a530a6f23f7dca336311ef60c9ca26f3dc63688 Author: David Daney Date: Tue Mar 22 16:34:48 2011 -0700 binfmt_elf: quiet GCC-4.6 'set but not used' warning in load_elf_binary() With GCC-4.6 we get warnings about things being 'set but not used'. In load_elf_binary() this can happen with reloc_func_desc if ELF_PLAT_INIT is defined, but doesn't use the reloc_func_desc argument. Quiet the warning/error by marking reloc_func_desc as __maybe_unused. Signed-off-by: David Daney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4d93ad74c18143abd3067ca3c8ffba7d00addf4 Author: Shawn Bohrer Date: Tue Mar 22 16:34:47 2011 -0700 epoll: fix compiler warning and optimize the non-blocking path Add a comment to ep_poll(), rename labels a bit clearly, fix a warning of unused variable from gcc and optimize the non-blocking path a little. Hinted-by: Andrew Morton Signed-off-by: Davide Libenzi hannes@cmpxchg.org: : The non-blocking ep_poll path optimization introduced skipping over the : return value setup. : : Initialize it properly, my userspace gets upset by epoll_wait() returning : random things. : : In addition, remove the reinitialization at the fetch_events label, the : return value is garuanteed to be zero when execution reaches there. [hannes@cmpxchg.org: fix initialization] Signed-off-by: Johannes Weiner Cc: Shawn Bohrer Acked-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fb0e584a68cd1c5085e69be441f2ad032aaee72 Author: Davide Libenzi Date: Tue Mar 22 16:34:46 2011 -0700 epoll: move ready event check into proper inline Move the event readiness check into a proper inline, and use it uniformly inside ep_poll() code. Events in the ->ovflist are no less ready than the ones in ->rdllist. Signed-off-by: Davide Libenzi Cc: Shawn Bohrer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d03e1617f089c0bcbc22b9d4739e04a0b43b14fa Author: Konstantin Khlebnikov Date: Tue Mar 22 16:34:45 2011 -0700 crc32: add missed brackets in macro Add brackets around typecasted argument in crc32() macro. Signed-off-by: Konstantin Khlebnikov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 309c00c73f053a905d144b430d4fb55d811085e2 Author: Dave Jones Date: Tue Mar 22 16:34:44 2011 -0700 checkpatch: warn about memset with swapped arguments Because the second and third arguments of memset have the same type, it turns out to be really easy to mix them up. This bug comes up time after time, so checkpatch should really be checking for it at patch submission time. Signed-off-by: Dave Jones Cc: Steven Rostedt Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0781216e7bff68aca2fbcd275b4db7531d1e22f Author: Mike Frysinger Date: Tue Mar 22 16:34:43 2011 -0700 scripts/checkpatch.pl: reset rpt_cleaners warnings If you run checkpatch against multiple patches, and one of them has a whitespace issue which can be helped via a script (rpt_cleaners), you will see the same NOTE over and over for all subsequent patches. It makes it seem like those patches also have whitespace problems when in reality, there's only one or two bad apples. So reset rpt_cleaners back to 0 after we've issued the note so that it only shows up near the patch with the actual problems. Signed-off-by: Mike Frysinger Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 984b203a7237d8d32090b48113c18eb8f824a2be Author: Chris Ball Date: Tue Mar 22 16:34:42 2011 -0700 drivers/mmc/host/omap_hsmmc.c: use resource_size() Use resource_size(). Signed-off-by: Chris Ball Cc: Madhusudhan Chikkature Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2092014df6e62b3ddfe8b6199da98cacfc055e23 Author: Chris Ball Date: Tue Mar 22 16:34:41 2011 -0700 drivers/mmc/host/omap.c: use resource_size() Signed-off-by: Chris Ball Cc: Jarkko Lavinen Cc: Tony Lindgren Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e359dc24d32e58c795fc339cb3e89ea6330fceae Author: Mike Frysinger Date: Tue Mar 22 16:34:40 2011 -0700 sigma-firmware: loader for Analog Devices' SigmaStudio Analog Devices' SigmaStudio can produce firmware blobs for devices with these DSPs embedded (like some audio codecs). Allow these device drivers to easily parse and load them. Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33ee3b2e2eb9b4b6c64dcf9ed66e2ac3124e748c Author: Alexey Dobriyan Date: Tue Mar 22 16:34:40 2011 -0700 kstrto*: converting strings to integers done (hopefully) right 1. simple_strto*() do not contain overflow checks and crufty, libc way to indicate failure. 2. strict_strto*() also do not have overflow checks but the name and comments pretend they do. 3. Both families have only "long long" and "long" variants, but users want strtou8() 4. Both "simple" and "strict" prefixes are wrong: Simple doesn't exactly say what's so simple, strict should not exist because conversion should be strict by default. The solution is to use "k" prefix and add convertors for more types. Enter kstrtoull() kstrtoll() kstrtoul() kstrtol() kstrtouint() kstrtoint() kstrtou64() kstrtos64() kstrtou32() kstrtos32() kstrtou16() kstrtos16() kstrtou8() kstrtos8() Include runtime testsuite (somewhat incomplete) as well. strict_strto*() become deprecated, stubbed to kstrto*() and eventually will be removed altogether. Use kstrto*() in code today! Note: on some archs _kstrtoul() and _kstrtol() are left in tree, even if they'll be unused at runtime. This is temporarily solution, because I don't want to hardcode list of archs where these functions aren't needed. Current solution with sizeof() and __alignof__ at least always works. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a5700cd6754a3c88d2ea2f1d7a56f671987fc25 Author: Kenneth Heitke Date: Tue Mar 22 16:34:39 2011 -0700 MAINTAINERS: add drivers/platform/msm to MSM subsystem Signed-off-by: Kenneth Heitke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 116ab806e871083d5695c25f13f85b0fded71737 Author: Joe Perches Date: Tue Mar 22 16:34:38 2011 -0700 MAINTAINERS: update WINBOND CIR pattern commit 5b2e303f6df ("[media] rc-core: convert winbond-cir") moved the files, update the pattern. Signed-off-by: Joe Perches Acked-by: David Härdeman Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1d2313025c92c25972372d3688d894476dcd61e Author: Joe Perches Date: Tue Mar 22 16:34:37 2011 -0700 MAINTAINERS: uSB SE401 moved to staging, update pattern And set the status to Orphan. Signed-off-by: Joe Perches Cc: Jeroen Vreeken Cc: Hans Verkuil Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 943fc810bdc9c0fce5cc66bdb65b42d699241aa6 Author: Joe Perches Date: Tue Mar 22 16:34:36 2011 -0700 MAINTAINERS: update SFI pattern commit 937f961a653 ("x86: Move sfi to platform") moved the files, update the pattern. Signed-off-by: Joe Perches Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e850855d747b5a8c7c54d90479b33f38d79726a Author: Joe Perches Date: Tue Mar 22 16:34:35 2011 -0700 MAINTAINERS: remove SHARP LH7A40X section commit 82e6923e186 ("ARM: lh7a40x: remove unmaintained platform support") removed support, remove it from MAINTAINERS. Signed-off-by: Joe Perches Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 390889b6da931096aa6d8d8bb013f75ad711c0f4 Author: Joe Perches Date: Tue Mar 22 16:34:34 2011 -0700 MAINTAINERS: update SCX200 file pattern commit 3b3da9d25ae ("x86: Move scx200 to platform") moved it, convert the pattern too. Signed-off-by: Joe Perches Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a83ea6ecd31cbf4330b2c0a616e3d2539d5b616 Author: Joe Perches Date: Tue Mar 22 16:34:34 2011 -0700 MAINTAINERS: remove unused TIMEKEEPING timekeeping.h Commit 88606e80da0 ("MAINTAINERS: Update timer related entries") added a file pattern that didn't actually exist. Signed-off-by: Joe Perches Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c45e98a274fd5cc5f270b06a0f224322bbed2d40 Author: Joe Perches Date: Tue Mar 22 16:34:33 2011 -0700 MAINTAINERS: remove IEEE1394 entry commit 66fa12c571d ("ieee1394: remove the old IEEE 1394 driver stack") removed the code, remove the MAINTAINERS entry. Signed-off-by: Joe Perches Cc: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a8374492b2301275debe1d378a12619a96a217e Author: Joe Perches Date: Tue Mar 22 16:34:32 2011 -0700 MAINTAINERS: update media path Commit 52b661449ae ("[media] rc: Rename remote controller type to rc_type instead of ir_type") moved it around. Signed-off-by: Joe Perches Cc: Maxim Levitsky Acked-by: Harry Wei Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4fa2651db4635d0fbb9ecc875a79072a00c3c3a7 Author: Joe Perches Date: Tue Mar 22 16:34:31 2011 -0700 MAINTAINERS: update clkdev location Commit 6d803ba736a ("ARM: 6483/1: arm & sh: factorised duplicated clkdev.c") moved it to a separate directory. Signed-off-by: Joe Perches Cc: Russell King Acked-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e08bbb8830b3ab1b583c9a2b30a45968f946c7a Author: Joe Perches Date: Tue Mar 22 16:34:30 2011 -0700 MAINTAINERS: remove unnecessary linux-kernel@vger.kernel.org entries CC'ing lkml is the default and doesn't need separate entries. Signed-off-by: Joe Perches Acked-by: Harry Wei Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e801dc5cf4af61d19c02fc7ea5e884fa07ce6264 Author: Joe Perches Date: Tue Mar 22 16:34:29 2011 -0700 MAINTAINERS: add missing : after HR Timers F tag Signed-off-by: Joe Perches Acked-by: Harry Wei Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ddf20e3743d6f1bb1f417749f10203f83664415 Author: Joe Perches Date: Tue Mar 22 16:34:29 2011 -0700 MAINTAINERS: remove ASOC CODEC DRIVERS files not in tree Remove these patterns until such files are actually in the tree. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3f531ac556d77bca39bfd454b8b151f562c30e4 Author: Joe Perches Date: Tue Mar 22 16:34:28 2011 -0700 MAINTAINERS: change web links from wiki-analog to wiki.analog wiki-analog doesn't seem to work, but wiki.analog does. Signed-off-by: Joe Perches Cc: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45b4e0d54bdbef19b5f753421851bdc91007c29b Author: Joe Perches Date: Tue Mar 22 16:34:27 2011 -0700 MAINTAINERS: update ADP5520 pattern Typo in path. Signed-off-by: Joe Perches Acked-by: Michael Hennerich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 706e69d67652686d45d431b36174aefa3760aa39 Author: Joe Perches Date: Tue Mar 22 16:34:26 2011 -0700 MAINTAINERS: quote non-alphanumeric email addresses Add quotes around email address with periods and commas. So they don't explode when pasted into certain email clients. Signed-off-by: Joe Perches Acked-by: Harry Wei Cc: "Mark F. Brown" Cc: "Gustavo F. Padovan" Cc: "Stephen M. Cameron" Cc: "Lee, Chun-Yi" Acked-by: Harry Wei Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b153da600c2755588aad1977349d14eab9c2a959 Author: Harry Wei Date: Tue Mar 22 16:34:25 2011 -0700 MAINTAINERS: add topgit for T: At least one tree: ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) is available via topgit. Add mention of topgit in the MAINTAINERS description section. Signed-off-by: Harry Wei Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7764dcb53473e5665ab3cdc461ccfc510fce925e Author: Joe Perches Date: Tue Mar 22 16:34:24 2011 -0700 get_maintainer.pl: allow "K:" pattern tests to match non-patch text Extend the usage of the K section in the MAINTAINERS file to support matching regular expressions to any arbitrary text that may precede the patch itself. For example, the commit message or mail headers generated by git-format-patch. Signed-off-by: Joe Perches Original-patch-by: L. Alberto Giménez Acked-by: L. Alberto Giménez Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5af5bcb8d37f99ba415a1adc6da71051b84f93a5 Author: Mandeep Singh Baines Date: Tue Mar 22 16:34:23 2011 -0700 printk: allow setting DEFAULT_MESSAGE_LEVEL via Kconfig We've been burned by regressions/bugs which we later realized could have been triaged quicker if only we'd paid closer attention to dmesg. To make it easier to audit dmesg, we'd like to make DEFAULT_MESSAGE_LEVEL Kconfig-settable. That way we can set it to KERN_NOTICE and audit any messages <= KERN_WARNING. Signed-off-by: Mandeep Singh Baines Cc: Ingo Molnar Cc: Joe Perches Cc: Olof Johansson Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f36e2c448007b54851e7e4fa48da97d1477a175 Author: Kees Cook Date: Tue Mar 22 16:34:22 2011 -0700 printk: use %pK for /proc/kallsyms and /proc/modules In an effort to reduce kernel address leaks that might be used to help target kernel privilege escalation exploits, this patch uses %pK when displaying addresses in /proc/kallsyms, /proc/modules, and /sys/module/*/sections/*. Note that this changes %x to %p, so some legitimately 0 values in /proc/kallsyms would have changed from 00000000 to "(null)". To avoid this, "(null)" is not used when using the "K" format. Anything that was already successfully parsing "(null)" in addition to full hex digits should have no problem with this change. (Thanks to Joe Perches for the suggestion.) Due to the %x to %p, "void *" casts are needed since these addresses are already "unsigned long" everywhere internally, due to their starting life as ELF section offsets. Signed-off-by: Kees Cook Cc: Eugene Teo Cc: Dan Rosenberg Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe3d8ad31cf51b062bbb8a9609eeb1d0c41a7f30 Author: Feng Tang Date: Tue Mar 22 16:34:21 2011 -0700 console: prevent registered consoles from dumping old kernel message over again For a platform with many consoles like: "console=tty1 console=ttyMFD2 console=ttyS0 earlyprintk=mrst" Each time when the non "selected_console" (tty1 and ttyMFD2 here) get registered, the existing kernel message will be printed out on registered consoles again, the "mrst" early console will get some same message for 3 times, and "tty1" will get some for twice. As suggested by Andrew Morton, every time a new console is registered, it will be set as the "exclusive" console which will dump the already existing kernel messages. Signed-off-by: Feng Tang Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bf693951a8e5f7e600a45b74d91d962a453146e Author: Fabio M. Di Nitto Date: Tue Mar 22 16:34:20 2011 -0700 console: allow to retain boot console via boot option keep_bootcon On some architectures, the boot process involves de-registering the boot console (early boot), initialize drivers and then re-register the console. This mechanism introduces a window in which no printk can happen on the console and messages are buffered and then printed once the new console is available. If a kernel crashes during this window, all it's left on the boot console is "console [foo] enabled, bootconsole disabled" making debug of the crash rather 'interesting'. By adding "keep_bootcon" option, do not unregister the boot console, that will allow to printk everything that is happening up to the crash. The option is clearly meant only for debugging purposes as it introduces lots of duplicated info printed on console, but will make bug report from users easier as it doesn't require a kernel build just to figure out where we crash. Signed-off-by: Fabio M. Di Nitto Acked-by: David S. Miller Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26297607e09ca6c7e6f2a6b86a8bee2f23503bb8 Author: Joe Perches Date: Tue Mar 22 16:34:19 2011 -0700 vsprintf: neaten %pK kptr_restrict, save a bit of code space If kptr restrictions are on, just set the passed pointer to NULL. $ size lib/vsprintf.o.* text data bss dec hex filename 8247 4 2 8253 203d lib/vsprintf.o.new 8282 4 2 8288 2060 lib/vsprintf.o.old Signed-off-by: Joe Perches Cc: Dan Rosenberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bb598fb23b6040e67b5e6db9a00b28cd26e5809 Author: Kirill A. Shutemov Date: Tue Mar 22 16:34:18 2011 -0700 drivers/dca/dca-core.c: use list_move() instead of list_del()/list_add() combination Signed-off-by: Kirill A. Shutemov Cc: Maciej Sosnowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f99a99330f85a84c346ddeb4adc72dbfad9b9e3e Author: Don Zickus Date: Tue Mar 22 16:34:17 2011 -0700 kernel/watchdog.c: always return NOTIFY_OK during cpu up/down events This patch addresses a couple of problems. One was the case when the hardlockup failed to start, it also failed to start the softlockup. There were valid cases when the hardlockup shouldn't start and that shouldn't block the softlockup (no lapic, bios controls perf counters). The second problem was when the hardlockup failed to start on boxes (from a no lapic or bios controlled perf counter case), it reported failure to the cpu notifier chain. This blocked the notifier from continuing to start other more critical pieces of cpu bring-up (in our case based on a 2.6.32 fork, it was the mce). As a result, during soft cpu online/offline testing, the system would panic when a cpu was offlined because the cpu notifier would succeed in processing a watchdog disable cpu event and would panic in the mce case as a result of un-initialized variables from a never executed cpu up event. I realized the hardlockup/softlockup cases are really just debugging aids and should never impede the progress of a cpu up/down event. Therefore I modified the code to always return NOTIFY_OK and instead rely on printks to inform the user of problems. Signed-off-by: Don Zickus Acked-by: Peter Zijlstra Reviewed-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fef2c9bc1b54c0261324a96e948c0b849796e896 Author: Don Zickus Date: Tue Mar 22 16:34:16 2011 -0700 kernel/watchdog.c: allow hardlockup to panic by default When a cpu is considered stuck, instead of limping along and just printing a warning, it is sometimes preferred to just panic, let kdump capture the vmcore and reboot. This gets the machine back into a stable state quickly while saving the info that got it into a stuck state to begin with. Add a Kconfig option to allow users to set the hardlockup to panic by default. Also add in a 'nmi_watchdog=nopanic' to override this. [akpm@linux-foundation.org: fix strncmp length] Signed-off-by: Don Zickus Acked-by: Peter Zijlstra Reviewed-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1b5f65e53af770ede22c113e249de2f6fa53706 Author: Phil Carmody Date: Tue Mar 22 16:34:15 2011 -0700 calibrate: retry with wider bounds when converge seems to fail Systems with unmaskable interrupts such as SMIs may massively underestimate loops_per_jiffy, and fail to converge anywhere near the real value. A case seen on x86_64 was an initial estimate of 256<<12, which converged to 511<<12 where the real value should have been over 630<<12. This admitedly requires bypassing the TSC calibration (lpj_fine), and a failure to settle in the direct calibration too, but is physically possible. This failure does not depend on my previous calibration optimisation, but by luck is easy to fix with the optimisation in place with a trivial retry loop. In the context of the optimised converging method, as we can no longer trust the starting estimate, enlarge the search bounds exponentially so that the number of retries is logarithmically bounded. [akpm@linux-foundation.org: mention x86_64 SMIs in comment] Signed-off-by: Phil Carmody Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Tested-by: Stephen Boyd Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 191e56880a6a638ce931859317f37deb084b6433 Author: Phil Carmody Date: Tue Mar 22 16:34:13 2011 -0700 calibrate: home in on correct lpj value more quickly Binary chop with a jiffy-resync on each step to find an upper bound is slow, so just race in a tight-ish loop to find an underestimate. If done with lots of individual steps, sometimes several hundreds of iterations would be required, which would impose a significant overhead, and make the initial estimate very low. By taking slowly increasing steps there will be less overhead. E.g. an x86_64 2.67GHz could have fitted in 613 individual small delays, but in reality should have been able to fit in a single delay 644 times longer, so underestimated by 31 steps. To reach the equivalent of 644 small delays with the accelerating scheme now requires about 130 iterations, so has <1/4th of the overhead, and can therefore be expected to underestimate by only 7 steps. As now we have a better initial estimate we can binary chop over a smaller range. With the loop overhead in the initial estimate kept low, and the step sizes moderate, we won't have under-estimated by much, so chose as tight a range as we can. Signed-off-by: Phil Carmody Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Tested-by: Stephen Boyd Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71c696b1d0310da3ab8033d743282959bd49d28b Author: Phil Carmody Date: Tue Mar 22 16:34:12 2011 -0700 calibrate: extract fall-back calculation into own helper The motivation for this patch series is that currently our OMAP calibrates itself using the trial-and-error binary chop fallback that some other architectures no longer need to perform. This is a lengthy process, taking 0.2s in an environment where boot time is of great interest. Patch 2/4 has two optimisations. Firstly, it replaces the initial repeated- doubling to find the relevant power of 2 with a tight loop that just does as much as it can in a jiffy. Secondly, it doesn't binary chop over an entire power of 2 range, it choses a much smaller range based on how much it squeezed in, and failed to squeeze in, during the first stage. Both are significant optimisations, and bring our calibration down from 23 jiffies to 5, and, in the process, often arrive at a more accurate lpj value. The 'bands' and 'sub-logarithmic' growth may look over-engineered, but they only cost a small level of inaccuracy in the initial guess (for all architectures) in order to avoid the very large inaccuracies that appeared during testing (on x86_64 architectures, and presumably others with less metronomic operation). Note that due to the existence of the TSC and other timers, the x86_64 will not typically use this fallback routine, but I wanted to code defensively, able to cope with all kinds of processor behaviours and kernel command line options. Patch 3/4 is an additional trap for the nightmare scenario where the initial estimate is very inaccurate, possibly due to things like SMIs. It simply retries with a larger bound. Stephen said: I tried this patch set out on an MSM7630. : : Before: : : Calibrating delay loop... 681.57 BogoMIPS (lpj=3407872) : : After: : : Calibrating delay loop... 680.75 BogoMIPS (lpj=3403776) : : But the really good news is calibration time dropped from ~247ms to ~56ms. : Sadly we won't be able to benefit from this should my udelay patches make : it into ARM because we would be using calibrate_delay_direct() instead (at : least on machines who choose to). Can we somehow reapply the logic behind : this to calibrate_delay_direct()? That would be even better, but this is : definitely a boot time improvement. : : Or maybe we could just replace calibrate_delay_direct() with this fallback : calculation? If __delay() is a thin wrapper around read_current_timer() : it should work just as well (plus patch 3 makes it handle SMIs). I'll try : that out. This patch: ... so that it can be modified more clinically. This is almost entirely cosmetic. The only change to the operation is that the global variable is only set once after the estimation is completed, rather than taking on all the intermediate values. However, there are no readers of that variable, so this change is unimportant. Signed-off-by: Phil Carmody Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Tested-by: Stephen Boyd Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bfb23fc4a481650e60d22dbe84c0fd5a9d49bba Author: Oleg Nesterov Date: Tue Mar 22 16:34:09 2011 -0700 sys_unshare: remove the dead CLONE_THREAD/SIGHAND/VM code Cleanup: kill the dead code which does nothing but complicates the code and confuses the reader. sys_unshare(CLONE_THREAD/SIGHAND/VM) is not really implemented, and I doubt very much it will ever work. At least, nobody even tried since the original 99d1419d96d7df9cfa56 ("unshare system call -v5: system call handler function") was applied more than 4 years ago. And the code is not consistent. unshare_thread() always fails unconditionally, while unshare_sighand() and unshare_vm() pretend to work if there is nothing to unshare. Remove unshare_thread(), unshare_sighand(), unshare_vm() helpers and related variables and add a simple CLONE_THREAD | CLONE_SIGHAND| CLONE_VM check into check_unshare_flags(). Also, move the "CLONE_NEWNS needs CLONE_FS" check from check_unshare_flags() to sys_unshare(). This looks more consistent and matches the similar do_sysvsem check in sys_unshare(). Note: with or without this patch "atomic_read(mm->mm_users) > 1" can give a false positive due to get_task_mm(). Signed-off-by: Oleg Nesterov Acked-by: Roland McGrath Cc: Janak Desai Cc: Daniel Lezcano Cc: "Eric W. Biederman" Cc: KOSAKI Motohiro Cc: Alexey Dobriyan Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d51985e484dd11d9047dfcd1278ec9ccfb435d5 Author: Michael Rodriguez Date: Tue Mar 22 16:34:07 2011 -0700 kernel/cpu.c: fix many errors related to style. Change the printk() calls to have the KERN_INFO/KERN_ERROR stuff, and fixes other coding style errors. Not _all_ of them are gone, though. [akpm@linux-foundation.org: revert the bits I disagree with] Signed-off-by: Michael Rodriguez Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34db18a054c600b6f81787165669dc572fe4de25 Author: Amerigo Wang Date: Tue Mar 22 16:34:06 2011 -0700 smp: move smp setup functions to kernel/smp.c Move setup_nr_cpu_ids(), smp_init() and some other SMP boot parameter setup functions from init/main.c to kenrel/smp.c, saves some #ifdef CONFIG_SMP. Signed-off-by: WANG Cong Cc: Rakib Mullick Cc: David Howells Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Tejun Heo Cc: Arnd Bergmann Cc: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa9ee9c4b9885dfdf8eccac19b8b4fc8a7c53288 Author: Uwe Kleine-König Date: Tue Mar 22 16:34:05 2011 -0700 include/linux/err.h: add a function to cast error-pointers to a return value PTR_RET() can be used if you have an error-pointer and are only interested in the eventual error value, but not the pointer. Yields the usual 0 for no error, -ESOMETHING otherwise. Signed-off-by: Uwe Kleine-König Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d404ab0a1133e95557bb7deab2a49b348dfeba85 Author: Olaf Hering Date: Tue Mar 22 16:34:04 2011 -0700 move x86 specific oops=panic to generic code The oops=panic cmdline option is not x86 specific, move it to generic code. Update documentation. Signed-off-by: Olaf Hering Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b259514282d54323aaadead3dac4823ea01f9b89 Author: Axel Lin Date: Tue Mar 22 16:34:02 2011 -0700 drivers/misc/pch_phub.c: add MODULE_DEVICE_TABLE The device table is required to load modules based on modaliases. Signed-off-by: Axel Lin Cc: Masayuki Ohtak Cc: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit deb187e72470b0382d4f0cb859e76e1ebc3a1082 Author: Vasiliy Kulikov Date: Tue Mar 22 16:34:01 2011 -0700 drivers/misc/ep93xx_pwm.c: world-writable sysfs files Don't allow everybody to change device settings. Signed-off-by: Vasiliy Kulikov Acked-by: Hartley Sweeten Cc: Matthieu Crapet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a844b43ca078d7dd8f0cd13c6f030ec62a996975 Author: Axel Lin Date: Tue Mar 22 16:34:01 2011 -0700 drivers/misc/atmel_tclib.c: fix a memory leak request_mem_region() will call kzalloc to allocate memory for struct resource. release_resource() unregisters the resource but does not free the allocated memory, thus use release_mem_region() instead to fix the memory leak. Signed-off-by: Axel Lin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f7d485e13c6c07348cf9cfd1b735fe1bcf3caa9 Author: Axel Lin Date: Tue Mar 22 16:34:00 2011 -0700 drivers/misc/hmc6352.c: fix wrong return value checking for i2c_master_recv() i2c_master_recv() returns negative errno, or else the number of bytes read. Thus i2c_master_recv(client, i2c_data, 2) returns 2 instead of 1 in success case. [akpm@linux-foundation.org: make `ret' signed] Signed-off-by: Axel Lin Cc: Kalhan Trisal Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e6735992392ecd393674119aef9ec7bff9be5b0 Author: Hong Liu Date: Tue Mar 22 16:33:59 2011 -0700 drivers/misc/apds9802als.c: put the device into runtime suspend after resume()/probe() is handled Put the device into runtime suspend after resume()/probe() is handled by the PM core and the device core code. No need to manually add them in each single driver. And correct the runtime state in remove(). Signed-off-by: Hong Liu Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9500546d5f85b56359657e1f78334db8de851fd Author: Pratyush Anand Date: Tue Mar 22 16:33:58 2011 -0700 ST SPEAr: PCIE gadget suppport This is a configurable gadget. can be configured by configfs interface. Any IP available at PCIE bus can be programmed to be used by host controller.It supoorts both INTX and MSI. By default, the gadget is configured for INTX and SYSRAM1 is mapped to BAR0 with size 0x1000 Signed-off-by: Pratyush Anand Cc: Randy Dunlap Cc: Jesse Barnes Cc: Viresh Kumar Cc: Shiraz Hashim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45bff2ea4285cac5b4438c65216e114d3619f123 Author: Shubhrajyoti Datta Date: Tue Mar 22 16:33:57 2011 -0700 drivers/misc/bmp085.c: free initmem memory Free the memory that is used only at init Signed-off-by: Shubhrajyoti Datta Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a7de634f0316080cae5dd4a994112049a7d8462 Author: Shubhrajyoti Datta Date: Tue Mar 22 16:33:57 2011 -0700 bh1780gli: convert to dev pm ops Signed-off-by: Shubhrajyoti Datta Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3ccfcdaf3986f8c541886606e950de52cab7ad3 Author: Richard Kennedy Date: Tue Mar 22 16:33:56 2011 -0700 fs.h: remove 8 bytes of padding from block_device on 64bit builds Re-ordering struct block_inode to remove 8 bytes of padding on 64 bit builds, which also shrinks bdev_inode by 8 bytes (776 -> 768) allowing it to fit into one fewer cache lines. Signed-off-by: Richard Kennedy Cc: Al Viro Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c837fb37a60aa642b9ad423462e32b851a03020a Author: Borislav Petkov Date: Tue Mar 22 16:33:55 2011 -0700 include/linux/compiler-gcc*.h: unify macro definitions Unify identical gcc3.x and gcc4.x macros. Signed-off-by: Borislav Petkov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80cdc6dae76ea67d2b21bdca8df17ef47251eb8b Author: Mandeep Singh Baines Date: Tue Mar 22 16:33:54 2011 -0700 fs: use appropriate printk priority levels printk()s without a priority level default to KERN_WARNING. To reduce noise at KERN_WARNING, this patch set the priority level appriopriately for unleveled printks()s. This should be useful to folks that look at dmesg warnings closely. Signed-off-by: Mandeep Singh Baines Cc: Jens Axboe Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e50594e8e72932ad4cfcb0b3cbdf58fc3bce416 Author: FUJITA Tomonori Date: Tue Mar 22 16:33:50 2011 -0700 add the common dma_addr_t typedef to include/linux/types.h All architectures can use the common dma_addr_t typedef now. We can remove the arch specific dma_addr_t. Signed-off-by: FUJITA Tomonori Acked-by: Arnd Bergmann Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Ivan Kokshaysky Cc: Richard Henderson Cc: Matt Turner Cc: "Luck, Tony" Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Chris Metcalf Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a06dc4d52458e4a909b652ee9fe8f82d2cd87a2 Author: Richard Weinberger Date: Tue Mar 22 16:33:48 2011 -0700 um: remove file pointer from ioctl Commit 6caa76b ("tty: now phase out the ioctl file pointer for good") removed the ioctl file pointer. User Mode Linux's line driver uses this ioctl and needs a signature update too. Signed-off-by: Richard Weinberger Cc: Alan Cox Cc: Greg KH Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13e165baf6ada9f427c319bd41a1c7a9c7b4f0a6 Author: Paul Pluzhnikov Date: Tue Mar 22 16:33:46 2011 -0700 uml: kernels on {i386,x86_64} produce bad coredumps One of our users reported that when a user-level program SIGSEGVs under UML kernel, the resulting core dump is not very usable. I have reproduced that with the latest kernel: make ARCH=um defconfig; make ARCH=um Run the resulting kernel, then "inside" run this program: #include void *fn(void *p) { abort(); } int main() { pthread_t tid; pthread_create(&tid, 0, fn, 0); pthread_join(tid, 0); return 0; } Analyze the coredump with GDB. Here is what you'll see: sudo gdb -q -ex 'set solib-absolute-prefix ../root_fs' -ex 'file ../root_fs/var/tmp/mt-abort' -ex 'core ../root_fs/var/tmp/core.762' Reading symbols from /usr/local/google/root_fs/var/tmp/mt-abort...done. [New Thread 763] [New Thread 762] Core was generated by `./mt-abort'. Program terminated with signal 6, Aborted. #0 0x0000000040255250 in raise () from ../root_fs/lib64/libc.so.6 (gdb) info thread 2 Thread 762 0x0000000000000000 in ?? () * 1 Thread 763 0x0000000040255250 in raise () from ../root_fs/lib64/libc.so.6 Note that thread#2 looks funny. (gdb) thread 2 [Switching to thread 2 (Thread 762)]#0 0x0000000000000000 in ?? () (gdb) info reg rax 0x0 0 rbx 0x0 0 rcx 0x0 0 rdx 0x0 0 rsi 0x0 0 rdi 0x0 0 rbp 0x0 0x0 rsp 0x0 0x0 r8 0x0 0 r9 0x0 0 r10 0x0 0 r11 0x0 0 r12 0x0 0 r13 0x0 0 r14 0x0 0 r15 0x0 0 rip 0x0 0 eflags 0x0 [ ] cs 0x0 0 ss 0x0 0 ds 0x0 0 es 0x0 0 fs 0x0 0 gs 0x0 0 Examining the core shows that NT_PRSTATUS notes for all threads other than the one that crashed are zeroed out. I believe this is happening because neither ELF_CORE_COPY_TASK_REGS nor task_pt_regs are defined under ARCH=um, and so elf_core_copy_task_regs() becomes a no-op. Attached patch fixes this for SUBARCH={x86_64,i386}. Signed-off-by: Paul Pluzhnikov Cc: Jeff Dike Acked-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dd7ae8ec0ef399bfea347f297d2a95504d35571 Author: Shaohua Li Date: Tue Mar 22 16:33:45 2011 -0700 mm: simplify code of swap.c Clean up code and remove duplicate code. Next patch will use pagevec_lru_move_fn introduced here too. Signed-off-by: Shaohua Li Cc: KOSAKI Motohiro Cc: Hiroyuki Kamezawa Cc: Andi Kleen Reviewed-by: Minchan Kim Cc: Rik van Riel Cc: Mel Gorman Cc: Johannes Weiner Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bee4c36a5cf5c9f63ce1d7372aa62045fbd16d47 Author: Hugh Dickins Date: Tue Mar 22 16:33:43 2011 -0700 shmem: let shared anonymous be nonlinear again Up to 2.6.22, you could use remap_file_pages(2) on a tmpfs file or a shared mapping of /dev/zero or a shared anonymous mapping. In 2.6.23 we disabled it by default, but set VM_CAN_NONLINEAR to enable it on safe mappings. We made sure to set it in shmem_mmap() for tmpfs files, but missed it in shmem_zero_setup() for the others. Fix that at last. Reported-by: Kenny Simpson Signed-off-by: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f7a66051b7523108c5aefb08c6a637e54aedc47 Author: Benjamin Herrenschmidt Date: Tue Mar 22 16:33:43 2011 -0700 mm/memblock: properly handle overlaps and fix error path Currently memblock_reserve() or memblock_free() don't handle overlaps of any kind. There is some special casing for coalescing exactly adjacent regions but that's about it. This is annoying because typically memblock_reserve() is used to mark regions passed by the firmware as reserved and we all know how much we can trust our firmwares... Also, with the current code, if we do something it doesn't handle right such as trying to memblock_reserve() a large range spanning multiple existing smaller reserved regions for example, or doing overlapping reservations, it can silently corrupt the internal region array, causing odd errors much later on, such as allocations returning reserved regions etc... This patch rewrites the underlying functions that add or remove a region to the arrays. The new code is a lot more robust as it fully handles overlapping regions. It's also, imho, simpler than the previous implementation. In addition, while doing so, I found a bug where if we fail to double the array while adding a region, we would remove the last region of the array rather than the region we just allocated. This fixes it too. Signed-off-by: Benjamin Herrenschmidt Acked-by: Yinghai Lu Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84be48d84a53044e13aa8816aab201ab5480815d Author: Kirill A. Shutemov Date: Tue Mar 22 16:33:41 2011 -0700 mm/page_alloc.c: use list_move() instead of list_del()/list_add() combination Signed-off-by: Kirill A. Shutemov Cc: Mel Gorman Cc: Rik van Riel Cc: KAMEZAWA Hiroyuki Reviewed-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a42931bf9c02fbf3628a27a2a5c55d2b83e4ff20 Author: Namhyung Kim Date: Tue Mar 22 16:33:41 2011 -0700 vmalloc: remove confusing comment on vwrite() KM_USER1 is never used for vwrite() path so the caller doesn't need to guarantee it is not used. Only the caller should guarantee is KM_USER0 and it is commented already. Signed-off-by: Namhyung Kim Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf15b07cf448e19dcb31a19f0cbaf898b08ce975 Author: Jun'ichi Nomura Date: Tue Mar 22 16:33:40 2011 -0700 writeback: make mapping->writeback_index to point to the last written page For range-cyclic writeback (e.g. kupdate), the writeback code sets a continuation point of the next writeback to mapping->writeback_index which is set the page after the last written page. This happens so that we evenly write the whole file even if pages in it get continuously redirtied. However, in some cases, sequential writer is writing in the middle of the page and it just redirties the last written page by continuing from that. For example with an application which uses a file as a big ring buffer we see: [1st writeback session] ... flush-8:0-2743 4571: block_bio_queue: 8,0 W 94898514 + 8 flush-8:0-2743 4571: block_bio_queue: 8,0 W 94898522 + 8 flush-8:0-2743 4571: block_bio_queue: 8,0 W 94898530 + 8 flush-8:0-2743 4571: block_bio_queue: 8,0 W 94898538 + 8 flush-8:0-2743 4571: block_bio_queue: 8,0 W 94898546 + 8 kworker/0:1-11 4571: block_rq_issue: 8,0 W 0 () 94898514 + 40 >> flush-8:0-2743 4571: block_bio_queue: 8,0 W 94898554 + 8 >> flush-8:0-2743 4571: block_rq_issue: 8,0 W 0 () 94898554 + 8 [2nd writeback session after 35sec] flush-8:0-2743 4606: block_bio_queue: 8,0 W 94898562 + 8 flush-8:0-2743 4606: block_bio_queue: 8,0 W 94898570 + 8 flush-8:0-2743 4606: block_bio_queue: 8,0 W 94898578 + 8 ... kworker/0:1-11 4606: block_rq_issue: 8,0 W 0 () 94898562 + 640 kworker/0:1-11 4606: block_rq_issue: 8,0 W 0 () 94899202 + 72 ... flush-8:0-2743 4606: block_bio_queue: 8,0 W 94899962 + 8 flush-8:0-2743 4606: block_bio_queue: 8,0 W 94899970 + 8 flush-8:0-2743 4606: block_bio_queue: 8,0 W 94899978 + 8 flush-8:0-2743 4606: block_bio_queue: 8,0 W 94899986 + 8 flush-8:0-2743 4606: block_bio_queue: 8,0 W 94899994 + 8 kworker/0:1-11 4606: block_rq_issue: 8,0 W 0 () 94899962 + 40 >> flush-8:0-2743 4606: block_bio_queue: 8,0 W 94898554 + 8 >> flush-8:0-2743 4606: block_rq_issue: 8,0 W 0 () 94898554 + 8 So we seeked back to 94898554 after we wrote all the pages at the end of the file. This extra seek seems unnecessary. If we continue writeback from the last written page, we can avoid it and do not cause harm to other cases. The original intent of even writeout over the whole file is preserved and if the page does not get redirtied pagevec_lookup_tag() just skips it. As an exceptional case, when I/O error happens, set done_index to the next page as the comment in the code suggests. Tested-by: Wu Fengguang Signed-off-by: Jun'ichi Nomura Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24b8ff7c27d9e975540656e377de44a2a181a01f Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:38 2011 -0700 mm: remove inline from scan_swap_map() scan_swap_map() is a large function (224 lines), with several loops and a complex control flow involving several gotos. Given all that, it is a bit silly that it is marked as inline. The compiler agrees with me: on a x86-64 compile, it did not inline the function. Remove the "inline" and let the compiler decide instead. Signed-off-by: Cesar Eduardo Barros Reviewed-by: Pekka Enberg Reviewed-by: KOSAKI Motohiro Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40531542e2832419566c997af0808513f6f2815d Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:37 2011 -0700 sys_swapon: separate final enabling of the swapfile The block in sys_swapon which does the final adjustments to the swap_info_struct and to swap_list is the same as the block which re-inserts it again at sys_swapoff on failure of try_to_unuse(). Move this code to a separate function, and use it both in sys_swapon and sys_swapoff. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6a2b64ba5d09a1e281e85988ffd650655fa0f39 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:36 2011 -0700 sys_swapoff: change order to match sys_swapon The block in sys_swapon which does the final adjustments to the swap_info_struct and to swap_list is the same as the block which re-inserts it again at sys_swapoff on failure of try_to_unuse(), except for the order of the operations within the lock. Since the order should not matter, arbitrarily change sys_swapoff to match sys_swapon, in preparation to making both share the same code. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c69dbfb84e88503468b6c481aecdb48d76ad5bc6 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:35 2011 -0700 sys_swapon: move printk outside lock The block in sys_swapon which does the final adjustments to the swap_info_struct and to swap_list is the same as the block which re-inserts it again at sys_swapoff on failure of try_to_unuse(). To be able to make both share the same code, move the printk() call in the middle of it to just after it. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c8100ef26ba9012b8677a383179a0cf169fc7f3 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:34 2011 -0700 sys_swapon: remove nr_good_pages variable It still exists within setup_swap_map_and_extents(), but after it nr_good_pages == p->pages. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdb8e3f68320f897de3f3a4c363fe2802037f21d Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:33 2011 -0700 sys_swapon: simplify error flow in setup_swap_map_and_extents() Since there is no cleanup to do, there is no reason to jump to a label. Return directly instead. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 915d4d7bc0d719f2f0907273c01967d38751c625 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:32 2011 -0700 sys_swapon: separate parsing of bad blocks and extents Move the code which parses the bad block list and the extents to a separate function. Only code movement, no functional changes. This change uses the fact that, after the success path, nr_good_pages == p->pages. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1421ef3cd15b87ef949e965efeb1e527479d3f75 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:31 2011 -0700 sys_swapon: call swap_cgroup_swapon() earlier The call to swap_cgroup_swapon is in the middle of loading the swap map and extents. As it only does memory allocation and does not depend on the swapfile layout (map/extents), it can be called earlier (or later). Move it to just after the allocation of swap_map, since it is conceptually similar (allocates a map). Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38719025384cf7121331bd6d41c062d3c5f7bb91 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:30 2011 -0700 sys_swapon: simplify error flow in read_swap_header() Since there is no cleanup to do, there is no reason to jump to a label. Return directly instead. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca8bd38bf6f05481c4155fc444178151884f65d0 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:29 2011 -0700 sys_swapon: separate parsing of swapfile header Move the code which parses and checks the swapfile header (except for the bad block list) to a separate function. Only code movement, no functional changes. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5de771e41f0fc2243c39585357b73f0ff757b280 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:28 2011 -0700 sys_swapon: move setting of swapfilepages near use There is no reason I can see to read inode->i_size long before it is needed. Move its read to just before it is needed, to reduce the variable lifetime. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Jesper Juhl Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87ade72a799a9a895b4a60918c32b43d3dfc3324 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:27 2011 -0700 sys_swapon: simplify error flow in claim_swapfile() Since there is no cleanup to do, there is no reason to jump to a label. Return directly instead. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d0e1e10752ca487d83d1ab2a1d4ae6d664e1cc0 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:26 2011 -0700 sys_swapon: separate bdev claim and inode lock Move the code which claims the bdev (S_ISBLK) or locks the inode (S_ISREG) to a separate function. Only code movement, no functional changes. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd69010b042a60ca41a890df1b10019e94746c2f Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:25 2011 -0700 sys_swapon: use a single error label sys_swapon currently has two error labels, bad_swap and bad_swap_2. bad_swap does the same as bad_swap_2 plus destroy_swap_extents() and swap_cgroup_swapoff(); both are noops in the places where bad_swap_2 is jumped to. With a single extra test for inode (matching the one in the S_ISREG case below), all the error paths in the function can go to bad_swap. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b01c350af4fb00fe2ab66ff9bf16058c50b69bd Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:24 2011 -0700 sys_swapon: do only cleanup in the cleanup blocks The only way error is 0 in the cleanup blocks is when the function is returning successfully. In this case, the cleanup blocks were setting S_SWAPFILE in the S_ISREG case. But this is not a cleanup. Move the setting of S_SWAPFILE to just before the "goto out;" to make this more clear. At this point, we do not need to test for inode because it will never be NULL. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2090d2df51d7cdb2f952dcfdcd8baaac0aec444 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:23 2011 -0700 sys_swapon: remove bdev variable The bdev variable is always equivalent to (S_ISBLK(inode->i_mode) ? p->bdev : NULL), as long as it being set is moved to a bit earlier. Use this fact to remove the bdev variable. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7de7fb6b3422e6d1dac00666a992834085e745dc Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:22 2011 -0700 sys_swapon: move setting of error nearer use Move the setting of the error variable nearer the goto in a few places. Avoids calling PTR_ERR() if not IS_ERR() in two places, and makes the error condition more explicit in two other places. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Jesper Juhl Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83ef99befc324803a54cf2a5fab5a322df3a99d6 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:21 2011 -0700 sys_swapon: remove did_down variable Since mutex_lock(&inode->i_mutex) is called just after setting inode, did_down is always equivalent to (inode && S_ISREG(inode->i_mode)). Use this fact to remove the did_down variable. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28b36bd741bd44db30e12b1048a659aa346e9b76 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:20 2011 -0700 sys_swapon: remove initial value of name variable Now there is nothing which jumps to the cleanup blocks before the name variable is set. There is no need to set it initially to NULL anymore. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 730c0581c82dbc5be2f41a2d85bde6bad11bc8a4 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:19 2011 -0700 sys_swapon: simplify error flow in alloc_swap_info() Since there is no cleanup to do, there is no reason to jump to a label. Return directly instead. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2542e5134d2c19a9e6a4e641ef78cac6bccebd9b Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:18 2011 -0700 sys_swapon: simplify error return from swap_info allocation At this point in sys_swapon, there is nothing to free. Return directly instead of jumping to the cleanup block at the end of the function. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53cbb2435f161f2a8b36af8f6d2c46dc59d0d757 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:17 2011 -0700 sys_swapon: separate swap_info allocation Move the swap_info allocation to its own function. Only code movement, no functional changes. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8e6c2ec403ecfaa226857d8204344c98fe12b7b Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:16 2011 -0700 sys_swapon: do not depend on "type" after allocation Within sys_swapon, after the swap_info entry has been allocated, we always have type == p->type and swap_info[type] == p. Use this fact to reduce the dependency on the "type" local variable within the function, as a preparation to move the allocation of the swap_info entry to a separate function. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80b0df12b808bf8e8391afae1b43f5e529f76d89 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:15 2011 -0700 sys_swapon: remove changelog from function comment Changelogs belong in the git history instead of in the source code. Also, "The swapon system call" is redundant with "SYSCALL_DEFINE2(swapon, ...)". Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: Jesper Juhl Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton [ Gaah. That's a _historical_ comment. But the patch-series depends on removal ] Signed-off-by: Linus Torvalds commit 803d0c8351b47b72b8b018457a33b342557b90a2 Author: Cesar Eduardo Barros Date: Tue Mar 22 16:33:14 2011 -0700 sys_swapon: use vzalloc() instead of vmalloc/memset This patch series refactors the sys_swapon function. sys_swapon is currently a very large function, with 313 lines (more than 12 25-line screens), which can make it a bit hard to read. This patch series reduces this size by half, by extracting large chunks of related code to new helper functions. One of these chunks of code was nearly identical to the part of sys_swapoff which is used in case of a failure return from try_to_unuse(), so this patch series also makes both share the same code. As a side effect of all this refactoring, the compiled code gets a bit smaller (from v1 of this patch series): text data bss dec hex filename 14012 944 276 15232 3b80 mm/swapfile.o.before 13941 944 276 15161 3b39 mm/swapfile.o.after This patch: Use vzalloc() instead of vmalloc/memset. Signed-off-by: Cesar Eduardo Barros Tested-by: Eric B Munson Acked-by: Eric B Munson Reviewed-by: Pekka Enberg Reviewed-by: Jesper Juhl Reviewed-by: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc5d462f7777c06c5cf0b55d736be325cda747b3 Author: Andi Kleen Date: Tue Mar 22 16:33:13 2011 -0700 mm: use __GFP_OTHER_NODE for transparent huge pages Pass __GFP_OTHER_NODE for transparent hugepages NUMA allocations done by the hugepages daemon. This way the low level accounting for local versus remote pages works correctly. Contains improvements from Andrea Arcangeli [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Andi Kleen Cc: Andrea Arcangeli Reviewed-by: KAMEZAWA Hiroyuki Cc: Johannes Weiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78afd5612deb8268bafc8b6507d72341d5ed9aac Author: Andi Kleen Date: Tue Mar 22 16:33:12 2011 -0700 mm: add __GFP_OTHER_NODE flag Add a new __GFP_OTHER_NODE flag to tell the low level numa statistics in zone_statistics() that an allocation is on behalf of another thread. This way the local and remote counters can be still correct, even when background daemons like khugepaged are changing memory mappings. This only affects the accounting, but I think it's worth doing that right to avoid confusing users. I first tried to just pass down the right node, but this required a lot of changes to pass down this parameter and at least one addition of a 10th argument to a 9 argument function. Using the flag is a lot less intrusive. Open: should be also used for migration? [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Andi Kleen Cc: Andrea Arcangeli Reviewed-by: KAMEZAWA Hiroyuki Cc: Johannes Weiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11bc82d67d1150767901bca54a24466621d763d7 Author: Andrea Arcangeli Date: Tue Mar 22 16:33:11 2011 -0700 mm: compaction: Use async migration for __GFP_NO_KSWAPD and enforce no writeback __GFP_NO_KSWAPD allocations are usually very expensive and not mandatory to succeed as they have graceful fallback. Waiting for I/O in those, tends to be overkill in terms of latencies, so we can reduce their latency by disabling sync migrate. Unfortunately, even with async migration it's still possible for the process to be blocked waiting for a request slot (e.g. get_request_wait in the block layer) when ->writepage is called. To prevent __GFP_NO_KSWAPD blocking, this patch prevents ->writepage being called on dirty page cache for asynchronous migration. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=31142 [mel@csn.ul.ie: Avoid writebacks for NFS, retry locked pages, use bool] Signed-off-by: Andrea Arcangeli Signed-off-by: Mel Gorman Cc: Arthur Marsh Cc: Clemens Ladisch Cc: Johannes Weiner Cc: KAMEZAWA Hiroyuki Cc: Minchan Kim Reported-by: Alex Villacis Lasso Tested-by: Alex Villacis Lasso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2eef8c0d09101bbbff2531c097543aedde0b525 Author: Andrea Arcangeli Date: Tue Mar 22 16:33:10 2011 -0700 mm: compaction: minimise the time IRQs are disabled while isolating pages for migration compaction_alloc() isolates pages for migration in isolate_migratepages. While it's scanning, IRQs are disabled on the mistaken assumption the scanning should be short. Tests show this to be true for the most part but contention times on the LRU lock can be increased. Before this patch, the IRQ disabled times for a simple test looked like Total sampled time IRQs off (not real total time): 5493 Event shrink_inactive_list..shrink_zone 1596 us count 1 Event shrink_inactive_list..shrink_zone 1530 us count 1 Event shrink_inactive_list..shrink_zone 956 us count 1 Event shrink_inactive_list..shrink_zone 541 us count 1 Event shrink_inactive_list..shrink_zone 531 us count 1 Event split_huge_page..add_to_swap 232 us count 1 Event save_args..call_softirq 36 us count 1 Event save_args..call_softirq 35 us count 2 Event __wake_up..__wake_up 1 us count 1 This patch reduces the worst-case IRQs-disabled latencies by releasing the lock every SWAP_CLUSTER_MAX pages that are scanned and releasing the CPU if necessary. The cost of this is that the processing performing compaction will be slower but IRQs being disabled for too long a time has worse consequences as the following report shows; Total sampled time IRQs off (not real total time): 4367 Event shrink_inactive_list..shrink_zone 881 us count 1 Event shrink_inactive_list..shrink_zone 875 us count 1 Event shrink_inactive_list..shrink_zone 868 us count 1 Event shrink_inactive_list..shrink_zone 555 us count 1 Event split_huge_page..add_to_swap 495 us count 1 Event compact_zone..compact_zone_order 269 us count 1 Event split_huge_page..add_to_swap 266 us count 1 Event shrink_inactive_list..shrink_zone 85 us count 1 Event save_args..call_softirq 36 us count 2 Event __wake_up..__wake_up 1 us count 1 [akpm@linux-foundation.org: simplify with s/unlocked/locked/] Signed-off-by: Andrea Arcangeli Signed-off-by: Mel Gorman Cc: Johannes Weiner Cc: Arthur Marsh Cc: Clemens Ladisch Cc: KAMEZAWA Hiroyuki Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 602605a42ea4c299aeed4d806c49fb9dd18cd204 Author: Mel Gorman Date: Tue Mar 22 16:33:08 2011 -0700 mm: compaction: minimise the time IRQs are disabled while isolating free pages compaction_alloc() isolates free pages to be used as migration targets. While its scanning, IRQs are disabled on the mistaken assumption the scanning should be short. Analysis showed that IRQs were in fact being disabled for substantial time. A simple test was run using large anonymous mappings with transparent hugepage support enabled to trigger frequent compactions. A monitor sampled what the worst IRQ-off latencies were and a post-processing tool found the following; Total sampled time IRQs off (not real total time): 22355 Event compaction_alloc..compaction_alloc 8409 us count 1 Event compaction_alloc..compaction_alloc 7341 us count 1 Event compaction_alloc..compaction_alloc 2463 us count 1 Event compaction_alloc..compaction_alloc 2054 us count 1 Event shrink_inactive_list..shrink_zone 1864 us count 1 Event shrink_inactive_list..shrink_zone 88 us count 1 Event save_args..call_softirq 36 us count 1 Event save_args..call_softirq 35 us count 2 Event __make_request..__blk_run_queue 24 us count 1 Event __alloc_pages_nodemask..__alloc_pages_nodemask 6 us count 1 i.e. compaction is disabled IRQs for a prolonged period of time - 8ms in one instance. The full report generated by the tool can be found at http://www.csn.ul.ie/~mel/postings/minfree-20110225/irqsoff-vanilla-micro.report This patch reduces the time IRQs are disabled by simply disabling IRQs at the last possible minute. An updated IRQs-off summary report then looks like; Total sampled time IRQs off (not real total time): 5493 Event shrink_inactive_list..shrink_zone 1596 us count 1 Event shrink_inactive_list..shrink_zone 1530 us count 1 Event shrink_inactive_list..shrink_zone 956 us count 1 Event shrink_inactive_list..shrink_zone 541 us count 1 Event shrink_inactive_list..shrink_zone 531 us count 1 Event split_huge_page..add_to_swap 232 us count 1 Event save_args..call_softirq 36 us count 1 Event save_args..call_softirq 35 us count 2 Event __wake_up..__wake_up 1 us count 1 A full report is again available at http://www.csn.ul.ie/~mel/postings/minfree-20110225/irqsoff-minimiseirq-free-v1r4-micro.report As should be obvious, IRQ disabled latencies due to compaction are almost elimimnated for this particular test. [aarcange@redhat.com: Fix initialisation of isolated] Signed-off-by: Mel Gorman Acked-by: Johannes Weiner Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Acked-by: Andrea Arcangeli Cc: Arthur Marsh Cc: Clemens Ladisch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b280c0cc70062967bb9d630b216375b18db3a0b Author: Hugh Dickins Date: Tue Mar 22 16:33:07 2011 -0700 mm: don't return 0 too early from find_get_pages() Callers of find_get_pages(), or its wrapper pagevec_lookup() - notably truncate_inode_pages_range() - stop looking further when it returns 0. But if an interrupt comes just after its radix_tree_gang_lookup_slot(), especially if we have preemptible RCU enabled, isn't it conceivable that all 14 pages returned could be removed from the page cache by shrink_page_list(), before find_get_pages() gets to process them? So causing it to return 0 although there may be plenty more pages beyond. Make find_get_pages() and find_get_pages_tag() check for this unlikely case, and restart should it occur; but callers of find_get_pages_contig() have no such expectation, it's okay for that to return 0 early. I have not seen this in practice, just worried by the possibility. Signed-off-by: Hugh Dickins Cc: Nick Piggin Acked-by: Peter Zijlstra Cc: Wu Fengguang Cc: Salman Qazi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d8aa4ea855e0d64bb6926acb5618e6d1e2ed344 Author: Hugh Dickins Date: Tue Mar 22 16:33:06 2011 -0700 mm: remove worrying dead code from find_get_pages() The radix_tree_deref_retry() case in find_get_pages() has a strange little excrescence, not seen in the other gang lookups: it looks like the start of an abandoned attempt to guarantee forward progress in a case that cannot arise. ret should always be 0 here: if it isn't, then going back to restart will leak references to pages already gotten. There used to be a comment saying nr_found is necessarily 1 here: that's not quite true, but the radix_tree_deref_retry() case is peculiar to the entry at index 0, when we race with it being moved out of the radix_tree root or back. Remove the worrisome two lines, add a brief comment here and in find_get_pages_contig() and find_get_pages_tag(), and a WARN_ON in find_get_pages() should it ever be seen elsewhere than at 0. Signed-off-by: Hugh Dickins Cc: Nick Piggin Acked-by: Peter Zijlstra Cc: Wu Fengguang Cc: Salman Qazi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c033a93c0d961fc7ec5b0872649143e061d97dd4 Author: Petr Holasek Date: Tue Mar 22 16:33:05 2011 -0700 hugetlbfs: correct handling of negative input to /proc/sys/vm/nr_hugepages When the user inserts a negative value into /proc/sys/vm/nr_hugepages it will cause the kernel to allocate as many hugepages as possible and to then update /proc/meminfo to reflect this. This changes the behavior so that the negative input will result in nr_hugepages value being unchanged. Signed-off-by: Petr Holasek Signed-off-by: Anton Arapov Reviewed-by: Naoya Horiguchi Acked-by: David Rientjes Acked-by: Mel Gorman Acked-by: Eric B Munson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8afdcece4911e51cfff2b50a269418914cab8a3f Author: Mel Gorman Date: Tue Mar 22 16:33:04 2011 -0700 mm: vmscan: kswapd should not free an excessive number of pages when balancing small zones When reclaiming for order-0 pages, kswapd requires that all zones be balanced. Each cycle through balance_pgdat() does background ageing on all zones if necessary and applies equal pressure on the inactive zone unless a lot of pages are free already. A "lot of free pages" is defined as a "balance gap" above the high watermark which is currently 7*high_watermark. Historically this was reasonable as min_free_kbytes was small. However, on systems using huge pages, it is recommended that min_free_kbytes is higher and it is tuned with hugeadm --set-recommended-min_free_kbytes. With the introduction of transparent huge page support, this recommended value is also applied. On X86-64 with 4G of memory, min_free_kbytes becomes 67584 so one would expect around 68M of memory to be free. The Normal zone is approximately 35000 pages so under even normal memory pressure such as copying a large file, it gets exhausted quickly. As it is getting exhausted, kswapd applies pressure equally to all zones, including the DMA32 zone. DMA32 is approximately 700,000 pages with a high watermark of around 23,000 pages. In this situation, kswapd will reclaim around (23000*8 where 8 is the high watermark + balance gap of 7 * high watermark) pages or 718M of pages before the zone is ignored. What the user sees is that free memory far higher than it should be. To avoid an excessive number of pages being reclaimed from the larger zones, explicitely defines the "balance gap" to be either 1% of the zone or the low watermark for the zone, whichever is smaller. While kswapd will check all zones to apply pressure, it'll ignore zones that meets the (high_wmark + balance_gap) watermark. To test this, 80G were copied from a partition and the amount of memory being used was recorded. A comparison of a patch and unpatched kernel can be seen at http://www.csn.ul.ie/~mel/postings/minfree-20110222/memory-usage-hydra.ps and shows that kswapd is not reclaiming as much memory with the patch applied. Signed-off-by: Andrea Arcangeli Signed-off-by: Mel Gorman Acked-by: Rik van Riel Cc: Shaohua Li Cc: "Chen, Tim C" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7571966189e54adf0a8bc1384d6f13f44052ba63 Author: Namhyung Kim Date: Tue Mar 22 16:33:02 2011 -0700 mempolicy: remove redundant check in __mpol_equal() The 'flags' field is already checked, no need to do it again. Signed-off-by: Namhyung Kim Cc: Bob Liu Cc: Lee Schermerhorn Reviewed-by: Minchan Kim Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4031a219d8913da40ade5a6e5b538cc61e975cc8 Author: Dave Hansen Date: Tue Mar 22 16:33:01 2011 -0700 smaps: have smaps show transparent huge pages Now that the mere act of _looking_ at /proc/$pid/smaps will not destroy transparent huge pages, tell how much of the VMA is actually mapped with them. This way, we can make sure that we're getting THPs where we expect to see them. Signed-off-by: Dave Hansen Acked-by: Mel Gorman Acked-by: David Rientjes Reviewed-by: Eric B Munson Tested-by: Eric B Munson Cc: Michael J Wolf Cc: Andrea Arcangeli Cc: Johannes Weiner Cc: Matt Mackall Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22e057c5923e60debad318cbeaee33033b110bc8 Author: Dave Hansen Date: Tue Mar 22 16:33:00 2011 -0700 smaps: teach smaps_pte_range() about THP pmds This adds code to explicitly detect and handle pmd_trans_huge() pmds. It then passes HPAGE_SIZE units in to the smap_pte_entry() function instead of PAGE_SIZE. This means that using /proc/$pid/smaps now will no longer cause THPs to be broken down in to small pages. Signed-off-by: Dave Hansen Reviewed-by: Eric B Munson Tested-by: Eric B Munson Acked-by: Andrea Arcangeli Acked-by: David Rientjes Cc: Mel Gorman Cc: Michael J Wolf Cc: Andrea Arcangeli Cc: Johannes Weiner Cc: Matt Mackall Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c9acc7849b1eab7ffc75e933404c5f32865d9a2 Author: Dave Hansen Date: Tue Mar 22 16:32:59 2011 -0700 smaps: pass pte size argument in to smaps_pte_entry() Add an argument to the new smaps_pte_entry() function to let it account in things other than PAGE_SIZE units. I changed all of the PAGE_SIZE sites, even though not all of them can be reached for transparent huge pages, just so this will continue to work without changes as THPs are improved. Signed-off-by: Dave Hansen Acked-by: Mel Gorman Acked-by: Johannes Weiner Acked-by: David Rientjes Reviewed-by: Eric B Munson Tested-by: Eric B Munson Cc: Michael J Wolf Cc: Andrea Arcangeli Cc: Matt Mackall Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae11c4d9f646064cf086e2f8cd4b3c475df7739c Author: Dave Hansen Date: Tue Mar 22 16:32:58 2011 -0700 smaps: break out smaps_pte_entry() from smaps_pte_range() We will use smaps_pte_entry() in a moment to handle both small and transparent large pages. But, we must break it out of smaps_pte_range() first. Signed-off-by: Dave Hansen Acked-by: Mel Gorman Acked-by: Johannes Weiner Acked-by: David Rientjes Reviewed-by: Eric B Munson Tested-by: Eric B Munson Cc: Michael J Wolf Cc: Andrea Arcangeli Cc: Matt Mackall Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 033193275b3ffcfe7f3fde7b569f3d207f6cd6a0 Author: Dave Hansen Date: Tue Mar 22 16:32:56 2011 -0700 pagewalk: only split huge pages when necessary Right now, if a mm_walk has either ->pte_entry or ->pmd_entry set, it will unconditionally split any transparent huge pages it runs in to. In practice, that means that anyone doing a cat /proc/$pid/smaps will unconditionally break down every huge page in the process and depend on khugepaged to re-collapse it later. This is fairly suboptimal. This patch changes that behavior. It teaches each ->pmd_entry handler (there are five) that they must break down the THPs themselves. Also, the _generic_ code will never break down a THP unless a ->pte_entry handler is actually set. This means that the ->pmd_entry handlers can now choose to deal with THPs without breaking them down. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Dave Hansen Acked-by: Mel Gorman Acked-by: David Rientjes Reviewed-by: Eric B Munson Tested-by: Eric B Munson Cc: Michael J Wolf Cc: Andrea Arcangeli Cc: Johannes Weiner Cc: Matt Mackall Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 278df9f451dc71dcd002246be48358a473504ad0 Author: Minchan Kim Date: Tue Mar 22 16:32:54 2011 -0700 mm: reclaim invalidated page ASAP invalidate_mapping_pages is very big hint to reclaimer. It means user doesn't want to use the page any more. So in order to prevent working set page eviction, this patch move the page into tail of inactive list by PG_reclaim. Please, remember that pages in inactive list are working set as well as active list. If we don't move pages into inactive list's tail, pages near by tail of inactive list can be evicted although we have a big clue about useless pages. It's totally bad. Now PG_readahead/PG_reclaim is shared. fe3cba17 added ClearPageReclaim into clear_page_dirty_for_io for preventing fast reclaiming readahead marker page. In this series, PG_reclaim is used by invalidated page, too. If VM find the page is invalidated and it's dirty, it sets PG_reclaim to reclaim asap. Then, when the dirty page will be writeback, clear_page_dirty_for_io will clear PG_reclaim unconditionally. It disturbs this serie's goal. I think it's okay to clear PG_readahead when the page is dirty, not writeback time. So this patch moves ClearPageReadahead. In v4, ClearPageReadahead in set_page_dirty has a problem which is reported by Steven Barrett. It's due to compound page. Some driver(ex, audio) calls set_page_dirty with compound page which isn't on LRU. but my patch does ClearPageRelcaim on compound page. In non-CONFIG_PAGEFLAGS_EXTENDED, it breaks PageTail flag. I think it doesn't affect THP and pass my test with THP enabling but Cced Andrea for double check. Signed-off-by: Minchan Kim Reported-by: Steven Barrett Reviewed-by: Johannes Weiner Acked-by: Rik van Riel Acked-by: Mel Gorman Cc: Wu Fengguang Cc: KOSAKI Motohiro Cc: Nick Piggin Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f58a82943337fb6e79acfa5346719a97d3c0b98 Author: Minchan Kim Date: Tue Mar 22 16:32:53 2011 -0700 memcg: move memcg reclaimable page into tail of inactive list The rotate_reclaimable_page function moves just written out pages, which the VM wanted to reclaim, to the end of the inactive list. That way the VM will find those pages first next time it needs to free memory. This patch applies the rule in memcg. It can help to prevent unnecessary working page eviction of memcg. Signed-off-by: Minchan Kim Acked-by: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Reviewed-by: Rik van Riel Cc: KOSAKI Motohiro Acked-by: Johannes Weiner Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 315601809d124d046abd6c3ffa346d0dbd7aa29d Author: Minchan Kim Date: Tue Mar 22 16:32:52 2011 -0700 mm: deactivate invalidated pages Recently, there are reported problem about thrashing. (http://marc.info/?l=rsync&m=128885034930933&w=2) It happens by backup workloads(ex, nightly rsync). That's because the workload makes just use-once pages and touches pages twice. It promotes the page into active list so that it results in working set page eviction. Some app developer want to support POSIX_FADV_NOREUSE. But other OSes don't support it, either. (http://marc.info/?l=linux-mm&m=128928979512086&w=2) By other approach, app developers use POSIX_FADV_DONTNEED. But it has a problem. If kernel meets page is writing during invalidate_mapping_pages, it can't work. It makes for application programmer to use it since they always have to sync data before calling fadivse(..POSIX_FADV_DONTNEED) to make sure the pages could be discardable. At last, they can't use deferred write of kernel so that they could see performance loss. (http://insights.oetiker.ch/linux/fadvise.html) In fact, invalidation is very big hint to reclaimer. It means we don't use the page any more. So let's move the writing page into inactive list's head if we can't truncate it right now. Why I move page to head of lru on this patch, Dirty/Writeback page would be flushed sooner or later. It can prevent writeout of pageout which is less effective than flusher's writeout. Originally, I reused lru_demote of Peter with some change so added his Signed-off-by. Signed-off-by: Minchan Kim Reported-by: Ben Gamari Signed-off-by: Peter Zijlstra Acked-by: Rik van Riel Acked-by: Mel Gorman Reviewed-by: KOSAKI Motohiro Cc: Wu Fengguang Acked-by: Johannes Weiner Cc: Nick Piggin Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 481b4bb5e370aa69c1dc276bd08871ec01b41d2a Author: Richard Kennedy Date: Tue Mar 22 16:32:50 2011 -0700 mm: mm_struct: remove 16 bytes of alignment padding on 64 bit builds Reorder mm_struct to remove 16 bytes of alignment padding on 64 bit builds. On my config this shrinks mm_struct by enough to fit in one fewer cache lines and allows more objects per slab in mm_struct kmem_cache under SLUB. slabinfo before patch :- Sizes (bytes) Slabs -------------------------------- Object : 848 Total : 9 SlabObj: 896 Full : 2 SlabSiz: 16384 Partial: 5 Loss : 48 CpuSlab: 2 Align : 64 Objects: 18 slabinfo after :- Sizes (bytes) Slabs -------------------------------- Object : 832 Total : 7 SlabObj: 832 Full : 2 SlabSiz: 16384 Partial: 3 Loss : 0 CpuSlab: 2 Align : 64 Objects: 19 Signed-off-by: Richard Kennedy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb240452bfc2ae9de7c840dd0fb3f5b33ce03c31 Author: Michel Lespinasse Date: Tue Mar 22 16:32:49 2011 -0700 mm: remove unused TestSetPageLocked() interface TestSetPageLocked() isn't being used anywhere. Also, using it would likely be an error, since the proper interface trylock_page() provides stronger ordering guarantees. Signed-off-by: Michel Lespinasse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01d8b20dec5f4019283e244aba50ba86fe6ead6e Author: Peter Zijlstra Date: Tue Mar 22 16:32:49 2011 -0700 mm: simplify anon_vma refcounts This patch changes the anon_vma refcount to be 0 when the object is free. It does this by adding 1 ref to being in use in the anon_vma structure (iow. the anon_vma->head list is not empty). This allows a simpler release scheme without having to check both the refcount and the list as well as avoids taking a ref for each entry on the list. Signed-off-by: Peter Zijlstra Reviewed-by: KAMEZAWA Hiroyuki Acked-by: Hugh Dickins Acked-by: Mel Gorman Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83813267c699ab11cc65a6d9d0f42db42f0862b3 Author: Peter Zijlstra Date: Tue Mar 22 16:32:48 2011 -0700 mm: move anon_vma ref out from under CONFIG_foo We need the anon_vma refcount unconditionally to simplify the anon_vma lifetime rules. Signed-off-by: Peter Zijlstra Acked-by: Mel Gorman Reviewed-by: KAMEZAWA Hiroyuki Acked-by: Hugh Dickins Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e60109f125013b6c571f399a15a8b0fe1ffa4e6 Author: Peter Zijlstra Date: Tue Mar 22 16:32:46 2011 -0700 mm: rename drop_anon_vma() to put_anon_vma() The normal code pattern used in the kernel is: get/put. Signed-off-by: Peter Zijlstra Reviewed-by: KAMEZAWA Hiroyuki Acked-by: Hugh Dickins Reviewed-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bc32f6f90dae67730645da67bfd44304f810f93 Author: Akinobu Mita Date: Tue Mar 22 16:32:46 2011 -0700 mm: debug-pagealloc: fix kconfig dependency warning Fix kconfig dependency warning to satisfy dependencies: warning: (PAGE_POISONING) selects DEBUG_PAGEALLOC which has unmet direct dependencies (DEBUG_KERNEL && ARCH_SUPPORTS_DEBUG_PAGEALLOC && (!HIBERNATION || !PPC && !SPARC) && !KMEMCHECK) Signed-off-by: Akinobu Mita Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d16871d8c96deadc5f9753b6b096074f2cbcbe1 Author: Namhyung Kim Date: Tue Mar 22 16:32:45 2011 -0700 mm: batch-free pcp list if possible free_pcppages_bulk() frees pages from pcp lists in a round-robin fashion by keeping batch_free counter. But it doesn't need to spin if there is only one non-empty list. This can be checked by batch_free == MIGRATE_PCPTYPES. [akpm@linux-foundation.org: fix comment] Signed-off-by: Namhyung Kim Acked-by: Johannes Weiner Cc: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e64a782fec684c29a8204c51b3cb554dce588592 Author: Minchan Kim Date: Tue Mar 22 16:32:44 2011 -0700 mm: change __remove_from_page_cache() Now we renamed remove_from_page_cache with delete_from_page_cache. As consistency of __remove_from_swap_cache and remove_from_swap_cache, we change internal page cache handling function name, too. Signed-off-by: Minchan Kim Cc: Christoph Hellwig Acked-by: Hugh Dickins Acked-by: Mel Gorman Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Johannes Weiner Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 702cfbf93aaf3a091b0c64c8766c1ade0a820c38 Author: Minchan Kim Date: Tue Mar 22 16:32:43 2011 -0700 mm: goodbye remove_from_page_cache() Now delete_from_page_cache() replaces remove_from_page_cache(). So we remove remove_from_page_cache so fs or something out of mainline will notice it when compile time and can fix it. Signed-off-by: Minchan Kim Cc: Christoph Hellwig Acked-by: Hugh Dickins Acked-by: Mel Gorman Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Johannes Weiner Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5adc7b518b54f7af2b8395d2035898340d96b1d5 Author: Minchan Kim Date: Tue Mar 22 16:32:41 2011 -0700 mm: truncate: change remove_from_page_cache This patch series changes remove_from_page_cache()'s page ref counting rule. Page cache ref count is decreased in delete_from_page_cache(). So we don't need to decrease the page reference in callers. Signed-off-by: Minchan Kim Cc: Dan Magenheimer Cc: Andi Kleen Cc: Nick Piggin Cc: Al Viro Acked-by: Hugh Dickins Acked-by: Mel Gorman Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Johannes Weiner Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c73b1bc6bb14aab7888ebe6bffe957cf7c07fa0 Author: Minchan Kim Date: Tue Mar 22 16:32:40 2011 -0700 mm: shmem: change remove_from_page_cache This patch series changes remove_from_page_cache()'s page ref counting rule. Page cache ref count is decreased in delete_from_page_cache(). So we don't need to decrease the page reference in callers. Signed-off-by: Minchan Kim Acked-by: Hugh Dickins Acked-by: Mel Gorman Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Johannes Weiner Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd65cb86c98a79bc61afd0d80166005f125e9064 Author: Minchan Kim Date: Tue Mar 22 16:30:54 2011 -0700 mm: hugetlbfs: change remove_from_page_cache This patch series changes remove_from_page_cache()'s page ref counting rule. Page cache ref count is decreased in delete_from_page_cache(). So we don't need to decrease the page reference in callers. Signed-off-by: Minchan Kim Cc: William Irwin Acked-by: Hugh Dickins Acked-by: Mel Gorman Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Johannes Weiner Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97cecb5a254fec22d28ef32235d888bfbfd7c783 Author: Minchan Kim Date: Tue Mar 22 16:30:53 2011 -0700 mm: introduce delete_from_page_cache() Presently we increase the page refcount in add_to_page_cache() but don't decrease it in remove_from_page_cache(). Such asymmetry adds confusion, requiring that callers notice it and a comment explaining why they release a page reference. It's not a good API. A long time ago, Hugh tried it (http://lkml.org/lkml/2004/10/24/140) but gave up because reiser4's drop_page() had to unlock the page between removing it from page cache and doing the page_cache_release(). But now the situation is changed. I think at least things in current mainline don't have any obstacles. The problem is for out-of-mainline filesystems - if they have done such things as reiser4, this patch could be a problem but they will discover this at compile time since we remove remove_from_page_cache(). This patch: This function works as just wrapper remove_from_page_cache(). The difference is that it decreases page references in itself. So caller have to make sure it has a page reference before calling. This patch is ready for removing remove_from_page_cache(). Signed-off-by: Minchan Kim Cc: Christoph Hellwig Acked-by: Hugh Dickins Acked-by: Mel Gorman Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Johannes Weiner Reviewed-by: KOSAKI Motohiro Cc: Edward Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef6a3c63112e865d632ff7c478ba7c7160cad0d1 Author: Miklos Szeredi Date: Tue Mar 22 16:30:52 2011 -0700 mm: add replace_page_cache_page() function This function basically does: remove_from_page_cache(old); page_cache_release(old); add_to_page_cache_locked(new); Except it does this atomically, so there's no possibility for the "add" to fail because of a race. If memory cgroups are enabled, then the memory cgroup charge is also moved from the old page to the new. This function is currently used by fuse to move pages into the page cache on read, instead of copying the page contents. [minchan.kim@gmail.com: add freepage() hook to replace_page_cache_page()] Signed-off-by: Miklos Szeredi Acked-by: Rik van Riel Acked-by: KAMEZAWA Hiroyuki Cc: Mel Gorman Signed-off-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 318b275fbca1ab9ec0862de71420e0e92c3d1aa7 Author: Gleb Natapov Date: Tue Mar 22 16:30:51 2011 -0700 mm: allow GUP to fail instead of waiting on a page GUP user may want to try to acquire a reference to a page if it is already in memory, but not if IO, to bring it in, is needed. For example KVM may tell vcpu to schedule another guest process if current one is trying to access swapped out page. Meanwhile, the page will be swapped in and the guest process, that depends on it, will be able to run again. This patch adds FAULT_FLAG_RETRY_NOWAIT (suggested by Linus) and FOLL_NOWAIT follow_page flags. FAULT_FLAG_RETRY_NOWAIT, when used in conjunction with VM_FAULT_ALLOW_RETRY, indicates to handle_mm_fault that it shouldn't drop mmap_sem and wait on a page, but return VM_FAULT_RETRY instead. [akpm@linux-foundation.org: improve FOLL_NOWAIT comment] Signed-off-by: Gleb Natapov Cc: Linus Torvalds Cc: Hugh Dickins Acked-by: Rik van Riel Cc: Michel Lespinasse Cc: Avi Kivity Cc: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fda1bd5b8869574dad8e1f9f71e23bf0c186274 Author: Prarit Bhargava Date: Tue Mar 22 16:30:49 2011 -0700 mm: notifier_from_errno() cleanup While looking at some other notifier callbacks I noticed this code could use a simple cleanup. notifier_from_errno() no longer needs the if (ret)/else conditional. That same conditional is now done in notifier_from_errno(). Signed-off-by: Prarit Bhargava Cc: Paul Menage Cc: Li Zefan Acked-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbf978bfb12d7deca97d7333f65eda0381a072de Author: David Rientjes Date: Tue Mar 22 16:30:48 2011 -0700 oom: suppress nodes that are not allowed from meminfo on page alloc failure Displaying extremely verbose meminfo for all nodes on the system is overkill for page allocation failures when the context restricts that allocation to only a subset of nodes. We don't particularly care about the state of all nodes when some are not allowed in the current context, they can have an abundance of memory but we can't allocate from that part of memory. This patch suppresses disallowed nodes from the meminfo dump on a page allocation failure if the context requires it. Signed-off-by: David Rientjes Cc: Mel Gorman Cc: KAMEZAWA Hiroyuki Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29423e77c06cee7d4e335ef4a7cbd949da978c91 Author: David Rientjes Date: Tue Mar 22 16:30:47 2011 -0700 oom: suppress show_mem() for many nodes in irq context on page alloc failure When a page allocation failure occurs, show_mem() is called to dump the state of the VM so users may understand what happened to get into that condition. This output, however, can be extremely verbose. In irq context, it may result in significant delays that incur NMI watchdog timeouts when the machine is large (we use CONFIG_NODES_SHIFT > 8 here to define a "large" machine since the length of the show_mem() output is proportional to the number of possible nodes). This patch suppresses the show_mem() call in irq context when the kernel has CONFIG_NODES_SHIFT > 8. Signed-off-by: David Rientjes Cc: Mel Gorman Cc: KAMEZAWA Hiroyuki Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddd588b5dd55f14320379961e47683db4e4c1d90 Author: David Rientjes Date: Tue Mar 22 16:30:46 2011 -0700 oom: suppress nodes that are not allowed from meminfo on oom kill The oom killer is extremely verbose for machines with a large number of cpus and/or nodes. This verbosity can often be harmful if it causes other important messages to be scrolled from the kernel log and incurs a signicant time delay, specifically for kernels with CONFIG_NODES_SHIFT > 8. This patch causes only memory information to be displayed for nodes that are allowed by current's cpuset when dumping the VM state. Information for all other nodes is irrelevant to the oom condition; we don't care if there's an abundance of memory elsewhere if we can't access it. This only affects the behavior of dumping memory information when an oom is triggered. Other dumps, such as for sysrq+m, still display the unfiltered form when using the existing show_mem() interface. Additionally, the per-cpu pageset statistics are extremely verbose in oom killer output, so it is now suppressed. This removes nodes_weight(current->mems_allowed) * (1 + nr_cpus) lines from the oom killer output. Callers may use __show_mem(SHOW_MEM_FILTER_NODES) to filter disallowed nodes. Signed-off-by: David Rientjes Cc: Mel Gorman Cc: KAMEZAWA Hiroyuki Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94dcf29a11b3d20a28790598d701f98484a969da Author: Eric Dumazet Date: Tue Mar 22 16:30:45 2011 -0700 kthread: use kthread_create_on_node() ksoftirqd, kworker, migration, and pktgend kthreads can be created with kthread_create_on_node(), to get proper NUMA affinities for their stack and task_struct. Signed-off-by: Eric Dumazet Acked-by: David S. Miller Reviewed-by: Andi Kleen Acked-by: Rusty Russell Acked-by: Tejun Heo Cc: Tony Luck Cc: Fenghua Yu Cc: David Howells Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 207205a2ba2655652fe46a60b49838af6c16a919 Author: Eric Dumazet Date: Tue Mar 22 16:30:44 2011 -0700 kthread: NUMA aware kthread_create_on_node() All kthreads being created from a single helper task, they all use memory from a single node for their kernel stack and task struct. This patch suite creates kthread_create_on_node(), adding a 'cpu' parameter to parameters already used by kthread_create(). This parameter serves in allocating memory for the new kthread on its memory node if possible. Signed-off-by: Eric Dumazet Acked-by: David S. Miller Reviewed-by: Andi Kleen Acked-by: Rusty Russell Cc: Tejun Heo Cc: Tony Luck Cc: Fenghua Yu Cc: David Howells Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6a84016bd2598e35ead635147fa53619982648d Author: Eric Dumazet Date: Tue Mar 22 16:30:42 2011 -0700 mm: NUMA aware alloc_thread_info_node() Add a node parameter to alloc_thread_info(), and change its name to alloc_thread_info_node() This change is needed to allow NUMA aware kthread_create_on_cpu() Signed-off-by: Eric Dumazet Acked-by: David S. Miller Reviewed-by: Andi Kleen Acked-by: Rusty Russell Cc: Tejun Heo Cc: Tony Luck Cc: Fenghua Yu Cc: David Howells Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 504f52b5439aaf26d3e2c1d45ec10fce38c8dd27 Author: Eric Dumazet Date: Tue Mar 22 16:30:41 2011 -0700 mm: NUMA aware alloc_task_struct_node() All kthreads being created from a single helper task, they all use memory from a single node for their kernel stack and task struct. This patch suite creates kthread_create_on_cpu(), adding a 'cpu' parameter to parameters already used by kthread_create(). This parameter serves in allocating memory for the new kthread on its memory node if available. Users of this new function are : ksoftirqd, kworker, migration, pktgend... This patch: Add a node parameter to alloc_task_struct(), and change its name to alloc_task_struct_node() This change is needed to allow NUMA aware kthread_create_on_cpu() Signed-off-by: Eric Dumazet Acked-by: David S. Miller Reviewed-by: Andi Kleen Acked-by: Rusty Russell Cc: Tejun Heo Cc: Tony Luck Cc: Fenghua Yu Cc: David Howells Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d502c1c8d47b337c378c2ac8eaeee7918ad16b1 Author: Minchan Kim Date: Tue Mar 22 16:30:39 2011 -0700 mm/compaction: check migrate_pages's return value instead of list_empty() Many migrate_page's caller check return value instead of list_empy by cf608ac19c ("mm: compaction: fix COMPACTPAGEFAILED counting"). This patch makes compaction's migrate_pages consistent with others. This patch should not change old behavior. Signed-off-by: Minchan Kim Cc: Mel Gorman Cc: Andrea Arcangeli Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d527caf22e48480b102c7c6ee5b9ba12170148f7 Author: Andrea Arcangeli Date: Tue Mar 22 16:30:38 2011 -0700 mm: compaction: prevent kswapd compacting memory to reduce CPU usage This patch reverts 5a03b051 ("thp: use compaction in kswapd for GFP_ATOMIC order > 0") due to reports stating that kswapd CPU usage was higher and IRQs were being disabled more frequently. This was reported at http://www.spinics.net/linux/fedora/alsa-user/msg09885.html. Without this patch applied, CPU usage by kswapd hovers around the 20% mark according to the tester (Arthur Marsh: http://www.spinics.net/linux/fedora/alsa-user/msg09899.html). With this patch applied, it's around 2%. The problem is not related to THP which specifies __GFP_NO_KSWAPD but is triggered by high-order allocations hitting the low watermark for their order and waking kswapd on kernels with CONFIG_COMPACTION set. The most common trigger for this is network cards configured for jumbo frames but it's also possible it'll be triggered by fork-heavy workloads (order-1) and some wireless cards which depend on order-1 allocations. The symptoms for the user will be high CPU usage by kswapd in low-memory situations which could be confused with another writeback problem. While a patch like 5a03b051 may be reintroduced in the future, this patch plays it safe for now and reverts it. [mel@csn.ul.ie: Beefed up the changelog] Signed-off-by: Andrea Arcangeli Signed-off-by: Mel Gorman Reported-by: Arthur Marsh Tested-by: Arthur Marsh Cc: [2.6.38.1] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89699605fe7cfd8611900346f61cb6cbf179b10a Author: Nick Piggin Date: Tue Mar 22 16:30:36 2011 -0700 mm: vmap area cache Provide a free area cache for the vmalloc virtual address allocator, based on the algorithm used by the user virtual memory allocator. This reduces the number of rbtree operations and linear traversals over the vmap extents in order to find a free area, by starting off at the last point that a free area was found. The free area cache is reset if areas are freed behind it, or if we are searching for a smaller area or alignment than last time. So allocation patterns are not changed (verified by corner-case and random test cases in userspace testing). This solves a regression caused by lazy vunmap TLB purging introduced in db64fe02 (mm: rewrite vmap layer). That patch will leave extents in the vmap allocator after they are vunmapped, and until a significant number accumulate that can be flushed in a single batch. So in a workload that vmalloc/vfree frequently, a chain of extents will build up from VMALLOC_START address, which have to be iterated over each time (giving an O(n) type of behaviour). After this patch, the search will start from where it left off, giving closer to an amortized O(1). This is verified to solve regressions reported Steven in GFS2, and Avi in KVM. Hugh's update: : I tried out the recent mmotm, and on one machine was fortunate to hit : the BUG_ON(first->va_start < addr) which seems to have been stalling : your vmap area cache patch ever since May. : I can get you addresses etc, I did dump a few out; but once I stared : at them, it was easier just to look at the code: and I cannot see how : you would be so sure that first->va_start < addr, once you've done : that addr = ALIGN(max(...), align) above, if align is over 0x1000 : (align was 0x8000 or 0x4000 in the cases I hit: ioremaps like Steve). : I originally got around it by just changing the : if (first->va_start < addr) { : to : while (first->va_start < addr) { : without thinking about it any further; but that seemed unsatisfactory, : why would we want to loop here when we've got another very similar : loop just below it? : I am never going to admit how long I've spent trying to grasp your : "while (n)" rbtree loop just above this, the one with the peculiar : if (!first && tmp->va_start < addr + size) : in. That's unfamiliar to me, I'm guessing it's designed to save a : subsequent rb_next() in a few circumstances (at risk of then setting : a wrong cached_hole_size?); but they did appear few to me, and I didn't : feel I could sign off something with that in when I don't grasp it, : and it seems responsible for extra code and mistaken BUG_ON below it. : I've reverted to the familiar rbtree loop that find_vma() does (but : with va_end >= addr as you had, to respect the additional guard page): : and then (given that cached_hole_size starts out 0) I don't see the : need for any complications below it. If you do want to keep that loop : as you had it, please add a comment to explain what it's trying to do, : and where addr is relative to first when you emerge from it. : Aren't your tests "size <= cached_hole_size" and : "addr + size > first->va_start" forgetting the guard page we want : before the next area? I've changed those. : I have not changed your many "addr + size - 1 < addr" overflow tests, : but have since come to wonder, shouldn't they be "addr + size < addr" : tests - won't the vend checks go wrong if addr + size is 0? : I have added a few comments - Wolfgang Wander's 2.6.13 description of : 1363c3cd8603a913a27e2995dccbd70d5312d8e6 Avoiding mmap fragmentation : helped me a lot, perhaps a pointer to that would be good too. And I found : it easier to understand when I renamed cached_start slightly and moved the : overflow label down. : This patch would go after your mm-vmap-area-cache.patch in mmotm. : Trivially, nobody is going to get that BUG_ON with this patch, and it : appears to work fine on my machines; but I have not given it anything like : the testing you did on your original, and may have broken all the : performance you were aiming for. Please take a look and test it out : integrate with yours if you're satisfied - thanks. [akpm@linux-foundation.org: add locking comment] Signed-off-by: Nick Piggin Signed-off-by: Hugh Dickins Reviewed-by: Minchan Kim Reported-and-tested-by: Steven Whitehouse Reported-and-tested-by: Avi Kivity Tested-by: "Barry J. Marson" Cc: Prarit Bhargava Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef0a5e80f56f6409e957e7117da9551c3d3ff239 Author: Robert Morell Date: Tue Mar 22 16:30:31 2011 -0700 pwm_backlight: add check_fb() hook In systems with multiple framebuffer devices, one of the devices might be blanked while another is unblanked. In order for the backlight blanking logic to know whether to turn off the backlight for a particular framebuffer's blanking notification, it needs to be able to check if a given framebuffer device corresponds to the backlight. This plumbs the check_fb hook from core backlight through the pwm_backlight helper to allow platform code to plug in a check_fb hook. Signed-off-by: Robert Morell Cc: Richard Purdie Cc: Arun Murthy Cc: Linus Walleij Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0508e04e05cdf9b819210f5d5a12264e5eeff1f3 Author: Axel Lin Date: Tue Mar 22 16:30:30 2011 -0700 drivers/video/backlight/jornada720_*.c: make needlessly global symbols static The following symbols are needlessly defined global: jornada_bl_init, jornada_bl_exit, jornada_lcd_init, jornada_lcd_exit. Make them static. Signed-off-by: Axel Lin Acked-by: Kristoffer Ericson Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b372412e159897c20ce2ad100f51c5d94ae98845 Author: Randy Dunlap Date: Tue Mar 22 16:30:29 2011 -0700 backlight: apple_bl depends on ACPI apple_bl uses ACPI interfaces (data & code), so it should depend on ACPI. drivers/video/backlight/apple_bl.c:142: warning: 'struct acpi_device' declared inside parameter list drivers/video/backlight/apple_bl.c:142: warning: its scope is only this definition or declaration, which is probably not what you want drivers/video/backlight/apple_bl.c:201: warning: 'struct acpi_device' declared inside parameter list drivers/video/backlight/apple_bl.c:215: error: variable 'apple_bl_driver' has initializer but incomplete type drivers/video/backlight/apple_bl.c:216: error: unknown field 'name' specified in initializer ... Signed-off-by: Randy Dunlap Acked-by: Matthew Garrett Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39b3dee76fa1f1ac8310ea5898ba7c07280bdd9f Author: Matthew Garrett Date: Tue Mar 22 16:30:28 2011 -0700 mbp_nvidia_bl: rename to apple_bl It works on hardware other than Macbook Pros, and it works on GPUs other than Nvidia. It should even work on iMacs, so change the name to match reality more precisely and include an alias so existing users don't get confused. Signed-off-by: Matthew Garrett Acked-by: Richard Purdie Cc: Mourad De Clerck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99fd28e19429f5212f0758adc1b2f08c6e63b6db Author: Matthew Garrett Date: Tue Mar 22 16:30:27 2011 -0700 mbp_nvidia_bl: check that the backlight control functions The SMI-based backlight control functionality may fail to work if the system is running under EFI rather than BIOS. Check that the hardware responds as expected, and exit if it doesn't. Signed-off-by: Matthew Garrett Acked-by: Richard Purdie Cc: Mourad De Clerck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23a9847f0d5252872c4fecb5d4f803c523bd9283 Author: Matthew Garrett Date: Tue Mar 22 16:30:26 2011 -0700 mbp_nvidia_bl: remove DMI dependency This driver only has to deal with two different classes of hardware, but right now it needs new DMI entries for every new machine. It turns out that there's an ACPI device that uniquely identifies Apples with backlights, so this patch reworks the driver into an ACPI one, identifies the hardware by checking the PCI vendor of the root bridge and strips out all the DMI code. It also changes the config text to clarify that it works on devices other than Macbook Pros and GPUs other than nvidia. Signed-off-by: Matthew Garrett Acked-by: Richard Purdie Cc: Mourad De Clerck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9661e92c10a9775243c1ecb73373528ed8725a10 Author: Matthew Garrett Date: Tue Mar 22 16:30:25 2011 -0700 acpi: tie ACPI backlight devices to PCI devices if possible Dual-GPU machines may provide more than one ACPI backlight interface. Tie the backlight device to the GPU in order to allow userspace to identify the correct interface. Signed-off-by: Matthew Garrett Cc: Richard Purdie Cc: Chris Wilson Cc: David Airlie Cc: Alex Deucher Cc: Ben Skeggs Cc: Zhang Rui Cc: Len Brown Cc: Jesse Barnes Tested-by: Sedat Dilek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7eae3efa13c5d1c8e7d8dd0504ad524963b8add1 Author: Matthew Garrett Date: Tue Mar 22 16:30:24 2011 -0700 nouveau: change the backlight parent device to the connector, not the PCI dev We may eventually end up with per-connector backlights, especially with ddcci devices. Make sure that the parent node for the backlight device is the connector rather than the PCI device. Signed-off-by: Matthew Garrett Cc: Richard Purdie Cc: Chris Wilson Cc: David Airlie Cc: Alex Deucher Acked-by: Ben Skeggs Cc: Zhang Rui Cc: Len Brown Cc: Jesse Barnes Tested-by: Sedat Dilek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63ec0119d3720034dfd626c9785aefa5a6f972ca Author: Michel Dänzer Date: Tue Mar 22 16:30:23 2011 -0700 radeon: expose backlight class device for legacy LVDS encoder Allows e.g. power management daemons to control the backlight level. Inspired by the corresponding code in radeonfb. [mjg@redhat.com: updated to add backlight type and make the connector the parent device] Signed-off-by: Michel Dänzer Signed-off-by: Matthew Garrett Cc: Richard Purdie Cc: Chris Wilson Cc: David Airlie Acked-by: Alex Deucher Cc: Ben Skeggs Cc: Zhang Rui Cc: Len Brown Cc: Jesse Barnes Tested-by: Sedat Dilek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb7ca747f8d6243b3943c5b133048652020f4a50 Author: Matthew Garrett Date: Tue Mar 22 16:30:21 2011 -0700 backlight: add backlight type There may be multiple ways of controlling the backlight on a given machine. Allow drivers to expose the type of interface they are providing, making it possible for userspace to make appropriate policy decisions. Signed-off-by: Matthew Garrett Cc: Richard Purdie Cc: Chris Wilson Cc: David Airlie Cc: Alex Deucher Cc: Ben Skeggs Cc: Zhang Rui Cc: Len Brown Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccd7510fd8dea5b4b2af87fb2aef2ebd6b23b76b Author: Vasiliy Kulikov Date: Tue Mar 22 16:30:20 2011 -0700 drivers/leds/leds-lp5523.c: world-writable engine* sysfs files Don't allow everybody to change LED settings. Signed-off-by: Vasiliy Kulikov Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67d1da79b25c05d9a38b820bb5b5d89c91070ab2 Author: Vasiliy Kulikov Date: Tue Mar 22 16:30:19 2011 -0700 drivers/leds/leds-lp5521.c: world-writable sysfs engine* files Don't allow everybody to change LED settings. Signed-off-by: Vasiliy Kulikov Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1baf0eb3975ab56e29d57984b7bd6c9cd360dbf3 Author: Donghwa Lee Date: Tue Mar 22 16:30:18 2011 -0700 drivers/vidfeo/backlight: ld9040 amoled driver support Add a ld9040 amoled panel driver. Signed-off-by: Donghwa Lee Signed-off-by: Kyungmin Park Signed-off-by: Inki Dae Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9517f925f2eb9ffca78b3f0f9389fc675bcb572c Author: Uwe Kleine-König Date: Tue Mar 22 16:30:17 2011 -0700 leds: make *struct gpio_led_platform_data.leds const And fix a typo. Signed-off-by: Uwe Kleine-König Cc: Lars-Peter Clausen Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e6b7068f026e88257c20522555c78122e5a14d Author: Shreshtha Kumar Sahu Date: Tue Mar 22 16:30:16 2011 -0700 leds: add driver for LM3530 ALS Simple backlight driver for National Semiconductor LM3530. Presently only manual mode is supported, PWM and ALS support to be added. Signed-off-by: Shreshtha Kumar Sahu Cc: Linus Walleij Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 551ea73838c5eba18d673bd4e7fb0fec77cdcb8a Author: Mark Brown Date: Tue Mar 22 16:30:14 2011 -0700 leds: convert bd2802 driver to dev_pm_ops There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the bs2802 driver. [akpm@linux-foundation.org: fix warnings] Signed-off-by: Mark Brown Cc: Kim Kyuwon Cc: Kim Kyuwon Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d2587970b8bdf7c8d9208e3f4bb93182aef1a0f Author: Phil Carmody Date: Tue Mar 22 16:30:13 2011 -0700 cgroups: if you list_empty() a head then don't list_del() it list_del() leaves poison in the prev and next pointers. The next list_empty() will compare those poisons, and say the list isn't empty. Any list operations that assume the node is on a list because of such a check will be fooled into dereferencing poison. One needs to INIT the node after the del, and fortunately there's already a wrapper for that - list_del_init(). Some of the dels are followed by deallocations, so can be ignored, and one can be merged with an add to make a move. Apart from that, I erred on the side of caution in making nodes list_empty()-queriable. Signed-off-by: Phil Carmody Reviewed-by: Paul Menage Cc: Li Zefan Acked-by: Kirill A. Shutemov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edd45544c6f09550df0a5491aa8a07af24767e73 Author: David Rientjes Date: Tue Mar 22 16:30:12 2011 -0700 oom: avoid deferring oom killer if exiting task is being traced The oom killer naturally defers killing anything if it finds an eligible task that is already exiting and has yet to detach its ->mm. This avoids unnecessarily killing tasks when one is already in the exit path and may free enough memory that the oom killer is no longer needed. This is detected by PF_EXITING since threads that have already detached its ->mm are no longer considered at all. The problem with always deferring when a thread is PF_EXITING, however, is that it may never actually exit when being traced, specifically if another task is tracing it with PTRACE_O_TRACEEXIT. The oom killer does not want to defer in this case since there is no guarantee that thread will ever exit without intervention. This patch will now only defer the oom killer when a thread is PF_EXITING and no ptracer has stopped its progress in the exit path. It also ensures that a child is sacrificed for the chosen parent only if it has a different ->mm as the comment implies: this ensures that the thread group leader is always targeted appropriately. Signed-off-by: David Rientjes Reported-by: Oleg Nesterov Cc: KOSAKI Motohiro Cc: KAMEZAWA Hiroyuki Cc: Hugh Dickins Cc: Andrey Vagin Cc: [2.6.38.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30e2b41f20b6238f51e7cffb879c7a0f0073f5fe Author: Andrey Vagin Date: Tue Mar 22 16:30:11 2011 -0700 oom: skip zombies when iterating tasklist We shouldn't defer oom killing if a thread has already detached its ->mm and still has TIF_MEMDIE set. Memory needs to be freed, so find kill other threads that pin the same ->mm or find another task to kill. Signed-off-by: Andrey Vagin Signed-off-by: David Rientjes Cc: KOSAKI Motohiro Cc: [2.6.38.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a5dda7a17cf3706f79b86293f29db02d61e0d48 Author: David Rientjes Date: Tue Mar 22 16:30:09 2011 -0700 oom: prevent unnecessary oom kills or kernel panics This patch prevents unnecessary oom kills or kernel panics by reverting two commits: 495789a5 (oom: make oom_score to per-process value) cef1d352 (oom: multi threaded process coredump don't make deadlock) First, 495789a5 (oom: make oom_score to per-process value) ignores the fact that all threads in a thread group do not necessarily exit at the same time. It is imperative that select_bad_process() detect threads that are in the exit path, specifically those with PF_EXITING set, to prevent needlessly killing additional tasks. If a process is oom killed and the thread group leader exits, select_bad_process() cannot detect the other threads that are PF_EXITING by iterating over only processes. Thus, it currently chooses another task unnecessarily for oom kill or panics the machine when nothing else is eligible. By iterating over threads instead, it is possible to detect threads that are exiting and nominate them for oom kill so they get access to memory reserves. Second, cef1d352 (oom: multi threaded process coredump don't make deadlock) erroneously avoids making the oom killer a no-op when an eligible thread other than current isfound to be exiting. We want to detect this situation so that we may allow that exiting thread time to exit and free its memory; if it is able to exit on its own, that should free memory so current is no loner oom. If it is not able to exit on its own, the oom killer will nominate it for oom kill which, in this case, only means it will get access to memory reserves. Without this change, it is easy for the oom killer to unnecessarily target tasks when all threads of a victim don't exit before the thread group leader or, in the worst case, panic the machine. Signed-off-by: David Rientjes Cc: KOSAKI Motohiro Cc: KAMEZAWA Hiroyuki Cc: Oleg Nesterov Cc: Hugh Dickins Cc: Andrey Vagin Cc: [2.6.38.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52c50567d8ab0a0a87f12cceaa4194967854f0bd Author: Mel Gorman Date: Tue Mar 22 16:30:08 2011 -0700 mm: swap: unlock swapfile inode mutex before closing file on bad swapfiles If an administrator tries to swapon a file backed by NFS, the inode mutex is taken (as it is for any swapfile) but later identified to be a bad swapfile due to the lack of bmap and tries to cleanup. During cleanup, an attempt is made to close the file but with inode->i_mutex still held. Closing an NFS file syncs it which tries to acquire the inode mutex leading to deadlock. If lockdep is enabled the following appears on the console; ============================================= [ INFO: possible recursive locking detected ] 2.6.38-rc8-autobuild #1 --------------------------------------------- swapon/2192 is trying to acquire lock: (&sb->s_type->i_mutex_key#13){+.+.+.}, at: vfs_fsync_range+0x47/0x7c but task is already holding lock: (&sb->s_type->i_mutex_key#13){+.+.+.}, at: sys_swapon+0x28d/0xae7 other info that might help us debug this: 1 lock held by swapon/2192: #0: (&sb->s_type->i_mutex_key#13){+.+.+.}, at: sys_swapon+0x28d/0xae7 stack backtrace: Pid: 2192, comm: swapon Not tainted 2.6.38-rc8-autobuild #1 Call Trace: __lock_acquire+0x2eb/0x1623 find_get_pages_tag+0x14a/0x174 pagevec_lookup_tag+0x25/0x2e vfs_fsync_range+0x47/0x7c lock_acquire+0xd3/0x100 vfs_fsync_range+0x47/0x7c nfs_flush_one+0x0/0xdf [nfs] mutex_lock_nested+0x40/0x2b1 vfs_fsync_range+0x47/0x7c vfs_fsync_range+0x47/0x7c vfs_fsync+0x1c/0x1e nfs_file_flush+0x64/0x69 [nfs] filp_close+0x43/0x72 sys_swapon+0xa39/0xae7 sysret_check+0x2e/0x69 system_call_fastpath+0x16/0x1b This patch releases the mutex if its held before calling filep_close() so swapon fails as expected without deadlock when the swapfile is backed by NFS. If accepted for 2.6.39, it should also be considered a -stable candidate for 2.6.38 and 2.6.37. Signed-off-by: Mel Gorman Acked-by: Hugh Dickins Cc: [2.6.37+] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7a1fcd8e6e0c3c8f4f8f74fc926ff04da3bf7a7 Author: Andrew Morton Date: Tue Mar 22 16:30:07 2011 -0700 include/asm-generic/unistd.h: fix syncfs syscall number syncfs() is duplicating name_to_handle_at() due to a merging mistake. Cc: Sage Weil Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51e816564db151f7f08c739ad69b9d1dbd166663 Author: Jesper Juhl Date: Mon Mar 21 20:35:49 2011 +0100 Remove pointless memset in nfsacl_encode() Remove pointless memset() in nfsacl_encode(). Thanks to Trond Myklebust for pointing out that it is not needed since posix_acl_init() will set everything regardless.. Signed-off-by: Jesper Juhl Signed-off-by: Trond Myklebust commit 4667058b772857069378aa8f417203156e315e82 Author: Gusev Vitaliy Date: Wed Mar 23 00:40:25 2011 +0300 nfs4: Fix NULL dereference at d_alloc_and_lookup() d_alloc_and_lookup() calls i_op->lookup method due to rootfh changes his fsid. During mount i_op of NFS root inode is set to nfs_mountpoint_inode_operations, if rpc_ops->getroot() and rpc_ops->getattr() return different fsid. After that nfs_follow_remote_path() raised oops: BUG: unable to handle kernel NULL pointer dereference at (null) IP: [< (null)>] (null) stack trace: d_alloc_and_lookup+0x4c/0x74 do_lookup+0x1e3/0x280 link_path_walk+0x12e/0xab0 nfs4_remote_get_sb+0x56/0x2c0 [nfs] path_walk+0x67/0xe0 vfs_path_lookup+0x8e/0x100 nfs_follow_remote_path+0x16f/0x3e0 [nfs] nfs4_try_mount+0x6f/0xd0 [nfs] nfs_get_sb+0x269/0x400 [nfs] vfs_kern_mount+0x8a/0x1f0 do_kern_mount+0x52/0x130 do_mount+0x20a/0x260 sys_mount+0x90/0xe0 system_call_fastpath+0x16/0x1b So just refresh fsid, as RFC3530 doesn't specify behavior in case of rootfh changes fsid. Signed-off-by: Vitaliy Gusev Signed-off-by: Trond Myklebust commit 56be1416453c31d32f984328b5193489ab63ffcf Author: Paul Mundt Date: Wed Mar 23 08:29:07 2011 +0900 MAINTAINERS: de-orphan fbdev. It's been a few kernel versions now without any unexpected surprises, so tentatively bump up the support status. Signed-off-by: Paul Mundt commit 01ba82514603593bb11589e2ea2afdeba1921636 Merge: ab70a1d 4fdccdf Author: Linus Torvalds Date: Tue Mar 22 16:26:57 2011 -0700 Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Add statistics for this_cmpxchg_double failures slub: Add missing irq restore for the OOM path commit ab70a1d7c7fc6665d83f41b5ce790ff8376e0b81 Merge: 0adfc56 68da9ba Author: Linus Torvalds Date: Tue Mar 22 16:26:10 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: [net/9p]: Introduce basic flow-control for VirtIO transport. 9p: use the updated offset given by generic_write_checks [net/9p] Don't re-pin pages on retrying virtqueue_add_buf(). [net/9p] Set the condition just before waking up. [net/9p] unconditional wake_up to proc waiting for space on VirtIO ring fs/9p: Add v9fs_dentry2v9ses fs/9p: Attach writeback_fid on first open with WR flag fs/9p: Open writeback fid in O_SYNC mode fs/9p: Use truncate_setsize instead of vmtruncate net/9p: Fix compile warning net/9p: Convert the in the 9p rpc call path to GFP_NOFS fs/9p: Fix race in initializing writeback fid commit 0adfc56ce8fdc5c17630434e49f30536ba7b8559 Merge: f23eb2b 59c2be1 Author: Linus Torvalds Date: Tue Mar 22 16:25:25 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: rbd: use watch/notify for changes in rbd header libceph: add lingering request and watch/notify event framework rbd: update email address in Documentation ceph: rename dentry_release -> d_release, fix comment ceph: add request to the tail of unsafe write list ceph: remove request from unsafe list if it is canceled/timed out ceph: move readahead default to fs/ceph from libceph ceph: add ino32 mount option ceph: update common header files ceph: remove debugfs debug cruft libceph: fix osd request queuing on osdmap updates ceph: preserve I_COMPLETE across rename libceph: Fix base64-decoding when input ends in newline. commit d958c62c0cf43bb9c7dcd9833a35335ae72856f7 Author: Paul Mundt Date: Wed Mar 23 08:22:41 2011 +0900 MAINTAINERS: Add file pattern for fb dt bindings. Now that Documentation/devicetree/bindings/fb/ exists, make sure it's also matched by the default framebuffer entry. Signed-off-by: Paul Mundt commit f23eb2b2b28547fc70df82dd5049eb39bec5ba12 Author: Linus Torvalds Date: Tue Mar 22 16:17:32 2011 -0700 tty: stop using "delayed_work" in the tty layer Using delayed-work for tty flip buffers ends up causing us to wait for the next tick to complete some actions. That's usually not all that noticeable, but for certain latency-critical workloads it ends up being totally unacceptable. As an extreme case of this, passing a token back-and-forth over a pty will take two ticks per iteration, so even just a thousand iterations will take 8 seconds assuming a common 250Hz configuration. Avoiding the whole delayed work issue brings that ping-pong test-case down to 0.009s on my machine. In more practical terms, this latency has been a performance problem for things like dive computer simulators (simulating the serial interface using the ptys) and for other environments (Alan mentions a CP/M emulator). Reported-by: Jef Driesen Acked-by: Greg KH Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 9c7fbe2fbd1d861c50912b10b2bc3a15371a7a5e Author: Paul Mundt Date: Wed Mar 23 08:16:45 2011 +0900 video: Move sm501fb devicetree binding documentation to a better place. Now that there is a Documentation/devicetree hierarchy, and the driver in question has no specific platform dependency, move the binding information to a more appropriate place. Signed-off-by: Paul Mundt commit 9f6af27fb693c633cc46d36fc1d85efe6d6fbc17 Author: Tony Luck Date: Tue Mar 22 16:01:49 2011 -0700 pstore: cleanups to pstore_dump() pstore_dump() can be called with many different "reason" codes. Save the name of the code in the persistent store record. Also - only worthwhile calling pstore_mkfile for KMSG_DUMP_OOPS - that is the only one where the kernel will continue running. Reviewed-by: Seiji Aguchi Signed-off-by: Tony Luck commit 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 Author: Phillip Lougher Date: Tue Mar 22 23:01:26 2011 +0000 Squashfs: Use vmalloc rather than kmalloc for zlib workspace Bugzilla bug 31422 reports occasional "page allocation failure. order:4" at Squashfs mount time. Fix this by making zlib workspace allocation use vmalloc rather than kmalloc. Reported-by: Mehmet Giritli Signed-off-by: Phillip Lougher commit 246408dcd5dfeef2df437ccb0ef4d6ee87805f58 Author: Trond Myklebust Date: Tue Mar 22 18:40:10 2011 -0400 SUNRPC: Never reuse the socket port after an xs_close() If we call xs_close(), we're in one of two situations: - Autoclose, which means we don't expect to resend a request - bind+connect failed, which probably means the port is in use Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit 472af2b05bdefcaee7e754e22cbf131110017ad6 Author: Pawel Osciak Date: Mon Mar 14 10:38:24 2011 -0300 [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t dma_addr_t may not fit into void* on some architectures. To be safe, make vb2_dma_contig_cookie() return a pointer to dma_addr_t and dereference it in vb2_dma_contig_plane_paddr() back to dma_addr_t. Signed-off-by: Pawel Osciak Reported-by: Hans Verkuil Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit d6db5bfe7fd6d4334a1460923ba8175f1a0ece2d Author: Pawel Osciak Date: Mon Mar 14 10:38:23 2011 -0300 [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly Use vb2_dma_contig_plane_paddr to retrieve a physical address for a plane instead of calling an internal mem_ops callback. Signed-off-by: Pawel Osciak Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit d366d4a08a4e5e1fddc2cc820302be8e7a8143d4 Author: Guennadi Liakhovetski Date: Mon Mar 21 06:33:25 2011 -0300 [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE The soc-camera core accesses the "pix" member of the struct v4l2_format::fmt union, which is only valid for V4L2_BUF_TYPE_VIDEO_CAPTURE streams. This patch adds explicit checks for this to {g,s,try}_fmt methods. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 0e4c180d3e2cc11e248f29d4c604b6194739d05a Author: Sergio Aguirre Date: Mon Mar 7 21:49:48 2011 -0300 [media] v4l: soc-camera: Store negotiated buffer settings This fixes the problem in which a host driver sets a personalized sizeimage or bytesperline field, and gets ignored when doing G_FMT. Signed-off-by: Sergio Aguirre Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 3ea205c449d2b5996d0256aa8b2894f7aea228a2 Author: Jamie Iles Date: Tue Mar 22 15:34:56 2011 -0700 avr32: at32ap700x: fix typo in DMA master configuration Commit 4aa5f366431fe (avr32: at32ap700x: specify DMA src and dst masters) specified the masters for the ac97c playback device but incorrectly set them in the capture slave information rather than playback. Cc: Hans-Christian Egtvedt Reported-by: Nicolas Ferre Signed-off-by: Jamie Iles Acked-by: Vinod Koul [rebased on dmaengine for 2.6.39 (d42efe6b)] Signed-off-by: Dan Williams commit 4be22b6a7f2f2b7eb6f7aab8902068a367cda8ba Author: Jarod Wilson Date: Tue Mar 22 17:23:15 2011 -0300 [media] rc: interim support for 32-bit NEC-ish scancodes The Apple and TiVo remotes I've got use an NEC-ish protocol, but rather than a command/not_command pair, they have what appear to be vendor ID bytes. This change makes the NEC decoder warn if the command/not_command checksum fails, but then passes along a full 32-bit scancode for keymap lookup. This change should make no difference for existing keymaps, since they simply won't have 32-bit scancodes, but allows for a 32-bit keymap. At the moment, that'll have to be uploaded by the user, but I've got Apple and TiVo remote keymaps forthcoming. In the long run (2.6.40, hopefully), we should probably just always use all 32 bits for all NEC keymaps, but this should get us by for 2.6.39. (Note that a few of the TiVo keys actuallly *do* pass the command checksum, so for now, the keymap for this remote will have to be a mix of 24-bit and 32-bit scancodes, but so be it). Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 7d9a46f9d5e0bea8e862143be73df2bbc9acb2a3 Author: Jarod Wilson Date: Fri Mar 4 20:20:47 2011 -0300 [media] mceusb: topseed 0x0011 needs gen3 init for tx to work Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit cc664ae026f1b0f3254564a7d45cc29e735c7fed Author: Jarod Wilson Date: Fri Mar 4 19:53:05 2011 -0300 [media] lirc_zilog: error out if buffer read bytes != chunk size Give it a few tries, then exit. Prevents a possible endless loop situation. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 55734785cdaff596be9a5238af54fc0f4ace2e63 Author: Jarod Wilson Date: Fri Mar 4 17:57:24 2011 -0300 [media] lirc: silence some compile warnings Both lirc_imon and lirc_sasem were causing gcc to complain about the possible use of uninitialized variables. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit dc8e2aa3b5a6c13baa77709bcaa2e7e483d9d006 Author: Jarod Wilson Date: Fri Mar 4 17:31:11 2011 -0300 [media] hdpvr: use same polling interval as other OS The hdpvr's IR part, in short, sucks. As observed with a usb traffic sniffer, the Windows software for it uses a polling interval of 405ms. Its still not behaving as well as I'd like even with this change, but this inches us closer and closer to that point... Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 6e5b960176980852187b6f0bafa3db78130be42f Author: Jarod Wilson Date: Fri Mar 4 17:30:17 2011 -0300 [media] ir-kbd-i2c: pass device code w/key in hauppauge case The new hauppauge key tables use both device code button code. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 206241069ecfa52c3b8873f8d7e31d434d2fcae1 Author: Mauro Carvalho Chehab Date: Mon Jan 24 22:23:08 2011 -0300 [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap This keymap were used for the Hauppauge Black remote controller only. It also contains some keycodes not found there. As the Hauppauge Black is now part of the hauppauge keymap, just remove it. Also, remove the modprobe hacks to select between the Gray and the Black versions of the remote controller as: - Both are supported by default by the keymap; - If the user just wants one keyboard supported, it is just a matter of changing the keymap via the userspace tool (ir-keytable), removing the keys that he doesn't desire. As ir-keytable auto-loads the keys via udev, this is better than obscure modprobe parameters. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit af86ce79f020a31e4a30661e41471d31face9985 Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:48 2011 -0300 [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map The rc-hauppauge-new map is a messy thing, as it bundles 3 different remote controllers as if they were just one, discarding the address byte. Also, some key maps are wrong. With the conversion to the new rc-core, it is likely that most of the devices won't be working properly, as the i2c driver and the raw decoders are now providing 16 bits for the remote, instead of just 8. delete mode 100644 drivers/media/rc/keymaps/rc-hauppauge-new.c Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 15195d3a83b59f0ca3bed52cbe5524042ce13fd6 Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:47 2011 -0300 [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge There are two "hauppauge-new" keymaps, one with protocol unknown, and the other with the protocol marked accordingly. However, both tables are miss-named. Also, the old rc-hauppauge-new is broken, as it mixes three different controllers as if they were just one. This patch solves half of the problem by renaming the correct keycode table as just rc-hauppauge. This table contains the codes for the four different types of remote controllers found on Hauppauge cards, properly mapped with their different addresses. create mode 100644 drivers/media/rc/keymaps/rc-hauppauge.c delete mode 100644 drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c [Jarod: fix up RC_MAP_HAUPPAUGE defines] Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 0548757419c974d8c0851c13279b2c89a12b2978 Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:45 2011 -0300 [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping The keys for the old black were messed with the ones for the hauppauge grey. Fix it. Also, fixes some keycodes and order the keys according with the way they appear inside the remote controller. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 9890a9edc8b8bba6d710499afb70e981e0b0dfae Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:44 2011 -0300 [media] rc-rc5-hauppauge-new: Add support for the old Black RC Hans borrowed me an old Black Hauppauge RC. Thanks to that, we can fix the RC5 table for Hauppauge. Thanks-to: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 0684f5b0fc2b543287abad03fc40e65d5e89d1ef Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:43 2011 -0300 [media] rc-rc5-hauppauge-new: Add the old control to the table Adds the old grey remote controller to Hauppauge table. Hans borrowed me an old gray Hauppauge RC. Thanks to that, we can fix the RC5 table for Hauppauge. Thanks-to: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 7f961c6989a98c10faea76a39228a63624f10690 Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:43 2011 -0300 [media] rc-winfast: Fix the keycode tables One of the remotes has a picture available at: http://lirc.sourceforge.net/remotes/leadtek/Y04G0004.jpg As there's one variant with a set direction keys plus vol/chann keys, and the same table is used for both models, change it to represent all keys, avoiding the usage of weird function keys. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 898a83e9243e2398e863887b36476c3cc227074a Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:42 2011 -0300 [media] a800: Fix a few wrong IR key assignments Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 76fd93b62322e5e4bfdf2744efe92f0de9e6ac4a Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:41 2011 -0300 [media] opera1: Use multimedia keys instead of an app-specific mapping This driver uses an app-specific keymap for one of the tables. This is wrong. Instead, use the standard keycodes. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 991bd3c25e8e07960ecd6bcc7079737f83f17c36 Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:40 2011 -0300 [media] dw2102: Use multimedia keys instead of an app-specific mapping This driver uses an app-specific keymap for one of the tables. This is wrong. Instead, use the standard keycodes. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 04efa85e03b25c5b519e495485d005a8b69ccdab Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:39 2011 -0300 [media] rc/keymaps: Use KEY_LEFTMETA were pertinent Using xev and testing the "Windows" key on a normal keyboard, it is mapped as KEY_LEFTMETA. So, as this is the standard code for it, use it, instead of a generic, meaningless KEY_PROG1. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit d9e9f41c45536b68b14934949104cb40149e94f1 Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:38 2011 -0300 [media] rc/keymaps: Fix most KEY_PROG[n] keycodes Those KEY_PROG[n] keys were used on places where the developer didn't know for sure what key should be used. On several cases, using KEY_RED, KEY_GREEN, KEY_YELLOW would be enough. On others, there are specific keys for that already. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 6f9e46b44785eb9cc59e638970e7aa443ff6fe5e Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:37 2011 -0300 [media] rc/keymaps: Use KEY_VIDEO for Video Source Each keyboard map were using a different definition for the Source/Video Source key. Behold Columbus were the only one using KEY_PROPS. As we want to standardize those keys at X11 and at userspace applications, we need to use just one code for it. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit 444cc20b3d6141a5fa9a9774a6b710e16af6110d Author: Mauro Carvalho Chehab Date: Mon Jan 24 12:18:36 2011 -0300 [media] rc/keymaps: use KEY_CAMERA for snapshots On a few places, KEY_MHP were used for snapshots. However, KEY_CAMERA is used for it on all the other keyboards that have a snapshot/Picture button. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jarod Wilson commit aa3f4e446e784372498f009ea37177857f23331e Author: Andy Walls Date: Thu Feb 17 21:32:06 2011 -0300 [media] lirc_zilog: Update TODO list based on work completed and revised plans Update the TODO.lirc_zilog based on what has been completed. Also revised the development plan for lirc_zilog to not try and split Tx/Rx for one IR transceiver unit between lirc_zilog and ir-kbd-i2c, since that would be a ref-counting nightmare. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 4933fc9d72104d66c54620537eb6f43457a6896f Author: Andy Walls Date: Thu Feb 17 21:14:13 2011 -0300 [media] lirc_zilog: Fix somewhat confusing information messages in ir_probe() The total sequence of messages emitted by the ir_porbe() calls for a transceiver's two i2c_clients was confusing. Clean it up a bit. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit d6dbd939b97d271766a58a66d69b27023bc90993 Author: Andy Walls Date: Thu Feb 17 20:50:38 2011 -0300 [media] lirc_zilog: Add locking of the i2c_clients when in use Lock the i2c_client pointers and prevent i2c_client removal when lirc_zilog is perfoming a series of operations that require valid i2c_client pointers. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 5bd6b0464b68d429bc8a3fe6595d19c39dfc4d95 Author: Andy Walls Date: Mon Feb 7 22:30:55 2011 -0300 [media] lirc_zilog: Add ref counting of struct IR, IR_tx, and IR_rx This is a major change to add pointer reference counting for struct IR, struct IR_tx, and struct IR_rx object instances. This ref counting gets lirc_zilog closer to gracefully handling bridge drivers and hot-unplugged USB devices disappearing out from under lirc_zilog when the /dev/lircN node is still open. (mutexes to protect the i2c_client pointers in struct IR_tx and struct IR_rx still need to be added.) This reference counting also helps lirc_zilog clean up properly when the i2c_clients disappear. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 534c1eab1e2770dca3cf4616cc4059683020114b Author: Andy Walls Date: Thu Jan 27 23:02:20 2011 -0300 [media] lirc_zilog: Move constants from ir_probe() into the lirc_driver template ir_probe() makes a number of constant assignments into the lirc_driver object after copying in a template. Make better use of the template. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit bcbd165509da05a2317ac7dce3c6b952e98a01ef Author: Andy Walls Date: Thu Jan 27 22:32:44 2011 -0300 [media] lirc_zilog: Always allocate a Rx lirc_buffer object Always allocate a lirc_buffer object, instead of just upon setup of the Rx i2c_client. If we do not allocate a lirc_buffer object, because we are not handling the Rx i2c_client, lirc_dev will allocate its own lirc_buffer anyway and not tell us about its location. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 8152b760effbff11cb4eef6292ae3b47719ee792 Author: Andy Walls Date: Thu Jan 27 02:34:13 2011 -0300 [media] lirc_zilog: Remove unneeded rx->buf_lock Remove the rx->buf_lock that protected the rx->buf lirc_buffer. The underlying operations on the objects within the lirc_buffer are already protected by spinlocks, or the objects are constant (e.g. chunk_size). Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 915e54733de4a36742ab78b4768750ce72662f85 Author: Andy Walls Date: Thu Jan 27 02:10:42 2011 -0300 [media] lirc_zilog: Don't acquire the rx->buf_lock in the poll() function There is no need to take the rx->buf_lock in the the poll() function as all the underling calls made on objects in the rx->buf lirc_buffer object are protected by spinlocks. Corrected a bad error return value in poll(): return POLLERR instead of -ENODEV. Added some comments to poll() for when, in the future, I forget what poll() and poll_wait() are supposed to do. [Jarod: minor debug spew fix] Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 9a55a2b37eb7e4941ef55aadb858b615d229afee Author: Andy Walls Date: Thu Jan 27 00:04:15 2011 -0300 [media] lirc_zilog: Use kernel standard methods for marking device non-seekable lirc_zilog had its own llseek stub that returned -ESPIPE. Get rid of it and use the kernel's no_llseek() and nonseekable_open() functions instead. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit a30648550f2f758c9c00c493c8919f89f65438c4 Author: Andy Walls Date: Wed Jan 26 22:04:24 2011 -0300 [media] lirc_zilog: Convert the instance open count to an atomic_t The open count is simply used for deciding if the Rx polling thread needs to poll the IR chip for userspace. Simplify the manipulation of the open count by using an atomic_t and not requiring a lock The polling thread errantly didn't try to take the lock anyway. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 5c07134fff9e6b1f9a3c75e62bbb827d1faa72eb Author: Andy Walls Date: Wed Jan 26 21:48:32 2011 -0300 [media] lirc_zilog: Convert ir_device instance array to a linked list Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 9b28500a59d7ee5da5adb43bcb384391cac401c4 Author: Andy Walls Date: Wed Jan 26 21:25:47 2011 -0300 [media] lirc_zilog: Remove broken, ineffective reference counting The set_use_inc() and set_use_dec() functions tried to lock the underlying bridge driver device instance in memory by changing the use count on the device's i2c_clients. This worked for PCI devices (ivtv, cx18, bttv). It doesn't work for hot-pluggable usb devices (pvrusb2 and hdpvr). With usb device instances, the driver may get locked into memory, but the unplugged hardware is gone. The set_use_inc() set_use_dec() functions also tried to have lirc_zilog change its own module refernce count, which is racy and not guaranteed to work. The lirc_dev module does actually perform proper module ref count manipulation on the lirc_zilog module, so there is need for lirc_zilog to attempt a buggy module get on itself anyway. lirc_zilog also errantly called these functions on itself in open() and close(), but lirc_dev did that already too. So let's just gut the bodies of the set_use_*() functions, and remove the extra calls to them from within lirc_zilog. Proper reference counting of the struct IR, IR_rx, and IR_tx objects -- to handle the case when the underlying bttv, ivtv, cx18, hdpvr, or pvrusb2 bridge driver module or device instance goes away -- will be added in subsequent patches. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 12d896e1c17978599a98510fdfaff27a4e82c0bf Author: Andy Walls Date: Wed Jan 26 21:06:43 2011 -0300 [media] lirc_zilog: Restore checks for existence of the IR_tx object This reverts commit 8090232a237ab62e22307fc060097da1a283dd66 and adds an additional check for ir->tx == NULL. The user may need us to handle an RX only unit. Apparently there are TV capture units in existence with Rx only wiring and/or RX only firmware for the on-board Zilog Z8 IR unit. Signed-off-by: Andy Walls Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit b443ac5a2836532af2315a4acb95c7a2cf721cbd Author: Jarod Wilson Date: Wed Mar 2 13:23:52 2011 -0300 [media] hdpvr: i2c master enhancements Make the hdpvr's i2c master implementation more closely mirror that of the pvrusb2 driver. Currently makes no significant difference in IR reception behavior with ir-kbd-i2c (i.e., it still sucks). Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 53a5fd4dede974ba9727cda430e6714293be5e71 Author: Jarod Wilson Date: Tue Feb 1 16:27:05 2011 -0300 [media] imon: add more panel scancode mappings Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit fe06b11dea74d53156d4116dcd518193a2e42ba4 Author: Jarod Wilson Date: Mon Jan 24 18:22:12 2011 -0300 [media] docs: fix typo in lirc_device_interface.xml Reported-by: Daniel Burr Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit db138908ccff404b9920f18f6244f4bff2368c04 Merge: 04024b9 8bc8aec Author: David S. Miller Date: Tue Mar 22 14:36:18 2011 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 68da9ba4eeadae86ad42e52b80822fbd56971267 Author: Venkateswararao Jujjuri (JV) Date: Fri Mar 18 15:49:48 2011 -0700 [net/9p]: Introduce basic flow-control for VirtIO transport. Recent zerocopy work in the 9P VirtIO transport maps and pins user buffers into kernel memory for the server to work on them. Since the user process can initiate this kind of pinning with a simple read/write call, thousands of IO threads initiated by the user process can hog the system resources and could result into denial of service. This patch introduces flow control to avoid that extreme scenario. The ceiling limit to avoid denial of service attacks is set to relatively high (nr_free_pagecache_pages()/4) so that it won't interfere with regular usage, but can step in extreme cases to limit the total system hang. Since we don't have a global structure to accommodate this variable, I choose the virtio_chan as the home for this. Signed-off-by: Venkateswararao Jujjuri Reviewed-by: Badari Pulavarty Signed-off-by: Eric Van Hensbergen commit aaf0ef1d2bce05cfd06cf29c96a6973df4d0a6a8 Author: M. Mohan Kumar Date: Wed Mar 16 21:40:49 2011 +0530 9p: use the updated offset given by generic_write_checks Without this fix, even if a file is opened in O_APPEND mode, data will be written at current file position instead of end of file. Signed-off-by: M. Mohan Kumar Reviewed-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 316ad5501c2098cb2a2a25ed77a0421f1671411c Author: Venkateswararao Jujjuri (JV) Date: Mon Mar 14 14:22:41 2011 -0700 [net/9p] Don't re-pin pages on retrying virtqueue_add_buf(). Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit a01a984035ea799b14aa5e874dcaeb122f09c4b4 Author: Venkateswararao Jujjuri (JV) Date: Mon Mar 14 14:12:49 2011 -0700 [net/9p] Set the condition just before waking up. Given that the sprious wake-ups are common, we need to move the condition setting right next to the wake_up(). After setting the condition to req->status = REQ_STATUS_RCVD, sprious wakeups may cause the virtqueue back on the free list for someone else to use. This may result in kernel panic while relasing the pinned pages in p9_release_req_pages(). Also rearranged the while loop in req_done() for better redability. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 53bda3e5b4e91763224ecb7d05dab94d281fd41d Author: Venkateswararao Jujjuri (JV) Date: Tue Mar 8 15:34:20 2011 -0800 [net/9p] unconditional wake_up to proc waiting for space on VirtIO ring Process may wait to get space on VirtIO ring to send a transaction to VirtFS server. Current code just does a conditional wake_up() which means only one process will be woken up even if multiple processes are waiting. This fix makes the wake_up unconditional. Hence we won't have any processes waiting for-ever. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 04521db04e9a11e74b0252d222051cb194487f4d Author: Vivek Goyal Date: Tue Mar 22 21:54:29 2011 +0100 blk-throttle: Reset group slice when limits are changed Lina reported that if throttle limits are initially very high and then dropped, then no new bio might be dispatched for a long time. And the reason being that after dropping the limits we don't reset the existing slice and do the rate calculation with new low rate and account the bios dispatched at high rate. To fix it, reset the slice upon rate change. https://lkml.org/lkml/2011/3/10/298 Another problem with very high limit is that we never queued the bio on throtl service tree. That means we kept on extending the group slice but never trimmed it. Fix that also by regulary trimming the slice even if bio is not being queued up. Reported-by: Lina Lu Signed-off-by: Vivek Goyal Signed-off-by: Jens Axboe commit 42869c8adae72366fc6c4f3924ce3d6c3735c4a3 Author: Aneesh Kumar K.V Date: Tue Mar 8 16:39:50 2011 +0530 fs/9p: Add v9fs_dentry2v9ses Add the new static inline and use the same Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 7add697a3d271aa7080513f92dab190c75174b7e Author: Aneesh Kumar K.V Date: Tue Mar 8 16:39:49 2011 +0530 fs/9p: Attach writeback_fid on first open with WR flag We don't need writeback fid if we are only doing O_RDONLY open Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit ea59bb759b8fd240860c37026ab1b998d26ac285 Author: Aneesh Kumar K.V Date: Tue Mar 8 16:39:49 2011 +0530 fs/9p: Open writeback fid in O_SYNC mode Older version of protocol don't support tsyncfs operation. So for them force a O_SYNC flag on the server Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 059c138bc79320bd7d6fba91bad4d50eeec9c31f Author: Aneesh Kumar K.V Date: Tue Mar 8 16:39:48 2011 +0530 fs/9p: Use truncate_setsize instead of vmtruncate convert vmtruncate usage to truncate_setsize. We also writeback all dirty pages before doing 9p operations and on success call truncate_setsize. This ensure that we continue sanely on failed truncate on the server. The disadvantage is that we are now going to write back the content that get thrown away later as a part of truncate. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 472e7f9f8b547605ee9670ac803e971c2e3eeac0 Author: Aneesh Kumar K.V Date: Tue Mar 8 16:39:47 2011 +0530 net/9p: Fix compile warning Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit eeff66ef6e33925f615d49e6c846263e342ab60e Author: Aneesh Kumar K.V Date: Tue Mar 8 16:39:47 2011 +0530 net/9p: Convert the in the 9p rpc call path to GFP_NOFS Without this we can cause reclaim allocation in writepage. [ 3433.448430] ================================= [ 3433.449117] [ INFO: inconsistent lock state ] [ 3433.449117] 2.6.38-rc5+ #84 [ 3433.449117] --------------------------------- [ 3433.449117] inconsistent {RECLAIM_FS-ON-W} -> {IN-RECLAIM_FS-R} usage. [ 3433.449117] kswapd0/505 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 3433.449117] (iprune_sem){+++++-}, at: [] shrink_icache_memory+0x45/0x2b1 [ 3433.449117] {RECLAIM_FS-ON-W} state was registered at: [ 3433.449117] [] mark_held_locks+0x52/0x70 [ 3433.449117] [] lockdep_trace_alloc+0x85/0x9f [ 3433.449117] [] slab_pre_alloc_hook+0x18/0x3c [ 3433.449117] [] kmem_cache_alloc+0x23/0xa2 [ 3433.449117] [] idr_pre_get+0x2d/0x6f [ 3433.449117] [] p9_idpool_get+0x30/0xae [ 3433.449117] [] p9_client_rpc+0xd7/0x9b0 [ 3433.449117] [] p9_client_clunk+0x88/0xdb [ 3433.449117] [] v9fs_evict_inode+0x3c/0x48 [ 3433.449117] [] evict+0x1f/0x87 [ 3433.449117] [] dispose_list+0x47/0xe3 [ 3433.449117] [] evict_inodes+0x138/0x14f [ 3433.449117] [] generic_shutdown_super+0x57/0xe8 [ 3433.449117] [] kill_anon_super+0x11/0x50 [ 3433.449117] [] v9fs_kill_super+0x49/0xab [ 3433.449117] [] deactivate_locked_super+0x21/0x46 [ 3433.449117] [] deactivate_super+0x40/0x44 [ 3433.449117] [] mntput_no_expire+0x100/0x109 [ 3433.449117] [] sys_umount+0x2f1/0x31c [ 3433.449117] [] system_call_fastpath+0x16/0x1b [ 3433.449117] irq event stamp: 192941 [ 3433.449117] hardirqs last enabled at (192941): [] _raw_spin_unlock_irq+0x2b/0x30 [ 3433.449117] hardirqs last disabled at (192940): [] shrink_inactive_list+0x290/0x2f5 [ 3433.449117] softirqs last enabled at (188470): [] __do_softirq+0x133/0x152 [ 3433.449117] softirqs last disabled at (188455): [] call_softirq+0x1c/0x28 [ 3433.449117] [ 3433.449117] other info that might help us debug this: [ 3433.449117] 1 lock held by kswapd0/505: [ 3433.449117] #0: (shrinker_rwsem){++++..}, at: [] shrink_slab+0x38/0x15f [ 3433.449117] [ 3433.449117] stack backtrace: [ 3433.449117] Pid: 505, comm: kswapd0 Not tainted 2.6.38-rc5+ #84 [ 3433.449117] Call Trace: [ 3433.449117] [] ? valid_state+0x17e/0x191 [ 3433.449117] [] ? save_stack_trace+0x28/0x45 [ 3433.449117] [] ? check_usage_forwards+0x0/0x87 [ 3433.449117] [] ? mark_lock+0x113/0x22c [ 3433.449117] [] ? __lock_acquire+0x37a/0xcf7 [ 3433.449117] [] ? mark_lock+0x2d/0x22c [ 3433.449117] [] ? __lock_acquire+0x392/0xcf7 [ 3433.449117] [] ? determine_dirtyable_memory+0x15/0x28 [ 3433.449117] [] ? lock_acquire+0x57/0x6d [ 3433.449117] [] ? shrink_icache_memory+0x45/0x2b1 [ 3433.449117] [] ? down_read+0x47/0x5c [ 3433.449117] [] ? shrink_icache_memory+0x45/0x2b1 [ 3433.449117] [] ? shrink_icache_memory+0x45/0x2b1 [ 3433.449117] [] ? shrink_slab+0xdb/0x15f [ 3433.449117] [] ? kswapd+0x574/0x96a [ 3433.449117] [] ? kswapd+0x0/0x96a [ 3433.449117] [] ? kthread+0x7d/0x85 [ 3433.449117] [] ? kernel_thread_helper+0x4/0x10 [ 3433.449117] [] ? restore_args+0x0/0x30 [ 3433.449117] [] ? kthread+0x0/0x85 [ 3433.449117] [] ? kernel_thread_helper+0x0/0x10 Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 5a7e0a8cf50cf905403f5a498e86d1f97cfcf51b Author: Aneesh Kumar K.V Date: Tue Mar 8 16:39:46 2011 +0530 fs/9p: Fix race in initializing writeback fid When two process open the same file we can end up with both of them allocating the writeback_fid. Add a new mutex which can be used for synchronizing v9fs_inode member values. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 9026e521c0da0731eb31f9f9022dd00cc3cd8885 Author: Justin TerAvest Date: Tue Mar 22 21:26:54 2011 +0100 blk-cgroup: Only give unaccounted_time under debug This change moves unaccounted_time to only be reported when CONFIG_DEBUG_BLK_CGROUP is true. Signed-off-by: Justin TerAvest Signed-off-by: Jens Axboe commit eda5e0c91fed2d2a38a341b0957263406d330274 Author: Justin TerAvest Date: Tue Mar 22 21:26:49 2011 +0100 cfq-iosched: Don't set active queue in preempt Commit "Add unaccounted time to timeslice_used" changed the behavior of cfq_preempt_queue to set cfqq active. Vivek pointed out that other preemption rules might get involved, so we shouldn't manually set which queue is active. This cleans up the code to just clear the queue stats at preemption time. Signed-off-by: Justin TerAvest Signed-off-by: Jens Axboe commit 2aefbc1acb5370b0753d16c9d6e65e01fe586c75 Author: Dmitri Belimov Date: Thu Mar 17 21:08:55 2011 -0300 [media] tm6000: fix s-video input Add compatibility for composite and s-video inputs. Some TV cards hasn't it. Fix S-Video input, the s-video cable has only video signals no audio. Call the function of audio configure kill chroma in signal. only b/w video. Known bugs: - after s-video the audio for radio didn't work, TV crashed hardly - after composite TV crashed hardly too. P.S. After this patch I'll want to rework the procedure of configure video. Now it has a lot of junk and dubles. With my best regards, Dmitry. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 812738e11158e9b92c4f0e9278de48377cfa3cc8 Author: Juan J. Garcia de Soria Date: Wed Mar 16 17:14:53 2011 -0300 [media] lirc: remove staging lirc_it87 and lirc_ite8709 drivers Remove older drivers lirc_it87 and lirc_ite8709 from the LIRC staging area, since they're now superceded by ite-cir. Signed-off-by: Juan J. Garcia de Soria Tested-by: Stephan Raue Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 2ccb24ff3b94acb3f405b10a59967d52d95f91e0 Author: Mauro Carvalho Chehab Date: Tue Mar 22 15:12:40 2011 -0300 [media] ite-cir: Fix some CodingStyle issues Cc: Juan J. Garcia de Soria Cc: Stephan Raue Cc: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 620a32bba4a2dd57ccf1d5f87b9e6d2402ffec22 Author: Juan J. Garcia de Soria Date: Wed Mar 16 17:14:52 2011 -0300 [media] rc: New rc-based ite-cir driver for several ITE CIRs This is a second version of an rc-core based driver for the ITE Tech IT8712F CIR and now for a pair of other variants of the IT8512 CIR too. This driver should replace the lirc_it87 and lirc_ite8709 currently living in the LIRC staging directory. The driver should support the ITE8704, ITE8713, ITE8708 and ITE8709 (this last one yet untested) PNP ID's. The code doesn'te reuse code from the pre-existing LIRC drivers, but has been written from scratch using the nuvoton.cir driver as a skeleton. This new driver shouldn't exhibit timing problems when running under load (or with interrupts disabled for relatively long times). It works OOTB with the RC6 MCE remote bundled with the ASUS EEEBox. TX support is implemented, but I'm unable to test it since my hardware lacks TX capability. Signed-off-by: Juan J. Garcia de Soria Tested-by: Stephan Raue Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit baf075eca42f217e8d297914ed6fecfd2452a0e4 Author: Mauro Carvalho Chehab Date: Tue Mar 22 15:03:09 2011 -0300 [media] drivers/media/rc/Kconfig: use tabs, instead of spaces Signed-off-by: Mauro Carvalho Chehab commit 3e507c55918b51fed30ae5e9a3667c6a5f2e8755 Author: Steven Rostedt Date: Thu Mar 10 19:41:29 2011 -0300 [media] saa7134: Fix strange kconfig dependency on RC_CORE As the code in saa7134-input is not a module, but the config for it is set as a boolean instead of a tristate, this causes a strange dependency on RC_CORE. VIDEO_SAA7134_RC (which determines if saa7134-input.o is built) depends on RC_CORE and VIDEO_SAA7134. If VIDEO_SAA7134 is compiled as 'y' but RC_CORE is compiled as 'm' VIDEO_SAA7134_RC can still be set to 'y' which causes undefined symbols that it needs from RC_CORE. The simplest solution is to not allow VIDEO_SAA7134_RC be enabled if RC_CORE compiled as a module (m) and VIDEO_SA7134 is compiled into the kernel (y). Suggested-by: Mauro Carvalho Chehab Cc: Michal Marek Cc: linux-kbuild Signed-off-by: Steven Rostedt Signed-off-by: Mauro Carvalho Chehab commit b50b3a1acd22a07e354a154e5d00a9d338446b77 Author: Malcolm Priestley Date: Sun Mar 6 13:37:00 2011 -0300 [media] STV0288 added full frontend status status now returns FE_HAS_CARRIER FE_HAS_SIGNAL FE_HAS_VITERBI Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit 590f21680616a78f7d6972b92ceb540e306452c1 Author: Jean-François Moine Date: Tue Mar 22 06:47:56 2011 -0300 [media] gspca - zc3xx: Add exposure control for sensor hv7131r Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7106225a9e7d123ff87a6848972b6d28c8903940 Author: Patrice Chotard Date: Mon Mar 21 16:58:56 2011 -0300 [media] gspca - main: Add endpoint direction test in alt_xfer This patch fixes a bug in gspca, more precisely in alt_xfer(). This function looks for an input transfer endpoint in an alternate setting. By default it returns the first endpoint corresponding to the transfer type indicated in parameter. But with some USB devices, the first endpoint corresponding to the transfer type is not always an INPUT endpoint but an OUTPUT one. This patch adds the endpoint direction test to be sure to return an INPUT endpoint Signed-off-by: Patrice CHOTARD Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 8e3c08bb41145bd8507397f63937759500c12a04 Author: Jean-François Moine Date: Tue Mar 22 06:09:49 2011 -0300 [media] gspca - nw80x: Fix exposure for some webcams Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 088fc390bd2d6af547043b4579bf52d1c163c702 Author: Jean-François Moine Date: Tue Mar 22 06:07:40 2011 -0300 [media] gspca - nw80x: Get the sensor ID when bridge et31x110 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 152507144a59d74423a25e1ba80f4f7f17449417 Author: Jean-François Moine Date: Tue Mar 22 06:04:09 2011 -0300 [media] gspca - nw80x: Fix some image resolutions No 352x288 for Ds3303 and no 320x240 for Generic802. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit ee32ffbf8e446e9b8c247ae9c9ba032979c3eafc Author: Jean-François Moine Date: Tue Mar 22 05:58:19 2011 -0300 [media] gspca - nw80x: Check the bridge from the webcam type Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f12b44ff2d5ba8eb41210438589a64490ddfedec Author: Jean-François Moine Date: Tue Mar 22 05:53:21 2011 -0300 [media] gspca - nw80x: Fix the gain, exposure and autogain The autogain now uses common functions. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit bad03ff53ae3d336b5ecc5356b4739d9a693fc3d Author: Jean-François Moine Date: Tue Mar 22 05:46:24 2011 -0300 [media] gspca - nw80x: Do some initialization at probe time Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 94751d4b208281f8447a9baca39963b66dd6983f Author: Jean-François Moine Date: Tue Mar 22 05:37:18 2011 -0300 [media] gspca - nw80x: The webcam dsb-c110 is the same as the twinkle Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit c3ee142b44c868fb5e0eefe1b9c2df8115f6c69b Author: Jean-François Moine Date: Tue Mar 22 05:16:11 2011 -0300 [media] gspca - nw80x: Cleanup source Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit b1a873a37b6551a214ad37d1eee7654a9d65fd6e Author: Hans Verkuil Date: Tue Mar 22 10:14:07 2011 -0300 [media] v4l2: use new flag to enable core priority handling Rather than guess which driver supports core priority handling, require drivers that do to explicitly set the V4L2_FL_USE_FH_PRIO flag in video_device. Updated the core prio handling accordingly and set the flag in the three drivers that do. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2f82441a8644287e5b647329cc30b590f6fd3714 Author: Hans Verkuil Date: Sat Mar 12 06:43:28 2011 -0300 [media] ivtv: replace ugly casts with a proper container_of ivtv-ioctl cast the 'void *fh' directly to 'ivtv_open_id *'. This should be done properly with a contained_of since the 'void *fh' is really a 'struct v4l2_fh *'. It worked because the v4l2_fh field is also the first field in the ivtv_open_id struct, but it is not clean code. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6aff72f6d511bcadbc71358ed17bc87edbf90716 Author: Hans Verkuil Date: Sat Mar 12 06:39:44 2011 -0300 [media] ivtv: add missing v4l2_fh_exit Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2e4784d0d3a6167e905a49d0dafa40b022fa1a55 Author: Hans Verkuil Date: Fri Mar 11 20:01:54 2011 -0300 [media] vivi: convert to core priority handling Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 13099294973b14f07915d0342af2be8fa0af589b Author: Hans Verkuil Date: Mon Jan 17 20:25:11 2011 -0300 [media] dsbr100: ensure correct disconnect sequence Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e64d07c92daa5c7973c1d4433f939a4e0fa3beb9 Author: Hans Verkuil Date: Sun Dec 19 18:54:08 2010 -0300 [media] dsbr100: convert to unlocked_ioctl Use core-assisted locking so .ioctl can be replaced by .unlocked_ioctl. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2335e2b817186cf79a07311f14560ef8b30f6a9a Author: Hans Verkuil Date: Thu Feb 24 06:28:46 2011 -0300 [media] v4l2-framework.txt: document new v4l2_device release() callback Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit bedf8bcf6b4f90a6e31add3721a2e71877289381 Author: Hans Verkuil Date: Sat Mar 12 06:37:19 2011 -0300 [media] v4l2-device: add kref and a release function The video_device struct has proper ref counting and its release function will be called when the last user releases it. But no such support was available for struct v4l2_device. This made it hard to determine when a USB driver can release the device if it has multiple device nodes. With one device node it is easy of course, since when the device node is released, the whole device can be released. This patch adds refcounting to v4l2_device. When registering device nodes the v4l2_device refcount will be increased, when releasing device nodes it will be decreased. The (optional) release function will be called when the last device node was released. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a64bb4b7111e063154f97ff64dab03144cdfb5d9 Author: Hans Verkuil Date: Sat Mar 12 06:36:08 2011 -0300 [media] cx18: use core priority handling VIDIOC_S/G_PRIORITY handling is now done by the v4l2 core framework. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0b5f265a88d89cbbf8abc42ca3311cb3219162ab Author: Hans Verkuil Date: Sat Mar 12 06:35:33 2011 -0300 [media] cx18: use v4l2_fh as preparation for adding core priority support Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6e29ad50b4d688b1d18e2d255e31676c7ee46d3d Author: Hans Verkuil Date: Thu Feb 24 10:58:13 2011 -0300 [media] v4l2-framework.txt: improve v4l2_fh/priority documentation Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cc0a2d411f158c61af34d056191c7b4669913ddc Author: Hans Verkuil Date: Fri Mar 11 19:03:41 2011 -0300 [media] ivtv: convert to core priority handling Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 99cd47bc733436da282016e629eef6baa0f6047c Author: Hans Verkuil Date: Fri Mar 11 19:00:56 2011 -0300 [media] v4l2-ioctl: add priority handling support Drivers that use v4l2_fh can now use the core framework support of g/s_priority. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dfddb2441f39e8c0254504516be35b854addf6fa Author: Hans Verkuil Date: Sat Jan 8 09:38:02 2011 -0300 [media] v4l2-fh: add v4l2_fh_is_singular Several drivers need to do something when the first filehandle is opened or the last filehandle is closed. Most implement some use count mechanism, but if they use v4l2_fh, then you can also just check if this is the only filehandle for the device node. A simple helper function can do this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 73cb42068cff419e72456940c713ceb5efa68c2a Author: Hans Verkuil Date: Sat Jan 8 09:36:04 2011 -0300 [media] v4l2-fh: add v4l2_fh_open and v4l2_fh_release helper functions Add two new functions: v4l2_fh_open allocates and initializes a struct v4l2_fh based on a struct file pointer and v4l2_fh_release releases and frees a struct v4l2_fh. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fc5602be7ca5b55174c5d6595089718779b28dfa Author: Hans Verkuil Date: Wed Dec 29 13:36:50 2010 -0300 [media] v4l2-fh: implement v4l2_priority support Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0f62fd6a2fa12d6a63cbb18f9e30b05345f636f6 Author: Hans Verkuil Date: Thu Feb 24 10:42:24 2011 -0300 [media] v4l2: add v4l2_prio_state to v4l2_device and video_device Integrate the v4l2_prio_state into the core, ready for use. One struct v4l2_prio_state is added to v4l2_device and a pointer to a prio state is added to video_device. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 022654930891c7ddfdb1ea34d6c4af9d1096bf91 Author: Hans Verkuil Date: Wed Dec 29 10:05:02 2010 -0300 [media] v4l2_prio: move from v4l2-common to v4l2-dev We are going to move priority handling into the v4l2 core. As a consequence the v4l2_prio helper functions need to be moved into the core videodev module as well to prevent circular dependencies. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8c1476ffc0b820f6ca8cc0b3f50c8a0f57e8d82d Author: Vadim Solomin Date: Sun Mar 6 13:00:38 2011 -0300 [media] saa7134-input: key up events not sent after suspend/resume On my AverMedia AverTV Studio 507, key up events are no longer sent after a suspend-to-disk/resume cycle, resulting in "stuck" keys. Apparently, for key up events to be generated, a certain GPIO pin must be set. Currently it's set in saa7134_input_init1(), but that function is not called on device resume. I suggest that code be moved to __saa7134_ir_start(), which is called both on init and resume. Signed-off-by: Vadim Solomin Signed-off-by: Mauro Carvalho Chehab commit bc4b18c6f536de3733e247b07adcc9ea3f5684dd Author: Dan Carpenter Date: Sun Mar 6 10:41:23 2011 -0300 [media] stv0367: typo in function parameter The CellsCoeffs arrays are [3][6][5] not [2][6][5]. Signed-off-by: Dan Carpenter Cc: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit bf512b2d9c39af31507f485b15b9b40e2a5c499c Author: Dan Carpenter Date: Sun Mar 6 10:40:11 2011 -0300 [media] stv0367: signedness bug in stv0367_get_tuner_freq() We use err to store negative error codes so it should be signed. And if we return an error from stv0367_get_tuner_freq() that needs to be handled properly as well. (param->frequency is a u32). Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit c6384c886dfed806f07ae2f8ba4d3740b57cde9c Author: Daniel Drake Date: Thu Mar 3 16:03:31 2011 -0300 [media] via-camera: Fix OLPC serial check The code that checks the OLPC serial port is never built at the moment, because CONFIG_OLPC_XO_1_5 doesn't exist and probably won't be added. Fix it so that it gets compiled in, only executes on OLPC laptops, and move the check into the probe routine. The compiler is smart enough to eliminate this code when CONFIG_OLPC=n (due to machine_is_olpc() always returning false). Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 4a1cba5151ccddf4a7071fe4950fb699e8b23bf9 Author: Malcolm Priestley Date: Sun Jan 23 18:26:03 2011 -0300 [media] Change to 32 bit and add other remote controls for lme2510 These bubble button remote controls appear to be generic from China. These are the three variants known to be supplied with DM04/QQBOX DVB-S They could well be supplied with other devices from the region. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit f8931f56f51a795e030318b95e4a0f8ac453e35e Author: Malcolm Priestley Date: Sun Jan 23 18:22:45 2011 -0300 [media] DM04/QQBOX Update V1.76 - use 32 bit remote decoding Use 32 bit decoding to add support for more than one variant of remote control. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit 3286dac1ca34b85b069c409414a3e51a9217b159 Author: Malcolm Priestley Date: Sat Feb 12 22:38:47 2011 -0300 [media] DM04 LME2510(C) Sharp BS2F7HZ0194 Firmware Information DM04 LME2510(C) Sharp BS2F7HZ0194 Firmware Information Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit 9d4540c9395f5f01cdd0cf60d230ec8bee165bb8 Author: Malcolm Priestley Date: Sat Feb 12 22:35:08 2011 -0300 [media] v180 - DM04/QQBOX added support for BS2F7HZ0194 versions Old versions of these boxes have the BS2F7HZ0194 tuner module on both the LME2510 and LME2510C. Firmware dvb-usb-lme2510-s0194.fw and/or dvb-usb-lme2510c-s0194.fw files are required. See Documentation/dvb/lmedm04.txt Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit 4fdccdfbb4652a7bbac8adbce7449eb093775118 Author: Christoph Lameter Date: Tue Mar 22 13:35:00 2011 -0500 slub: Add statistics for this_cmpxchg_double failures Add some statistics for debugging. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 2fd66c517d5e98de2528d86e0e62f5069ff99f59 Author: Christoph Lameter Date: Tue Mar 22 13:32:53 2011 -0500 slub: Add missing irq restore for the OOM path OOM path is missing the irq restore in the CONFIG_CMPXCHG_LOCAL case. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 59c2be1e4d42c0d4949cecdeef3f37070a1fbc13 Author: Yehuda Sadeh Date: Mon Mar 21 15:10:11 2011 -0700 rbd: use watch/notify for changes in rbd header Send notifications when we change the rbd header (e.g. create a snapshot) and wait for such notifications. This allows synchronizing the snapshot creation between different rbd clients/rools. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit a40c4f10e3fb96030358e49abd010c1f08446fa3 Author: Yehuda Sadeh Date: Mon Mar 21 15:07:16 2011 -0700 libceph: add lingering request and watch/notify event framework Lingering requests are requests that are sent to the OSD normally but tracked also after we get a successful request. This keeps the OSD connection open and resends the original request if the object moves to another OSD. The OSD can then send notification messages back to us if another client initiates a notify. This framework will be used by RBD so that the client gets notification when a snapshot is created by another node or tool. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 333802e90d3f0366c4a1cb767e2783d2e1df73a8 Author: Mark Brown Date: Tue Mar 22 12:02:33 2011 +0000 ASoC: Support !REGULATOR build for sgtl5000 The regulator is optional depending on board design. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d42efe6bfb4eed8314c8ce3547f21954a4140399 Author: Viresh Kumar Date: Tue Mar 22 17:27:25 2011 +0530 dmaengine/dmatest: Pass timeout via module params When we try to test all channels present on our controller together, some channels of lower priority may be very slow as compared to others. If number of transfers is unlimited, some channels may timeout and will not finish within 3 seconds. Thus, while doing such regress testing we may need to have higher value of timeouts. This patch adds support for passing timeout value via module parameters. Default value is 3 msec, a negative value means max timeout possible. Signed-off-by: Viresh Kumar Signed-off-by: Dan Williams commit 5b9a4f98b2e29fb92a4a54ef12b2e3940f941ed9 Author: Uwe Kleine-König Date: Tue Mar 22 10:35:17 2011 +0100 dma: let IMX_DMA depend on IMX_HAVE_DMA_V1 instead of an explicit list of SoCs As a side effect this makes IMX_DMA selectable on i.MX21 again, because the symbol ARCH_MX21 doesn't exist (MACH_MX21 would have been more correct). Signed-off-by: Uwe Kleine-König Signed-off-by: Dan Williams commit 9298168d16faf939141cddc836b6b9b1ef2a8aac Author: Tony Luck Date: Tue Mar 22 10:54:24 2011 -0700 [IA64] New syscalls for 2.6.39 Four new syscalls: sys_name_to_handle_at sys_open_by_handle_at sys_clock_adjtime sys_syncfs Signed-off-by: Tony Luck commit f741a79e982cf56d7584435bad663553ffe6715f Merge: 73d5a86 e7c0a16 Author: Linus Torvalds Date: Tue Mar 22 10:42:43 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: make fuse_dentry_revalidate() RCU aware fuse: make fuse_permission() RCU aware fuse: wakeup pollers on connection release/abort fuse: reduce size of struct fuse_request commit 73d5a8675f32b8e22e11773b314324316f920192 Merge: e77277d d8aa5ec Author: Linus Torvalds Date: Tue Mar 22 10:41:36 2011 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: xen: update mask_rw_pte after kernel page tables init changes xen: set max_pfn_mapped to the last pfn mapped x86: Cleanup highmap after brk is concluded Fix up trivial onflict (added header file includes) in arch/x86/mm/init_64.c commit e77277dfe28baed73b6fd7c66c3fb44580a3dac1 Merge: 75ea635 9edb240 Author: Linus Torvalds Date: Tue Mar 22 10:06:54 2011 -0700 Merge branch 'next-samsung' of git://git.fluff.org/bjdooks/linux * 'next-samsung' of git://git.fluff.org/bjdooks/linux: ARM: H1940/RX1950: Change default LED triggers ARM: S3C2442: RX1950: Add support for LED blinking ARM: S3C2442: RX1950: Retain LEDs state in suspend ARM: S3C2410: H1940: Fix lcd_power_set function ARM: S3C2410: H1940: Add battery support ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managing ARM: S3C2410: H1940: Make h1940-bluetooth.c compile again ARM: S3C2410: H1940: Add keys device commit 75ea6358bc7d97630a8edc2b89c930de118cf7eb Merge: 14577be 97491ba Author: Linus Torvalds Date: Tue Mar 22 10:05:27 2011 -0700 Merge branch 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux * 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux: i2c-pxa2xx: Don't clear isr bits too early i2c-pxa2xx: Fix register offsets i2c-pxa2xx: pass of_node from platform driver to adapter and publish i2c-pxa2xx: check timeout correctly i2c-pxa2xx: add support for shared IRQ handler i2c-pxa2xx: Add PCI support for PXA I2C controller ARM: pxa2xx: reorganize I2C files i2c-pxa2xx: use dynamic register layout i2c-mxs: set controller to pio queue mode after reset i2c-eg20t: support new device OKI SEMICONDUCTOR ML7213 IOH i2c/busses: Add support for Diolan U2C-12 USB-I2C adapter commit 1106b6997df7d0c0487e21fd9c9dd2ce3d4a52db Author: Jiri Olsa Date: Wed Feb 16 17:35:34 2011 +0100 tracing: Fix set_ftrace_filter probe function display If one or more function probes (like traceon) are enabled, and there's no other function filter, the first probe func is skipped (which one depends on the position in the hash). $ echo sys_open:traceon sys_close:traceon > ./set_ftrace_filter $ cat set_ftrace_filter #### all functions enabled #### sys_close:traceon:unlimited $ The reason was, that in the case of no other function filter, the func_pos was not properly updated before calling t_hash_start. Signed-off-by: Jiri Olsa LKML-Reference: <1297874134-7008-1-git-send-email-jolsa@redhat.com> Signed-off-by: Steven Rostedt commit 7f9e5c48c1078507747434d4c182ab10925bf98a Author: David Dillow Date: Mon Jan 17 02:09:44 2011 +0000 IB: Increase DMA max_segment_size on Mellanox hardware By default, each device is assumed to be able only handle 64 KB chunks during DMA. By giving the segment size a larger value, the block layer will coalesce more S/G entries together for SRP, allowing larger requests with the same sg_tablesize setting. The block layer is the only direct user of it, though a few IOMMU drivers reference it as well for their *_map_sg coalescing code. pci-gart_64 on x86, and a smattering on on sparc, powerpc, and ia64. Since other IB protocols could potentially see larger segments with this, let's check those: - iSER is fine, because you limit your maximum request size to 512 KB, so we'll never overrun the page vector in struct iser_page_vec (128 entries currently). It is independent of the DMA segment size, and handles multi-page segments already. - IPoIB is fine, as it maps each page individually, and doesn't use ib_dma_map_sg(). - RDS appears to do the right thing and has no dependencies on DMA segment size, but I don't claim to have done a complete audit. - NFSoRDMA and 9p are OK -- they do not use ib_dma_map_sg(), so they doesn't care about the coalescing. - Lustre's ko2iblnd does not care about coalescing -- it properly walks the returned sg list. This patch ups the value on Mellanox hardware to 1 GB, which matches reported firmware limits on mlx4. Signed-off-by: David Dillow Signed-off-by: Roland Dreier commit 14577beb8293c187a12d2e78ac6250d5dcec2190 Merge: 09b9cc4 e8c500c Author: Linus Torvalds Date: Tue Mar 22 09:36:23 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Dont define useless label in the !CONFIG_CMPXCHG_LOCAL case slab,rcu: don't assume the size of struct rcu_head slub,rcu: don't assume the size of struct rcu_head slub: automatically reserve bytes at the end of slab Lockless (and preemptless) fastpaths for slub slub: Get rid of slab_free_hook_irq() slub: min_partial needs to be in first cacheline slub: fix ksize() build error slub: fix kmemcheck calls to match ksize() hints Revert "slab: Fix missing DEBUG_SLAB last user" mm: Remove support for kmem_cache_name() commit 09b9cc44c942256026bf7a63fec2155b8f488899 Author: Martin K. Petersen Date: Tue Mar 22 00:27:42 2011 -0400 sd: Fail discard requests when logical block provisioning has been disabled Ensure that we kill discard requests after logical block provisioning has been disabled in sysfs. Signed-off-by: Martin K. Petersen Reported-by: Geert Uytterhoeven Reviewed-by: Jeff Moyer Signed-off-by: Linus Torvalds commit c62b3898636072de4bf9af36b6cd5a920ebfe896 Merge: eddecbb 736561a Author: Linus Torvalds Date: Tue Mar 22 09:25:34 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits) IPVS: Use global mutex in ip_vs_app.c ipvs: fix a typo in __ip_vs_control_init() veth: Fix the byte counters net ipv6: Fix duplicate /proc/sys/net/ipv6/neigh directory entries. macvlan: Fix use after free of struct macvlan_port. net: fix incorrect spelling in drop monitor protocol can: c_can: Do basic c_can configuration _before_ enabling the interrupts net/appletalk: fix atalk_release use after free ipx: fix ipx_release() snmp: SNMP_UPD_PO_STATS_BH() always called from softirq l2tp: fix possible oops on l2tp_eth module unload xfrm: Fix initialize repl field of struct xfrm_state netfilter: ipt_CLUSTERIP: fix buffer overflow netfilter: xtables: fix reentrancy netfilter: ipset: fix checking the type revision at create command netfilter: ipset: fix address ranges at hash:*port* types niu: Rename NIU parent platform device name to fix conflict. r8169: fix a bug in rtl8169_init_phy() bonding: fix a typo in a comment ftmac100: use resource_size() ... commit f47adbb988aa4436135799fd26710bff2c1b1eb6 Author: Paul Mundt Date: Tue Mar 22 22:43:09 2011 +0900 sh: Conver to asm-generic/sizes.h. A trivial conversion for the most part. EDOSK7760 is special, but uses a non-power-of-2-aligned size, so just drop the SZ_xx helper and open-code it for the sake of simplicity. Signed-off-by: Paul Mundt commit 2a03cfbd906dc9bbf5e9a97727cf4ba1889d4829 Author: Paul Mundt Date: Tue Mar 22 21:56:08 2011 +0900 sh: wire up sys_syncfs. Signed-off-by: Paul Mundt commit cbb84c4cc1ad0ab8faaffd899ccc9b14a88c91be Author: Rakib Mullick Date: Tue Mar 22 15:24:54 2011 +0600 x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context When CONFIG_X86_MPPARSE=y and CONFIG_X86_IO_APIC=n, then we get the following warning: arch/x86/kernel/mpparse.c:723: warning: 'check_slot' defined but not used So, put check_slot into CONFIG_X86_IO_APIC context. Its only called from CONFIG_X86_IO_APIC=y context. Signed-off-by: Rakib Mullick LKML-Reference: Signed-off-by: Ingo Molnar commit ee3c35c0827de02de414d08b2ddcbb910c2263ab Author: Lydia Wang Date: Tue Mar 22 16:26:36 2011 +0800 ALSA: hda - VIA: Fix VT1708 can't build up Headphone control issue Since VT1708 didn't support the control of getting connection number, building of headphone control will fail in via_hp_build() function. Signed-off-by: Lydia Wang Cc: Signed-off-by: Takashi Iwai commit 970f630f5adcefb2841338929e209d970001d919 Author: Lydia Wang Date: Tue Mar 22 16:25:56 2011 +0800 ALSA: hda - VIA: Correct stream names for VT1818S Correct stream names of analog playback and capture streams for VT1818S. Signed-off-by: Lydia Wang Signed-off-by: Takashi Iwai commit 0341ccd7557fecafe6a79c55158670cf629d269e Author: Lydia Wang Date: Tue Mar 22 16:25:03 2011 +0800 ALSA: hda - VIA: Fix codec type for VT1708BCE at the right timing Add get_codec_type() in via_new_spec() function to make sure getting correct codec type before building mixer controls. Signed-off-by: Lydia Wang Cc: Signed-off-by: Takashi Iwai commit 169222813eec8403c76394fb7b35ecab98e3c607 Author: Lydia Wang Date: Tue Mar 22 16:24:10 2011 +0800 ALSA: hda - VIA: Fix invalid A-A path volume adjust issue Modify vt_auto_create_analog_input_ctls() function to fix invalid a-a path volume adjust issue for VT1708S, VT1702 and VT1716S codecs. Signed-off-by: Lydia Wang Cc: Signed-off-by: Takashi Iwai commit ab657e0cacc39d88145871c6a3c844597c02d406 Author: Lydia Wang Date: Tue Mar 22 16:23:23 2011 +0800 ALSA: hda - VIA: Add missing support for VT1718S in A-A path Modify mute_aa_path() function to support VT1718S codec. Signed-off-by: Lydia Wang Cc: Signed-off-by: Takashi Iwai commit ce0e5a9e81fbb153ee15ca60246c6722f07fc546 Author: Lydia Wang Date: Tue Mar 22 16:22:37 2011 +0800 ALSA: hda - VIA: Fix independent headphone no sound issue Modify via_independent_hp_put() function to support VT1718S and VT1812 codecs, and fix independent headphone no sound issue. Signed-off-by: Lydia Wang Cc: Signed-off-by: Takashi Iwai commit bff5fbf50bd498c217994bd2d41a53ac3141185a Author: Lydia Wang Date: Tue Mar 22 16:21:38 2011 +0800 ALSA: hda - VIA: Fix stereo mixer recording no sound issue Modify function via_mux_enum_put() to fix stereo mixer recording no sound issue. Signed-off-by: Lydia Wang Cc: Signed-off-by: Takashi Iwai commit a07500ef690fcbec76e879ee2093d7ca69883825 Author: Alexander Strakh Date: Tue Jan 25 18:00:13 2011 -0300 [media] drivers/media/video/tlg2300/pd-video.c: Remove second mutex_unlock in pd_vidioc_s_fmt Error path in file drivers/media/video/tlg2300/pd-video.c: 1. First mutex_unlock on &pd->lock in line 767 (in function that called from line 805) 2. Second in line 806 805 pd_vidioc_s_fmt(pd, &f->fmt.pix); 806 mutex_unlock(&pd->lock); Found by Linux Device Drivers Verification Project Signed-off-by: Alexander Strakh Acked-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit 868e90d55c0eb6f3c5949c2a747714072c3e080a Author: Tejun Heo Date: Mon Jan 24 11:23:15 2011 -0300 [media] radio-wl1273: remove unused wl1273_device->work wl1273_device->work is unused. Remove it along with the spurious flush_scheduled_work() call in wl1273_fm_module_exit(). Signed-off-by: Tejun Heo Cc: Matti Aaltonen Signed-off-by: Mauro Carvalho Chehab commit 7e270941c8f0a11224e383d3d38946451f66fbbf Author: Jesper Juhl Date: Thu Feb 17 17:33:56 2011 -0300 [media] Zarlink zl10036 DVB-S: Fix mem leak in zl10036_attach On Thu, 17 Feb 2011, Matthias Schwarzott wrote: > On Sunday 06 February 2011, Jesper Juhl wrote: > > If the memory allocation to 'state' succeeds but we jump to the 'error' > > label before 'state' is assigned to fe->tuner_priv, then the call to > > 'zl10036_release(fe)' at the 'error:' label will not free 'state', but > > only what was previously assigned to 'tuner_priv', thus leaking the memory > > allocated to 'state'. > > There are may ways to fix this, including assigning the allocated memory > > directly to 'fe->tuner_priv', but I did not go for that since the > > additional pointer derefs are more expensive than the local variable, so I > > just added a 'kfree(state)' call. I guess the call to 'zl10036_release' > > might not even be needed in this case, but I wasn't sure, so I left it in. > > > Yeah, that call to zl10036_release can be completely eleminated. > Another thing is: jumping to the error label only makes sense when memory was > already allocated. So the jump in line 471 can be replaced by "return NULL", > as the other error handling before allocation: > if (NULL == config) { > printk(KERN_ERR "%s: no config specified", __func__); > goto error; > } > > I suggest to improve the patch to clean the code up when changing that. > > But I am fine with commiting this patch also if you do not want to change it. > Thank you for your feedback. It makes a lot of sense. Changing it is not a problem :) How about the updated patch below? If the memory allocation to 'state' succeeds but we jump to the 'error' label before 'state' is assigned to fe->tuner_priv, then the call to 'zl10036_release(fe)' at the 'error:' label will not free 'state', but only what was previously assigned to 'tuner_priv', thus leaking the memory allocated to 'state'. This patch fixes the leak and also does not jump to 'error:' before mem has been allocated but instead just returns. Also some small style cleanups. Signed-off-by: Jesper Juhl Signed-off-by: Matthias Schwarzott Signed-off-by: Mauro Carvalho Chehab commit 35d9f510b67b10338161aba6229d4f55b4000f5b Author: Jiri Slaby Date: Mon Feb 28 06:37:02 2011 -0300 [media] V4L: videobuf, don't use dma addr as physical mem->dma_handle is a dma address obtained by dma_alloc_coherent which needn't be a physical address in presence of IOMMU, as a hardware IOMMU can (and most likely) will return a bus address where physical != bus address. So ensure we are remapping (remap_pfn_range) the right page in __videobuf_mmap_mapper by using virt_to_phys(mem->vaddr) and not mem->dma_handle. While at it, use PFN_DOWN instead of explicit shift. [mchehab@redhat.com: Fix compilation breakage due to the lack of a comma] Signed-off-by: Jiri Slaby Reviewed-by: Konrad Rzeszutek Wilk Signed-off-by: Mauro Carvalho Chehab commit 4093a5c4a3f59cba1a085bbf87b6ffdddc5a443d Author: Laurent Pinchart Date: Wed Feb 23 11:19:17 2011 -0300 [media] uvcvideo: Fix descriptor parsing for video output devices Commit 4057ac6ca9a77c4275b34b5925ab5c99557913b1 V4L/DVB (13505): uvcvideo: Refactor chain scan broke output terminals parsing. Fix it. Signed-off-by: Laurent Pinchart Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 38a66824d96de8aeeb915e6f46f0d3fe55828eb1 Author: Stephan Lachowsky Date: Thu Jan 27 23:04:33 2011 -0300 [media] uvcvideo: Fix uvc_fixup_video_ctrl() format search The scheme used to index format in uvc_fixup_video_ctrl() is not robust: format index is based on descriptor ordering, which does not necessarily match bFormatIndex ordering. Searching for first matching format will prevent uvc_fixup_video_ctrl() from using the wrong format/frame to make adjustments. Signed-off-by: Stephan Lachowsky Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 32b98bf8752c5483481f77d48934aba26c967fcd Author: Dave Airlie Date: Tue Dec 21 01:41:17 2010 +0000 fbcon: fix situation where fbcon gets deinitialised and can't reinit. Situation as follow: 2 GPUs + vesafb + kms. GPU 1 is primary, vesafb binds to it as fb0 radeon loads GPU 0 loads as fb1 GPU 1 loads, vesafb gets kicked off which causes fb0 to unbind console, which causes the dummy console to rebind. this means fbcon_deinit gets called, which calls fbcon_exit since the console isn't bound anymore and we set fbcon_has_exited. GPU 1 creates a new fb0 which is primary and we want to be console. fbcon_fb_registered gets called sets the primary up and calls set_con2fb_map, however as fbcon_has_exited is set nothing further ever happens. This patch bypasses the fbcon_has_exited and checks if the console is unbound, if its unbound it calls the fbcon_takeover which calls the vt layer to call the fbcon_startup method and everthing works. Signed-off-by: Dave Airlie Signed-off-by: Paul Mundt commit 4295f9bf74a885da390abc49a3b42a011c1bb890 Author: Heiko Schocher Date: Wed Jan 26 07:21:30 2011 +0000 video, sm501: add OF binding to support SM501 - add binding to OF, compatible name "smi,sm501" Signed-off-by: Heiko Schocher cc: linux-fbdev@vger.kernel.org cc: devicetree-discuss@ozlabs.org cc: Ben Dooks cc: Vincent Sanders cc: Samuel Ortiz cc: linux-kernel@vger.kernel.org cc: Randy Dunlap cc: Paul Mundt Signed-off-by: Paul Mundt commit e6a049807105decf5aa7f0c510f5e5ec96c3548e Author: Heiko Schocher Date: Wed Jan 26 07:21:22 2011 +0000 video, sm501: add edid and commandline support - add commandline options: sm501fb.mode: Specify resolution as "x[-][@]" sm501fb.bpp: Specify bit-per-pixel if not specified mode - Add support for encoding display mode information in the device tree using verbatim EDID block. If the "edid" entry in the "smi,sm501" node is present, the driver will build mode database using EDID data and allow setting the display modes from this database. Signed-off-by: Heiko Schocher cc: linux-fbdev@vger.kernel.org cc: devicetree-discuss@ozlabs.org cc: Ben Dooks cc: Vincent Sanders cc: Samuel Ortiz cc: linux-kernel@vger.kernel.org cc: Randy Dunlap cc: Paul Mundt Signed-off-by: Paul Mundt commit bf5f0019046d596d613caf74722ba4994e153899 Author: Heiko Schocher Date: Mon Jan 24 09:57:20 2011 +0000 video, sm501: add I/O functions for use on powerpc - add read/write functions for using this driver also on powerpc plattforms Signed-off-by: Heiko Schocher cc: linux-fbdev@vger.kernel.org cc: devicetree-discuss@ozlabs.org cc: Ben Dooks cc: Vincent Sanders cc: Samuel Ortiz cc: linux-kernel@vger.kernel.org cc: Randy Dunlap cc: Paul Mundt Acked-by: Samuel Ortiz Signed-off-by: Paul Mundt commit 04024b937a6e9b7d4320b5853557cea3930d528c Author: Julian Anastasov Date: Sat Mar 19 12:13:54 2011 +0000 ipv4: optimize route adding on secondary promotion Optimize the calling of fib_add_ifaddr for all secondary addresses after the promoted one to start from their place, not from the new place of the promoted secondary. It will save some CPU cycles because we are sure the promoted secondary was first for the subnet and all next secondaries do not change their place. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit 2d230e2b2c3111cf4a11619f60dcd158ae84e3ab Author: Julian Anastasov Date: Sat Mar 19 12:13:52 2011 +0000 ipv4: remove the routes on secondary promotion The secondary address promotion relies on fib_sync_down_addr to remove all routes created for the secondary addresses when the old primary address is deleted. It does not happen for cases when the primary address is also in another subnet. Fix that by deleting local and broadcast routes for all secondaries while they are on device list and by faking that all addresses from this subnet are to be deleted. It relies on fib_del_ifaddr being able to ignore the IPs from the concerned subnet while checking for duplication. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit e6abbaa2725a43cf5d26c4c2a5dc6c0f6029ea19 Author: Julian Anastasov Date: Sat Mar 19 12:13:49 2011 +0000 ipv4: fix route deletion for IPs on many subnets Alex Sidorenko reported for problems with local routes left after IP addresses are deleted. It happens when same IPs are used in more than one subnet for the device. Fix fib_del_ifaddr to restrict the checks for duplicate local and broadcast addresses only to the IFAs that use our primary IFA or another primary IFA with same address. And we expect the prefsrc to be matched when the routes are deleted because it is possible they to differ only by prefsrc. This patch prevents local and broadcast routes to be leaked until their primary IP is deleted finally from the box. As the secondary address promotion needs to delete the routes for all secondaries that used the old primary IFA, add option to ignore these secondaries from the checks and to assume they are already deleted, so that we can safely delete the route while these IFAs are still on the device list. Reported-by: Alex Sidorenko Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit 74cb3c108bc0f599a4eb40980db8580cfba725c9 Author: Julian Anastasov Date: Sat Mar 19 12:13:46 2011 +0000 ipv4: match prefsrc when deleting routes fib_table_delete forgets to match the routes by prefsrc. Callers can specify known IP in fc_prefsrc and we should remove the exact route. This is needed for cases when same local or broadcast addresses are used in different subnets and the routes differ only in prefsrc. All callers that do not provide fc_prefsrc will ignore the route prefsrc as before and will delete the first occurence. That is how the ip route del default magic works. Current callers are: - ip_rt_ioctl where rtentry_to_fib_config provides fc_prefsrc only when the provided device name matches IP label with colon. - inet_rtm_delroute where RTA_PREFSRC is optional too - fib_magic which deals with routes when deleting addresses and where the fc_prefsrc is always set with the primary IP for the concerned IFA. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit 3c0f3c605b2572c740f66ea39fe2d125399b20aa Author: Marc Zyngier Date: Fri Mar 18 03:53:58 2011 +0000 NET: smsc95xx: don't use stack for async writes to the device The set_multicast operation performs asynchronous writes to the device, with some addresses pointing to the stack. Bad things may happen, and this is trapped CONFIG_DMA_API_DEBUG: [ 5.237762] WARNING: at /build/buildd/linux-linaro-omap-2.6.38/lib/dma-debug.c:867 check_for_stack+0xd4/0x100() [ 5.237792] ehci-omap ehci-omap.0: DMA-API: device driver maps memory fromstack [addr=d9c77dec] [ 5.237792] Modules linked in: smsc95xx(+) usbnet twl6030_usb twl4030_pwrbutton leds_gpio omap_wdt omap2_mcspi [ 5.237854] [] (unwind_backtrace+0x0/0xf8) from [] (warn_slowpath_common+0x54/0x64) [ 5.237884] [] (warn_slowpath_common+0x54/0x64) from [] (warn_slowpath_fmt+0x30/0x40) [ 5.237915] [] (warn_slowpath_fmt+0x30/0x40) from [] (check_for_stack+0xd4/0x100) [ 5.237915] [] (check_for_stack+0xd4/0x100) from [] (debug_dma_map_page+0xb4/0xdc) [ 5.237976] [] (debug_dma_map_page+0xb4/0xdc) from [] (map_urb_for_dma+0x26c/0x304) [ 5.237976] [] (map_urb_for_dma+0x26c/0x304) from [] (usb_hcd_submit_urb+0x78/0x19c) [ 5.238037] [] (usb_hcd_submit_urb+0x78/0x19c) from [] (smsc95xx_write_reg_async+0xb4/0x130 [smsc95xx]) [ 5.238067] [] (smsc95xx_write_reg_async+0xb4/0x130 [smsc95xx]) from [] (smsc95xx_set_multicast+0xfc/0x148 [smsc95xx]) [ 5.238098] [] (smsc95xx_set_multicast+0xfc/0x148 [smsc95xx]) from [] (smsc95xx_reset+0x2f8/0x68c [smsc95xx]) [ 5.238128] [] (smsc95xx_reset+0x2f8/0x68c [smsc95xx]) from [] (smsc95xx_bind+0xcc/0x188 [smsc95xx]) [ 5.238159] [] (smsc95xx_bind+0xcc/0x188 [smsc95xx]) from [] (usbnet_probe+0x204/0x4c4 [usbnet]) [ 5.238220] [] (usbnet_probe+0x204/0x4c4 [usbnet]) from [] (usb_probe_interface+0xe4/0x1c4) [ 5.238250] [] (usb_probe_interface+0xe4/0x1c4) from [] (really_probe+0x64/0x160) [ 5.238250] [] (really_probe+0x64/0x160) from [] (driver_probe_device+0x48/0x60) [ 5.238281] [] (driver_probe_device+0x48/0x60) from [] (__driver_attach+0x8c/0x90) [ 5.238311] [] (__driver_attach+0x8c/0x90) from [] (bus_for_each_dev+0x50/0x7c) [ 5.238311] [] (bus_for_each_dev+0x50/0x7c) from [] (bus_add_driver+0x190/0x250) [ 5.238311] [] (bus_add_driver+0x190/0x250) from [] (driver_register+0x78/0x13c) [ 5.238433] [] (driver_register+0x78/0x13c) from [] (usb_register_driver+0x78/0x13c) [ 5.238464] [] (usb_register_driver+0x78/0x13c) from [] (do_one_initcall+0x34/0x188) [ 5.238494] [] (do_one_initcall+0x34/0x188) from [] (sys_init_module+0xb0/0x1c0) [ 5.238525] [] (sys_init_module+0xb0/0x1c0) from [] (ret_fast_syscall+0x0/0x30) Move the two offenders to the private structure which is kmalloc-ed, and thus safe. Signed-off-by: Marc Zyngier Cc: Steve Glendinning Signed-off-by: David S. Miller commit 27660515a21bf913e3208ded3f27abd0529fae0e Author: MichaÅ‚ MirosÅ‚aw Date: Fri Mar 18 16:56:34 2011 +0000 net: implement dev_disable_lro() hw_features compatibility Implement compatibility with new hw_features for dev_disable_lro(). This is a transition path - dev_disable_lro() should be later integrated into netdev_fix_features() after all drivers are converted. Signed-off-by: MichaÅ‚ MirosÅ‚aw Signed-off-by: David S. Miller commit 5db2c3ba4de8489a7a064bac463bb8af2c7a1ae4 Author: Pawel Osciak Date: Sun Mar 20 19:26:41 2011 -0300 [media] vb2: Handle return value from start_streaming callback Fix vb2 not handling return value from start_streaming() callback. Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit 4ffabdb35ad59fdb8cb6ad3ff4733694ff0dfc35 Author: Pawel Osciak Date: Sun Mar 20 18:17:34 2011 -0300 [media] vb2: vb2_poll() fix return values for file I/O mode poll() should be returning poll-specific error values, not E* errors. Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit 950720840f392075b19d902e5ca7806a17a562cb Author: Pawel Osciak Date: Sun Mar 13 15:23:32 2011 -0300 [media] Update Pawel Osciak's e-mail address Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit f0e3b646ccce66c9e878966227ce8415d3c11c2a Author: Pawel Osciak Date: Sun Mar 13 15:20:22 2011 -0300 [media] Make 2.6.39 not 2.6.38 the version when Multi-planar API was added Multi-planar API was added to 2.6.39 version of Video for Linux 2 API. Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit 6ed9d56086acb3bb4ec003ff6d2f54313774d72b Author: Antti Palosaari Date: Sat Mar 19 18:02:22 2011 -0300 [media] af9013: reimplement firmware download Split FW download packages smarter way and bug free. Implementation is based of Andrea Merello's example he provided for tda18218 driver. Count remaining FW bytes down in loop instead of division and modulo combination used earlier. Thanks to: Andrea Merello Signed-off-by: Antti Palosaari Cc: Andrea Merello Signed-off-by: Mauro Carvalho Chehab commit 109a29900a36b2b1e7b7f83a561c6af7e343461f Author: Antti Palosaari Date: Sat Mar 19 17:18:18 2011 -0300 [media] af9013: download FW earlier in attach() Quick test shows that FW must be running before other checks so make it happen earlier. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 582e565caeaccf145e2256b84d4fde827fede72e Author: Antti Palosaari Date: Sat Mar 19 16:51:43 2011 -0300 [media] af9015: reimplement firmware download Split FW download packages smarter way and bug free. Implementation is based of Andrea Merello's example he provided for tda18218 driver. Count remaining FW bytes down in loop instead of division and modulo combination used earlier. Thanks-to: Andrea Merello Signed-off-by: Antti Palosaari Cc: Andrea Merello Signed-off-by: Mauro Carvalho Chehab commit 04599c2b1ff1eece19b7abaacd97266b8a6b79f2 Author: Antti Palosaari Date: Sat Mar 19 14:25:36 2011 -0300 [media] af9015: map remote for TerraTec Cinergy T Stick RC Map rc-terratec-slim-2 for TerraTec Cinergy T Stick RC device. Signed-off-by: Antti Palosaari Cc: Martin Groszhauser Cc: TerraTux Signed-off-by: Mauro Carvalho Chehab commit 638b53f80ceb5a57b5c9b6c4a078f605a8cc2d71 Author: Antti Palosaari Date: Sat Mar 19 14:11:55 2011 -0300 [media] add TerraTec remote Remote used for TerraTec Cinergy T Stick RC. Keytable from Martin Groszhauser Signed-off-by: Antti Palosaari Cc: Martin Groszhauser Cc: TerraTux Signed-off-by: Mauro Carvalho Chehab commit 1e8750c2ac2bcbf2b084d3fa77cbb5eef33b3e7f Author: Antti Palosaari Date: Fri Mar 18 19:36:42 2011 -0300 [media] af9015: small RC change Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit c1e13971b19324305b35fafc080b527465214d3c Author: Ian Armstrong Date: Fri Mar 18 19:23:05 2011 -0300 [media] af9015: enhance RC Patch from Ian Armstrong. I've encountered a couple of problems with the current af9015 driver as supplied with the 2.6.37 kernel, that the attached patch appears to fix. (I've generated this patch against the current v4l-dvb git). Some key-presses are lost. A key-press is only generated upon 'valid' data (buf[14] == (u8) ~buf[15]), but the buffer is wiped before this check. Sometimes the 15th byte has not been set at the time of read, so the data isn't valid & ignored. On the next poll the 15th byte has been set, but the rest of the data was wiped previously, so the data is still invalid & the key is lost. Weird repeat error, where an old key press is sometimes repeated in error. ie. button sequence '1 (pause) 2 (pause) 3 (pause) 4' generates output like '1 (pause) 2 (pause) 23 (pause) 4'. The current driver zeroes the data for the key pushed, but sometimes this data is already zero but with other bytes set suggesting a repeat code. This results in the last key being incorrectly repeated. This patch attempts to reduce the risk of a missed key-press & also stop the random repeat of an old key-press when a new key is pressed. Signed-off-by: Ian Armstrong Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit ce5b2acce60405b938d1f1f994024cde4e2cdd7e Author: Jean-François Moine Date: Mon Mar 14 08:49:28 2011 -0300 [media] gspca - nw80x: New subdriver for Divio based webcams [mchehab@redhat.com: Fix a few CodingStyle issues] Tested-by: Kjell Claesson Tested-by: Hans de Goede Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 59929cefa5f573178df3c4abfb36d55f7b33f214 Author: Jean-François Moine Date: Mon Mar 14 05:33:01 2011 -0300 [media] gspca - main: Cleanup source - change copyright and erroneous comment - small code optimization - have constant the device template Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 58c92d37e7d34433cfbc3989bec20e48fba0799e Author: Jean-François Moine Date: Sun Mar 13 16:36:49 2011 -0300 [media] gspca - ov519: Add exposure and autogain controls for ov2610/2610ae Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7d47b789ceb456d90a3ace522dbcb2a94d2693ca Author: Jean-François Moine Date: Sun Mar 13 16:17:08 2011 -0300 [media] gspca - jeilinj / stv06xx: Fix some warnings Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 75b79ffcc37c6bd05fa895f85d2d6426a9e4c3f1 Author: Jean-François Moine Date: Sun Mar 13 16:07:25 2011 -0300 [media] gspca - sonixb: Clenup source - update copyright and module author - set the sensor table as constant Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f0baad866b3c71d448747b06b1cf6b3493d2f7ce Author: Hans de Goede Date: Sun Mar 13 16:05:55 2011 -0300 [media] gspca - sonixb: Update inactive flags to reflect autogain setting Signed-off-by: Hans de Goede Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f51a8caafedfc643b3dfa2ffdfb02da31a13db3f Author: Jean-François Moine Date: Sun Mar 13 15:04:11 2011 -0300 [media] gspca - sonixb: Use the new control mechanism Acked-by: Hans de Goede Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit fa85bb6f9b101d92940f54c7ab1b8557aaa35a6d Author: Jean-François Moine Date: Sun Mar 13 14:38:46 2011 -0300 [media] gspca: New file autogain_functions.h This file contains functions for the auto gain. It must be used with the new control mechanism. Acked-by: Hans de Goede Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 4e5144eef436720b08f7bdb1beba4960af23c737 Author: Jean-François Moine Date: Sat Feb 26 13:56:20 2011 -0300 [media] gspca - zc3xx: Cleanup source - change some comments and copyright - change an erroneous register name - change hdcs2020b to hdcs2020 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 170960fa9a4688299350ea356e4e5a3e76d15711 Author: Jean-François Moine Date: Sat Feb 26 08:04:03 2011 -0300 [media] gspca - zc3xx: Remove double definition Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit c2f644aeeba3a5178767e757e93151959f037db1 Author: Hans de Goede Date: Sun Mar 13 12:26:14 2011 -0300 [media] gspca_cpia1: Add support for button Not only the qx3 microscope has a button, but some cameras too. Tested with the Trust sp@cecam 100 (and with a creative and ezcam without button). Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit c05df8b32ab4b8103f8c20cbd3ab7191be613b68 Author: Xiaochen Wang Date: Sun Mar 13 22:32:53 2011 -0300 [media] pvrusb2: check kmalloc return value allows the driver to proceed and initialize the below two values even if the kmalloc() fails. hdw->std_info_enum.def.type_enum.value_names hdw->std_info_enum.def.type_enum.count Signed-off-by: Xiaochen Wang Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 228ee5928b5d4192a23cda3fdf755a956516c13e Author: Mike Isely Date: Sun Mar 13 22:18:23 2011 -0300 [media] pvrusb2: Remove dead code This was caught via a compiler warning. Amazingly enough this bit of benign dreck dates all the way back to 2008. Signed-off-by: Mauro Carvalho Chehab commit 43823c02245a445b5669d43b1ec07b6d8ae710f5 Author: Mike Isely Date: Sun Mar 13 20:37:11 2011 -0300 [media] pvrusb2: Implement support for Terratec Grabster AV400 Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 34fd68bc03c8d656f991bd4f1646ec773179521b Author: Hans Verkuil Date: Fri Mar 11 18:18:54 2011 -0300 [media] Fix 'ID nv12mt already defined' error DocBook validation fix. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6e5b55fbdab3845bfb328f986f58e85d43cee59e Author: Hans Verkuil Date: Fri Mar 11 16:25:23 2011 -0300 [media] V4L DocBook: update V4L2 version Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 665bf368fdc1e7afc9616eda128fe83d6053d5bc Author: Hans Verkuil Date: Fri Mar 11 16:22:21 2011 -0300 [media] V4L doc fixes The xmlto validation produced a number of errors that are now fixed. Sadly, the DocBook/Makefile still adds --skip-validation to xmlto, so these errors are missed during a normal compile. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 941f896071c5c9120c8473c77246beaf36155247 Author: Andrzej Pietrasiewicz Date: Wed Mar 2 09:12:13 2011 -0300 [media] v4l2: vb2-dma-sg: fix potential security hole Memory allocated by alloc_page() function might contain some potentially important data from other system processes. The patch adds a flag to zero the allocated page before giving it to videobuf2 (and then to userspace). Signed-off-by: Andrzej Pietrasiewicz Signed-off-by: Kyungmin Park Signed-off-by: Marek Szyprowski Signed-off-by: Mauro Carvalho Chehab commit 72f1fc33a76a115e8c67f7b052bd7f6e129cda50 Author: Marek Szyprowski Date: Thu Mar 10 09:10:49 2011 -0300 [media] v4l2: vb2: simplify __vb2_queue_free function __vb2_queue_free function doesn't really return anything useful. This patch removes support for the return value to simplify the code. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 31901a078af29c33c736dcbf815656920e904632 Author: Marek Szyprowski Date: Fri Mar 11 06:07:27 2011 -0300 [media] v4l2: vb2: one more fix for REQBUFS() Return immediately if the target number of buffers is the same as the current one and memory access type doesn't change. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit a9bb36aa0d6547aa0ab3d5cfde08e8651bd460bc Author: Andrzej Pietrasiewicz Date: Fri Jan 28 09:42:51 2011 -0300 [media] v4l2: vb2-dma-sg: fix memory leak This patch fixes two minor memory leaks in videobuf2-dma-sg module. They might happen only in case some other operations (like memory allocation) failed. Signed-off-by: Andrzej Pietrasiewicz Signed-off-by: Kyungmin Park Signed-off-by: Marek Szyprowski Signed-off-by: Mauro Carvalho Chehab commit 29e3fbd8edb31549fa8302c185bd0b915a43d8b8 Author: Marek Szyprowski Date: Wed Mar 9 14:03:24 2011 -0300 [media] v4l2: vb2: fix queue reallocation and REQBUFS(0) case This patch fixes 2 minor bugs in videobuf2 core: 1. Queue should be reallocated if one change the memory access method without changing the number of buffers. 2. In case of REQBUFS(0), the request should not be passed to the driver. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit bd08a0cd5f546916a9454ae2c35756ed77957458 Author: Kamil Debski Date: Fri Mar 11 06:16:22 2011 -0300 [media] v4l: Documentation for the NV12MT format Added documentation for V4L2_PIX_FMT_NV12MT format. This is a YUV 4:2:0 format with macro block size of 64x32 and specific order of macro blocks in the memory. Signed-off-by: Kamil Debski Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 91707b8b27a785c42949ba55b65f084027962afa Author: Sylwester Nawrocki Date: Sat Jan 15 01:17:42 2011 -0300 [media] s5p-fimc: Fix G_FMT ioctl handler Use pix_mp member of struct v4l2_format to return a format description rather than pix. Also fill in the plane_fmt array. This is a missing bit of conversion to the multiplanar API. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 1e00469599b5841f5b02c436b9958073a0ad576c Author: Sylwester Nawrocki Date: Wed Feb 23 08:17:57 2011 -0300 [media] s5p-fimc: Use dynamic debug Use pr_debug instead of printk so it is possible to control debug traces at runtime. E.g. to enable debug trace in file fimc-core.c use command: echo -n 'file fimc-core.c +p' > /sys/kernel/debug/dynamic_debug/control or echo -n 'file fimc-core.c -p' > /sys/kernel/debug/dynamic_debug/control to disable. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit e0eec9af8bf599642f2730ed207296a92e6204aa Author: Sylwester Nawrocki Date: Mon Feb 21 12:09:01 2011 -0300 [media] s5p-fimc: Add a platform data entry for MIPI-CSI data alignment Allow the MIPI-CSI data alignment to be defined in the board setup as it may be different across various camera sensors. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 117182d18399a956719be94d3e6e17aad9210cda Author: Sylwester Nawrocki Date: Mon Feb 28 11:12:19 2011 -0300 [media] s5p-fimc: Allow defining number of sensors at runtime Add num_clients field to struct s5p_fimc_isp_info to define exactly size of clients array which simplifies a bit the sensors management. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 4ecbf5d1d2bb7d1e3882de79e512c1a0a2816581 Author: Sylwester Nawrocki Date: Wed Feb 23 08:24:33 2011 -0300 [media] s5p-fimc: Prevent hanging on device close and fix the locking Rework the locking in m2m driver to assure proper operation on SMP systems. When job_abort or stop_streaming was called to immediately shutdown a memory-to-memory transaction video buffers scheduled for processing were never returned to vb2 and v4l2_m2m_job_finish was not called which led to hanging. Correct this and also return the unprocessed buffers to vb2 marking them as erroneous, in case the end of frame interrupt do not occur. Reported-by: Sewoon Park Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit a0f8caefaf3295721ef00415c7d63ec10af253ab Author: Sylwester Nawrocki Date: Fri Feb 11 12:33:06 2011 -0300 [media] s5p-fimc: Prevent oops when i2c adapter is not available Prevent invalid pointer dereference on error path. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 8ec737ffccd7fab629e28427b4d0581ce62ffedd Author: Sungchun Kang Date: Mon Feb 7 15:59:46 2011 -0300 [media] s5p-fimc: fix ISR and buffer handling for fimc-capture In some cases fimc H/W did not stop although there were no output buffers available. So the capture deactivation interrupt routine is modified and the state of ST_CAPT_RUN is cleared only in the LAST-IRQ call. After LAST-IRQ is generated, H/W pointer will be skipped by 1 frame. (reference by user manual) So, S/W pointer should be increased too. Reviewed-by Jonghun Han Signed-off-by: Sungchun Kang Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab commit 4174ebf5ebd7a09589ff8ff3bc3246ea0a9bd356 Author: Abylay Ospan Date: Sun Jan 2 09:15:00 2011 -0300 [media] Force xc5000 firmware loading for NetUP Dual DVB-T/C CI RF card Two xc5000 tuners connected to same i2c bus. Experiments shows that situation when one tuner is not initialized while other is tuned to channel causes TS errors. Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 8af81ddb12cf34e2f6eab7e130f1e55e1911ab8f Author: Abylay Ospan Date: Sun Jan 2 09:14:00 2011 -0300 [media] Fix CI code for NetUP Dual DVB-T/C CI RF card CI reset takes several seconds on some CAM, so there is no need to lock mutex all that time. Also we need not to preserve CI's reset bits in CIBUSCTRL register, they are handled automatically by FPGA. Set it to 0 explicitly in order to not reset wrong CAM. Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 78db66e5b2b4ef48eeede17a7159cb0622c7f03d Author: Abylay Ospan Date: Sun Jan 2 09:12:00 2011 -0300 [media] stv0367: implement uncorrected blocks counter Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 01a475df3d178d9ace345cc81173537970cf93e2 Author: Abylay Ospan Date: Sun Jan 2 09:11:00 2011 -0300 [media] stv0367: change default value for AGC register Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit d164460f897e2ae8c48ca28c763bb1233d180e7e Author: Abylay Ospan Date: Sun Jan 2 09:10:00 2011 -0300 [media] cx23885: Altera FPGA CI interface reworked It decreases I2C traffic. Signed-off-by: Abylay Ospan Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 1039752353f1308bcd594a79196f60a22d45975d Author: Mauro Carvalho Chehab Date: Fri Mar 11 17:00:01 2011 -0300 [media] cpia2: Fix some gcc 4.6 warnings when debug is disabled cpia2_core.c:529:14: warning: variable 'dir' set but not used [-Wunused-but-set-variable] cpia2_core.c:526:5: warning: variable 'block_index' set but not used [-Wunused-but-set-variable] Signed-off-by: Mauro Carvalho Chehab commit 972d724caf8b6c461b585c800d6460a12c098a5e Author: Mauro Carvalho Chehab Date: Fri Mar 11 16:51:18 2011 -0300 [media] several drivers: Fix a few gcc 4.6 warnings au0828-dvb.c:99:6: warning: variable 'ptr' set but not used [-Wunused-but-set-variable] au0828-video.c:1180:25: warning: variable 'maxheight' set but not used [-Wunused-but-set-variable] au0828-video.c:1180:15: warning: variable 'maxwidth' set but not used [-Wunused-but-set-variable] bttv-input.c:196:16: warning: variable 'current_jiffies' set but not used [-Wunused-but-set-variable] Those variables are not used at all, so just remove them. Cc: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit fa9448d9bdbae42bb10545f6fcfc980f38f53aa8 Author: Hans Verkuil Date: Sun Mar 6 09:49:37 2011 -0300 [media] altera-ci.h: add missing inline Functions defined in a header should be static inline. This prevents compile warnings like: 'altera_ci_tuner_reset' defined but not used (Actually appeared in the media backwards compatibility build). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d6972cc8a35514a518ef9c9f608327851cd2e856 Author: Hans Verkuil Date: Sun Mar 6 09:31:00 2011 -0300 [media] cx88-alsa: fix compiler warning drivers/media/video/cx88/cx88-alsa.c: In function 'cx88_audio_initdev': drivers/media/video/cx88/cx88-alsa.c:881:20: warning: 'core' may be used uninitialized in this function The compiler doesn't understand that snd_cx88_create fills in the core pointer. So just initialize it to NULL. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cfa746b39c2db17f2fde301e347324ac89fc5ea9 Author: Hans Verkuil Date: Sun Mar 6 09:30:02 2011 -0300 [media] fmdrv_common.c: fix compiler warning drivers/media/radio/wl128x/fmdrv_common.c: In function 'recv_tasklet': drivers/media/radio/wl128x/fmdrv_common.c:274:4: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int' The result of sizeof() should be printed with %zu. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3920d6b34d7f6d4e81773b6bbd93d53c167b048f Author: Hans Verkuil Date: Sun Mar 6 09:27:44 2011 -0300 [media] altera-ci.c: fix compiler warnings drivers/media/video/cx23885/altera-ci.c: In function 'altera_hw_filt_init': drivers/media/video/cx23885/altera-ci.c:671:2: warning: cast from pointer to integer of different size drivers/media/video/cx23885/altera-ci.c: In function 'altera_ci_init': drivers/media/video/cx23885/altera-ci.c:739:2: warning: cast from pointer to integer of different size Use %p instead of 0x%x to print addresses. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fb661a78699ad34c385a014fe0d17226234f8496 Author: Hans Verkuil Date: Sun Mar 6 09:26:24 2011 -0300 [media] stv0367.c: fix compiler warning drivers/media/dvb/frontends/stv0367.c: In function 'stv0367ter_lock_algo': drivers/media/dvb/frontends/stv0367.c:1315:2: warning: cast from pointer to integer of different size Use %p to print addresses instead of 0x%x. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit aa40d194975e23ba7a55936c7b5dae4e964461b5 Author: Hans Verkuil Date: Sun Mar 6 09:24:32 2011 -0300 [media] tuner-xc2028.c: fix compile warning drivers/media/common/tuners/tuner-xc2028.c: In function 'generic_set_freq': drivers/media/common/tuners/tuner-xc2028.c:936:15: warning: comparison between 'enum tuner_mode' and 'enum v4l2_tuner_type' Argument type was enum tuner_mode, but should have been enum v4l2_tuner_type. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e83dd485ed04b21215c1283042e8d4712ab1a675 Author: Sakari Ailus Date: Mon Mar 7 14:20:52 2011 -0300 [media] omap3isp: Add documentation Add documentation on the OMAP 3 ISP driver. Document the subdevs, V4L2 events and private IOCTLs the driver implements Signed-off-by: Sakari Ailus Signed-off-by: David Cohen Signed-off-by: Mauro Carvalho Chehab commit 474966ee01cc877e28abed3ada5b48a963c58695 Author: Laurent Pinchart Date: Sat Mar 5 17:14:33 2011 -0300 [media] media: Pick a free ioctls range Pick an unused range of ioctls in Documentation/ioctl/ioctl-number.txt and use it for the MEDIA_IOC_* ioctls. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 4b0ec19e02fabdd09fc2f4754304894bbefb3f45 Author: Laurent Pinchart Date: Thu Mar 3 10:05:22 2011 -0300 [media] omap3isp: Add set performance callback in isp platform data Replace the omap_pm_set_min_bus_tput() with a callback to board code. This makes the omap3isp driver compilable as a module, and lets board code manage OMAP PM details depending on board requirements. Signed-off-by: Stanimir Varbanov Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 7e8970e1d5ae9237d00909599e70f85fce1fc489 Author: Laurent Pinchart Date: Sat Feb 12 18:05:06 2011 -0300 [media] omap3isp: Kconfig and Makefile Add the OMAP3 ISP driver to the kernel build system. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 68e342b3068cae62f3378cb4a1d385734ea52784 Author: David Cohen Date: Sat Feb 12 18:05:06 2011 -0300 [media] omap3isp: Statistics The OMAP3 ISP statistics entities compute histogram and H3A statistics information from capture images. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Signed-off-by: David Cohen Signed-off-by: Stanimir Varbanov Signed-off-by: Vimarsh Zutshi Signed-off-by: Tuukka Toivonen Signed-off-by: Sergio Aguirre Signed-off-by: Antti Koskipaa Signed-off-by: Ivan T. Ivanov Signed-off-by: RaniSuneela Signed-off-by: Atanas Filipov Signed-off-by: Gjorgji Rosikopulos Signed-off-by: Hiroshi DOYU Signed-off-by: Nayden Kanchev Signed-off-by: Phil Carmody Signed-off-by: Artem Bityutskiy Signed-off-by: Dominic Curran Signed-off-by: Ilkka Myllyperkio Signed-off-by: Pallavi Kulkarni Signed-off-by: Vaibhav Hiremath Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit de1135d44f4f25bee5a22d92e7cf2de64ded0dca Author: Laurent Pinchart Date: Sat Feb 12 18:05:06 2011 -0300 [media] omap3isp: CCDC, preview engine and resizer The OMAP3 ISP CCDC, preview engine and resizer entities perform image processing and scaling. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Signed-off-by: David Cohen Signed-off-by: Stanimir Varbanov Signed-off-by: Vimarsh Zutshi Signed-off-by: Tuukka Toivonen Signed-off-by: Sergio Aguirre Signed-off-by: Antti Koskipaa Signed-off-by: Ivan T. Ivanov Signed-off-by: RaniSuneela Signed-off-by: Atanas Filipov Signed-off-by: Gjorgji Rosikopulos Signed-off-by: Hiroshi DOYU Signed-off-by: Nayden Kanchev Signed-off-by: Phil Carmody Signed-off-by: Artem Bityutskiy Signed-off-by: Dominic Curran Signed-off-by: Ilkka Myllyperkio Signed-off-by: Pallavi Kulkarni Signed-off-by: Vaibhav Hiremath Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 121e9f1c4c49c76aac2425e3a9baef70f73f50a4 Author: Laurent Pinchart Date: Sat Feb 12 18:05:06 2011 -0300 [media] omap3isp: CCP2/CSI2 receivers The OMAP3 ISP CCP2 and CSI2 receivers provide an interface to connect serial MIPI sensors to the device. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Signed-off-by: David Cohen Signed-off-by: Stanimir Varbanov Signed-off-by: Vimarsh Zutshi Signed-off-by: Tuukka Toivonen Signed-off-by: Sergio Aguirre Signed-off-by: Antti Koskipaa Signed-off-by: Ivan T. Ivanov Signed-off-by: RaniSuneela Signed-off-by: Atanas Filipov Signed-off-by: Gjorgji Rosikopulos Signed-off-by: Hiroshi DOYU Signed-off-by: Nayden Kanchev Signed-off-by: Phil Carmody Signed-off-by: Artem Bityutskiy Signed-off-by: Dominic Curran Signed-off-by: Ilkka Myllyperkio Signed-off-by: Pallavi Kulkarni Signed-off-by: Vaibhav Hiremath Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ad614acb7eca429891313f57bafbe5b3924a5aae Author: Laurent Pinchart Date: Sat Feb 12 18:05:06 2011 -0300 [media] omap3isp: Video devices and buffers queue The OMAP3 ISP video devices and buffers queue modules implement the V4L2 API on all the ISP video nodes. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Signed-off-by: David Cohen Signed-off-by: Stanimir Varbanov Signed-off-by: Vimarsh Zutshi Signed-off-by: Tuukka Toivonen Signed-off-by: Sergio Aguirre Signed-off-by: Antti Koskipaa Signed-off-by: Ivan T. Ivanov Signed-off-by: RaniSuneela Signed-off-by: Atanas Filipov Signed-off-by: Gjorgji Rosikopulos Signed-off-by: Hiroshi DOYU Signed-off-by: Nayden Kanchev Signed-off-by: Phil Carmody Signed-off-by: Artem Bityutskiy Signed-off-by: Dominic Curran Signed-off-by: Ilkka Myllyperkio Signed-off-by: Pallavi Kulkarni Signed-off-by: Vaibhav Hiremath Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 448de7e7850b804bc8f5efa60305a83333c257bf Author: Sakari Ailus Date: Sat Feb 12 18:05:06 2011 -0300 [media] omap3isp: OMAP3 ISP core The Image Signal Processor provides the system interface and the processing capability to connect RAW or YUV image-sensor modules to the OMAP3. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Signed-off-by: David Cohen Signed-off-by: Stanimir Varbanov Signed-off-by: Vimarsh Zutshi Signed-off-by: Tuukka Toivonen Signed-off-by: Sergio Aguirre Signed-off-by: Antti Koskipaa Signed-off-by: Ivan T. Ivanov Signed-off-by: RaniSuneela Signed-off-by: Atanas Filipov Signed-off-by: Gjorgji Rosikopulos Signed-off-by: Hiroshi DOYU Signed-off-by: Nayden Kanchev Signed-off-by: Phil Carmody Signed-off-by: Artem Bityutskiy Signed-off-by: Dominic Curran Signed-off-by: Ilkka Myllyperkio Signed-off-by: Pallavi Kulkarni Signed-off-by: Vaibhav Hiremath Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c30b46e58b31a0fc420049e21117444862fc7cb7 Author: Laurent Pinchart Date: Fri Feb 26 12:23:10 2010 -0300 [media] v4l: subdev: Generic ioctl support Instead of returning an error when receiving an ioctl call with an unsupported command, forward the call to the subdev core::ioctl handler. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cfe2cde6d33f15994ad34466ac4a08f5bb348948 Author: Sergio Aguirre Date: Mon Nov 15 11:29:54 2010 -0300 [media] omap2: Fix camera resources for multiomap Make sure the kernel can be compiled with both OMAP2 and OMAP3 camera support linked in, and give public symbols proper omap2/omap3 prefixes. Signed-off-by: Sergio Aguirre Acked-by: Laurent Pinchart Acked-by: Tony Lindgren Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a11f6706ca4473c2df3f72a306d9b9fee6512a33 Author: Laurent Pinchart Date: Mon Dec 14 08:09:07 2009 -0300 [media] omap3: Add function to register omap3isp platform device structure The omap3isp platform device requires platform data. Instead of registering the device in omap2_init_devices(), export an omap3_init_camera() function to fill the device structure with the platform data pointer and register the device. Signed-off-by: Laurent Pinchart Acked-by: Tony Lindgren Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 837c83283daa5ae3831c4dff6bdb75e26aeab4b0 Author: Sergio Aguirre Date: Mon Nov 15 11:29:56 2010 -0300 [media] omap3: Remove unusued ISP CBUFF resource The ISP CBUFF module isn't use, its resource isn't needed. Signed-off-by: Sergio Aguirre Acked-by: Laurent Pinchart Acked-by: Tony Lindgren Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6817a69a030b0a815e57470cf5d2e3b577cdcba9 Author: Tuukka Toivonen Date: Tue Feb 2 11:17:33 2010 -0300 [media] ARM: OMAP3: Update Camera ISP definitions for OMAP3630 Add new/changed base address definitions and resources for OMAP3630 ISP. The OMAP3430 CSI2PHY block is same as the OMAP3630 CSIPHY2 block. But the later name is chosen as it gives more symmetry to the names. Signed-off-by: Tuukka Toivonen Signed-off-by: Vimarsh Zutshi Acked-by: Tony Lindgren Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 39187e177dc6372a967aa17a49a79189dc4fa8de Author: Laurent Pinchart Date: Thu Dec 23 11:14:50 2010 -0300 [media] v4l: Add 12 bits bayer pixel formats Add FCCs for the following pixel formats: - V4L2_PIX_FMT_SBGGR12 - V4L2_PIX_FMT_SGBRG12 - V4L2_PIX_FMT_SGRBG12 - V4L2_PIX_FMT_SRGGB12 Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7140c55738561907a1f66abf533d6358bf69ed9f Author: Laurent Pinchart Date: Thu Dec 23 11:14:49 2010 -0300 [media] v4l: Add missing 12 bits bayer media bus formats Add codes and documentation for the following media bus formats: - V4L2_MBUS_FMT_SGBRG12_1X12 - V4L2_MBUS_FMT_SGRBG12_1X12 - V4L2_MBUS_FMT_SRGGB12_1X12 Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b1fd18cd9b8719f7668bb00e14f02a8e227e42e9 Author: Laurent Pinchart Date: Fri Sep 3 05:47:25 2010 -0300 [media] v4l: Add remaining RAW10 patterns w DPCM pixel code variants This adds following formats: - V4L2_MBUS_FMT_SRGGB10_1X10 - V4L2_MBUS_FMT_SGBRG10_1X10 - V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8 - V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 - V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 Signed-off-by: Sergio Aguirre Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2d8deaf6b13e1b00fb65333bac9380b8c318adcf Author: Laurent Pinchart Date: Wed Sep 1 12:59:36 2010 -0300 [media] v4l: Add 8-bit YUYV on 16-bit bus and SGRBG10 media bus pixel codes Add the following media bus format code definitions: - V4L2_MBUS_FMT_SGRBG10_1X10 for 10-bit GRBG Bayer - V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 for 10-bit DPCM compressed GRBG Bayer - V4L2_MBUS_FMT_YUYV16_1X16 for 8-bit YUYV on 16-bit bus - V4L2_MBUS_FMT_UYVY16_1X16 for 8-bit UYVY on 16-bit bus - V4L2_MBUS_FMT_YVYU16_1X16 for 8-bit YVYU on 16-bit bus - V4L2_MBUS_FMT_VYUY16_1X16 for 8-bit VYUY on 16-bit bus Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f80a3ab083474670527df3ca849546a7059da766 Author: Laurent Pinchart Date: Tue Nov 16 01:21:06 2010 -0300 [media] v4l: Add subdev sensor g_skip_frames operation Some buggy sensors generate corrupt frames when the stream is started. This new operation return the number of corrupt frames to skip when starting the stream. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f6a5cb1be894468cdc69ec557d47f40c28f64642 Author: Antti Koskipaa Date: Wed Jun 23 05:03:42 2010 -0300 [media] v4l: v4l2_subdev userspace crop API This patch adds the VIDIOC_SUBDEV_S_CROP and G_CROP ioctls to the userland API. CROPCAP is not implemented because it's redundant. Signed-off-by: Antti Koskipaa Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 35c3017a29d278c4405a7f3ab30b814999d156d3 Author: Laurent Pinchart Date: Wed May 5 11:38:35 2010 -0300 [media] v4l: v4l2_subdev userspace frame interval API The three new ioctl VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL, VIDIOC_SUBDEV_G_FRAME_INTERVAL and VIDIOC_SUBDEV_S_FRAME_INTERVAL can be used to enumerate and configure a subdev's frame rate from userspace. Two new video::g/s_frame_interval subdev operations are introduced to support those ioctls. The existing video::g/s_parm operations are deprecated and shouldn't be used anymore. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 333c8b97785d5afd5085ba3720b4d259623290f6 Author: Laurent Pinchart Date: Mon Mar 15 20:26:04 2010 -0300 [media] v4l: v4l2_subdev userspace format API Add a userspace API to get, set and enumerate the media format on a subdev pad. The format at the output of a subdev usually depends on the format at its input(s). The try format operation is thus not suitable for probing format at individual pads, as it can't modify the device state and thus can't remember the format tried at the input to compute the output format. To fix the problem, pass an extra argument to the get/set format operations to select the 'try' or 'active' format. The try format is used when probing the subdev. Setting the try format must not change the device configuration but can store data for later reuse. Data storage is provided at the file-handle level so applications probing the subdev concurently won't interfere with each other. The active format is used when configuring the subdev. It's identical to the format handled by the usual get/set operations. Signed-off-by: Laurent Pinchart Signed-off-by: Stanimir Varbanov Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d3a7ed99759b18e4fd19b8ddd226f8085b8bd975 Author: Laurent Pinchart Date: Tue Mar 16 00:26:04 2010 +0100 [media] v4l: v4l2_subdev userspace format API - documentation binary files Add images used by the V4L2 subdev userspace format API documentation. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit eb08f35480869f7a82e9be1f19bc4575452e7f98 Author: Laurent Pinchart Date: Wed Dec 9 08:39:52 2009 -0300 [media] v4l: v4l2_subdev pad-level operations Add a v4l2_subdev_pad_ops structure for the operations that need to be performed at the pad level such as format-related operations. Pad format-related operations use v4l2_mbus_framefmt instead of v4l2_format. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f0beea8f46142ea7abd7ed3f44fd0967c603fae0 Author: Laurent Pinchart Date: Sun Aug 1 19:05:09 2010 -0300 [media] v4l: subdev: Add new file operations V4L2 sub-devices store pad formats and crop settings in the file handle. To let drivers initialize those settings properly, add an open operation that is called when the subdev is opened as well as a corresponding close operation. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7cd5a16b22af7dc92190a60f336b6854a6fcb99d Author: Stanimir Varbanov Date: Fri May 21 06:04:24 2010 -0300 [media] v4l: Create v4l2 subdev file handle structure Used for storing subdev information per file handle and hold V4L2 file handle. Signed-off-by: Stanimir Varbanov Signed-off-by: Antti Koskipaa Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dacdde78b39e49edf2f7af85be4b613978280b26 Author: Laurent Pinchart Date: Wed Sep 1 12:58:22 2010 -0300 [media] v4l: Group media bus pixel codes by types and sort them alphabetically Adding new pixel codes at the end of the enumeration will soon create a mess, so group the pixel codes by type and sort them by bus_width, bits per component, samples per pixel and order of subsamples. As the codes are part of the kernel ABI their value can't change when a new code is inserted in the enumeration, so they are given an explicit numerical value. When inserting a new pixel code developers must use and update the next free value. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 076704332ca6da550cbc279918ef8b88b4ac1e45 Author: Laurent Pinchart Date: Tue Sep 28 07:01:44 2010 -0300 [media] v4l: Rename V4L2_MBUS_FMT_GREY8_1X8 to V4L2_MBUS_FMT_Y8_1X8 For consistency with the V4L2_MBUS_FMT_Y10_1X10 format. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 84d0688dfc7eedb2147532bf52ff7073d5c3c7b9 Author: Laurent Pinchart Date: Wed Oct 6 03:30:26 2010 -0300 [media] v4l: Replace enums with fixed-sized fields in public structure The v4l2_mbus_framefmt structure will be part of the public userspace API and used (albeit indirectly) as an ioctl argument. As such, its size must be fixed across userspace ABIs. Replace the v4l2_field and v4l2_colorspace enums by __u32 fields and add padding for future enhancements. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2ef2d5a336891ee38fee7c7ad2396e31ac9d8aaa Author: Laurent Pinchart Date: Mon Mar 15 19:33:31 2010 -0300 [media] v4l: Move the media/v4l2-mediabus.h header to include/linux The header defines the v4l2_mbus_framefmt structure which will be used by the V4L2 subdevs userspace API. Change the type of the v4l2_mbus_framefmt::code field to __u32, as enum sizes can differ between different ABIs on the same architectures. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 61f5db549dde43fb91a8b337f3a4096e4076c2d9 Author: Laurent Pinchart Date: Wed Dec 9 08:40:08 2009 -0300 [media] v4l: Make v4l2_subdev inherit from media_entity V4L2 subdevices are media entities. As such they need to inherit from (include) the media_entity structure. When registering/unregistering the subdevice, the media entity is automatically registered/unregistered. The entity is acquired on device open and released on device close. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2c0ab67be1b4197a4effac89bb0604832e38be8d Author: Laurent Pinchart Date: Wed Dec 9 08:40:10 2009 -0300 [media] v4l: Make video_device inherit from media_entity V4L2 devices are media entities. As such they need to inherit from (include) the media_entity structure. When registering/unregistering the device, the media entity is automatically registered/unregistered. The entity is acquired on device open and released on device close. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 95db3a60e0652a52df145aacade1a88c5acef659 Author: Laurent Pinchart Date: Wed Dec 9 08:40:05 2009 -0300 [media] v4l: Add a media_device pointer to the v4l2_device structure The pointer will later be used to register/unregister media entities when registering/unregistering a v4l2_subdev or a video_device. With the introduction of media devices, device drivers need to store a pointer to a driver-specific structure in the device's drvdata. v4l2_device can't claim ownership of the drvdata anymore. To maintain compatibility with drivers that rely on v4l2_device storing a pointer to itself in the device's drvdata, v4l2_device_register() will keep doing so if the drvdata is NULL. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e02188c90f6ef61f0844c42508fe603c5d4fa42b Author: Laurent Pinchart Date: Wed Aug 25 09:00:41 2010 -0300 [media] media: Pipelines and media streams Drivers often need to associate pipeline objects to entities, and to take stream state into account when configuring entities and links. The pipeline API helps drivers manage that information. When starting streaming, drivers call media_entity_pipeline_start(). The function marks all entities connected to the given entity through enabled links, either directly or indirectly, as streaming. Similarly, when stopping the stream, drivers call media_entity_pipeline_stop(). The media_entity_pipeline_start() function takes a pointer to a media pipeline and stores it in every entity in the graph. Drivers should embed the media_pipeline structure in higher-level pipeline structures and can then access the pipeline through the media_entity structure. Link configuration will fail with -EBUSY by default if either end of the link is a streaming entity, unless the link is marked with the MEDIA_LNK_FL_DYNAMIC flag. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 97548ed4c4661502cdfd1aabd5d3876fa4f5cc2e Author: Laurent Pinchart Date: Wed Dec 9 08:40:03 2009 -0300 [media] media: Links setup Create the following ioctl and implement it at the media device level to setup links. - MEDIA_IOC_SETUP_LINK: Modify the properties of a given link The only property that can currently be modified is the ENABLED link flag to enable/disable a link. Links marked with the IMMUTABLE link flag can not be enabled or disabled. Enabling or disabling a link has effects on entities' use count. Those changes are automatically propagated through the graph. Signed-off-by: Laurent Pinchart Signed-off-by: Stanimir Varbanov Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1651333b09743887bc2dd3d158a11853a2be3fe7 Author: Laurent Pinchart Date: Wed Dec 9 08:40:01 2009 -0300 [media] media: Entities, pads and links enumeration Create the following two ioctls and implement them at the media device level to enumerate entities, pads and links. - MEDIA_IOC_ENUM_ENTITIES: Enumerate entities and their properties - MEDIA_IOC_ENUM_LINKS: Enumerate all pads and links for a given entity Entity IDs can be non-contiguous. Userspace applications should enumerate entities using the MEDIA_ENT_ID_FLAG_NEXT flag. When the flag is set in the entity ID, the MEDIA_IOC_ENUM_ENTITIES will return the next entity with an ID bigger than the requested one. Only forward links that originate at one of the entity's source pads are returned during the enumeration process. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 140d88165c25137e871f9559e67986ed89251105 Author: Laurent Pinchart Date: Wed Aug 18 11:41:22 2010 -0300 [media] media: Media device information query Create the following ioctl and implement it at the media device level to query device information. - MEDIA_IOC_DEVICE_INFO: Query media device information The ioctl and its data structure are defined in the new kernel header linux/media.h available to userspace applications. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 503c3d829eaf48837dd5bff5d97ad66369bb955a Author: Laurent Pinchart Date: Sun Mar 7 15:04:59 2010 -0300 [media] media: Entity use count Due to the wide differences between drivers regarding power management needs, the media controller does not implement power management. However, the media_entity structure includes a use_count field that media drivers can use to track the number of users of every entity for power management needs. The use_count field is owned by media drivers and must not be touched by entity drivers. Access to the field must be protected by the media device graph_mutex lock. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a5ccc48a7c48610e7f92fa599406738d69195d51 Author: Sakari Ailus Date: Sun Mar 7 16:14:14 2010 -0300 [media] media: Entity graph traversal Add media entity graph traversal. The traversal follows enabled links by depth first. Traversing graph backwards is prevented by comparing the next possible entity in the graph with the previous one. Multiply connected graphs are thus not supported. Signed-off-by: Sakari Ailus Signed-off-by: Laurent Pinchart Signed-off-by: Vimarsh Zutshi Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 53e269c102fbaf77e7dc526b1606ad4a48e57200 Author: Laurent Pinchart Date: Wed Dec 9 08:40:00 2009 -0300 [media] media: Entities, pads and links As video hardware pipelines become increasingly complex and configurable, the current hardware description through v4l2 subdevices reaches its limits. In addition to enumerating and configuring subdevices, video camera drivers need a way to discover and modify at runtime how those subdevices are connected. This is done through new elements called entities, pads and links. An entity is a basic media hardware building block. It can correspond to a large variety of logical blocks such as physical hardware devices (CMOS sensor for instance), logical hardware devices (a building block in a System-on-Chip image processing pipeline), DMA channels or physical connectors. A pad is a connection endpoint through which an entity can interact with other entities. Data (not restricted to video) produced by an entity flows from the entity's output to one or more entity inputs. Pads should not be confused with physical pins at chip boundaries. A link is a point-to-point oriented connection between two pads, either on the same entity or on different entities. Data flows from a source pad to a sink pad. Links are stored in the source entity. To make backwards graph walk faster, a copy of all links is also stored in the sink entity. The copy is known as a backlink and is only used to help graph traversal. The entity API is made of three functions: - media_entity_init() initializes an entity. The caller must provide an array of pads as well as an estimated number of links. The links array is allocated dynamically and will be reallocated if it grows beyond the initial estimate. - media_entity_cleanup() frees resources allocated for an entity. It must be called during the cleanup phase after unregistering the entity and before freeing it. - media_entity_create_link() creates a link between two entities. An entry in the link array of each entity is allocated and stores pointers to source and sink pads. When a media device is unregistered, all its entities are unregistered automatically. The code is based on Hans Verkuil initial work. Signed-off-by: Laurent Pinchart Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 176fb0d108f7495ccf9aa127e1342a1a0d87e004 Author: Laurent Pinchart Date: Wed Dec 9 08:39:58 2009 -0300 [media] media: Media device The media_device structure abstracts functions common to all kind of media devices (v4l2, dvb, alsa, ...). It manages media entities and offers a userspace API to discover and configure the media device internal topology. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cf4b9211b5680cd9ca004232e517fb7ec5bf5316 Author: Laurent Pinchart Date: Wed Dec 9 08:39:56 2009 -0300 [media] media: Media device node support The media_devnode structure provides support for registering and unregistering character devices using a dynamic major number. Reference counting is handled internally, making device drivers easier to write without having to solve the open/disconnect race condition issue over and over again. The code is based on video/v4l2-dev.c. [mchehab@redhat.com: Remove linux/smp_lock.h include to not break compilation on bisect] Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dfc906daeec03b3f2d306ae260d398d97ba232c5 Author: Martin Decky Date: Sun Feb 13 19:28:40 2011 +0000 video: Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET The macros for getting the values for horizontal sync width and offset do not respect the EDID specification. Both these values are 10 bit values according to [1], not 6 bit values. The lower 8 bits are stored in byte 8 and byte 9 of the DTD respectively, while two additional bits for each value are stored in byte 11. The original macros just slammed the bits together. Although the original macros usually worked fine because the higher two bits are rarely used, it can cause severe problems on plasma panels running at 1920x1080 @ 50 Hz with drivers that rely on the correct parsing of the EDID data by fbmon.c (e.g. udlfb). The patch should apply cleanly to both the fbdev-2.6.git branch and linux-next.git branch. [1] VESA Enhanced Extended Display Identification Data Standard, Release A, Revision 2, page 34, notes 7 & 8, VESA, Sep 2006 Signed-off-by: Martin Decky Signed-off-by: Paul Mundt commit d6244bc0ed0c52a795e6f4dcab3886daf3e74fac Author: Henry Nestler Date: Sun Feb 20 20:50:56 2011 +0000 fbcon: Bugfix soft cursor detection in Tile Blitting Use mask 0x10 for "soft cursor" detection on in function tile_cursor. (Tile Blitting Operation in framebuffer console). The old mask 0x01 for vc_cursor_type detects CUR_NONE, CUR_LOWER_THIRD and every second mode value as "software cursor". This hides the cursor for these modes (cursor.mode = 0). But, only CUR_NONE or "software cursor" should hide the cursor. See also 0x10 in functions add_softcursor, bit_cursor and cw_cursor. Signed-off-by: Henry Nestler Cc: stable@kernel.org Signed-off-by: Paul Mundt commit 6359691d7efc639bf0f996aa9a694b2653fc6ae6 Author: axel lin Date: Tue Feb 15 09:35:02 2011 +0000 video: add missing framebuffer_release in error path This patch fixes a memory leak in the error path. Signed-off-by: Axel Lin Acked-by: David S. Miller Signed-off-by: Paul Mundt commit 1e9bb8808ac11094d711d20d580e7b45a4992d0c Author: Shaohua Li Date: Tue Mar 22 08:35:35 2011 +0100 block: fix non-atomic access to genhd inflight structures After the stack plugging introduction, these are called lockless. Ensure that the counters are updated atomically. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit 1e93f390e56d82c4fcf684c86a45e1c593dc4b28 Author: axel lin Date: Sun Feb 13 04:02:10 2011 +0000 video: metronomefb: add __devexit_p around reference to metronomefb_remove metronomefb_remove is marked __devexit, thus add __devexit_p around reference to metronomefb_remove. Signed-off-by: Axel Lin Signed-off-by: Paul Mundt commit 79ac33ec845c1872a23169644c5867528ff05590 Author: axel lin Date: Sun Feb 13 13:06:23 2011 +0000 video: hecubafb: add __devexit_p around reference to hecubafb_remove hecubafb_remove is marked __devexit, thus add __devexit_p around reference to hecubafb_remove. Signed-off-by: Axel Lin Signed-off-by: Paul Mundt commit 83e61f71d72da7240378fe7ecba5e936a0f159db Author: Justin P. Mattock Date: Wed Feb 16 06:55:38 2011 +0000 drivers:video:aty:radeon_base Fix typo occationally to occasionally The below patch fixes a typo occationally to occasionally. Signed-off-by: Justin P. Mattock Signed-off-by: Paul Mundt commit bed7bddbb434df0e76ffe2ff8cb535fe8f3c0c69 Author: Andreas Bießmann Date: Fri Feb 11 15:19:44 2011 +0000 atmel_lcdfb: add fb_blank function Signed-off-by: Andreas Bießmann Signed-off-by: Paul Mundt commit 7cdcdb69bdf51192bcbfb7cf479850fe7c33357d Author: Andreas Bießmann Date: Fri Feb 11 15:19:43 2011 +0000 atmel_lcdfb: implement inverted contrast pwm This patch introduces lcdc->lcdcon_pol_negative which set CONTRAST_CTR register to inverted polarity. Signed-off-by: Andreas Bießmann Signed-off-by: Paul Mundt commit 942b8d05cdf1da396b4449a38b87c677591947c0 Author: axel lin Date: Fri Feb 11 08:51:10 2011 +0000 video: s3c-fb: return proper error if clk_get fails Return PTR_ERR(sfb->bus_clk) instead of 0 if clk_get fails. Signed-off-by: Axel Lin Acked-by: Kyungmin Park Signed-off-by: Paul Mundt commit 803a4e14a7dceaf01dbc0e02c0fdea2eba4c81b3 Author: Thomas Schlichter Date: Sat Nov 27 14:17:55 2010 +0100 uvesafb,vesafb: create WC or WB PAT-entries with an PAT-enabled kernel, when using uvesafb or vesafb, these drivers will create uncached-minus PAT entries for the framebuffer memory because they use ioremap() (not the *_cache or *_wc variants). When the framebuffer memory intersects with the video RAM used by Xorg, the complete video RAM will be mapped uncached-minus what results in a serve performance penalty. Here are the correct MTRR entries created by uvesafb: schlicht@netbook:~$ cat /proc/mtrr reg00: base=0x000000000 ( 0MB), size= 2048MB, count=1: write-back reg01: base=0x06ff00000 ( 1791MB), size= 1MB, count=1: uncachable reg02: base=0x070000000 ( 1792MB), size= 256MB, count=1: uncachable reg03: base=0x0d0000000 ( 3328MB), size= 16MB, count=1: write-combining And here are the problematic PAT entries: schlicht@netbook:~$ sudo cat /sys/kernel/debug/x86/pat_memtype_list PAT memtype list: write-back @ 0x0-0x1000 uncached-minus @ 0x6fedd000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee3000-0x6fee4000 uncached-minus @ 0x6fee3000-0x6fee4000 uncached-minus @ 0x6fee3000-0x6fee4000 uncached-minus @ 0xd0000000-0xe0000000 <-- created by xserver-xorg uncached-minus @ 0xd0000000-0xd1194000 <-- created by uvesafb uncached-minus @ 0xf4000000-0xf4009000 uncached-minus @ 0xf4200000-0xf4400000 uncached-minus @ 0xf5000000-0xf5010000 uncached-minus @ 0xf5100000-0xf5104000 uncached-minus @ 0xf5400000-0xf5404000 uncached-minus @ 0xf5404000-0xf5405000 uncached-minus @ 0xf5404000-0xf5405000 uncached-minus @ 0xfed00000-0xfed01000 Therefore I created the attached patch for uvesafb which uses ioremap_wc() to create the correct PAT entries, as shown below: schlicht@netbook:~$ sudo cat /sys/kernel/debug/x86/pat_memtype_list PAT memtype list: write-back @ 0x0-0x1000 uncached-minus @ 0x6fedd000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee2000-0x6fee3000 uncached-minus @ 0x6fee3000-0x6fee4000 uncached-minus @ 0x6fee3000-0x6fee4000 uncached-minus @ 0x6fee3000-0x6fee4000 write-combining @ 0xd0000000-0xe0000000 write-combining @ 0xd0000000-0xd1194000 uncached-minus @ 0xf4000000-0xf4009000 uncached-minus @ 0xf4200000-0xf4400000 uncached-minus @ 0xf5000000-0xf5010000 uncached-minus @ 0xf5100000-0xf5104000 uncached-minus @ 0xf5400000-0xf5404000 uncached-minus @ 0xf5404000-0xf5405000 uncached-minus @ 0xf5404000-0xf5405000 uncached-minus @ 0xfed00000-0xfed01000 This results in a performance gain, objectively measurable with e.g. x11perf -comppixwin10 -comppixwin100 -comppixwin500: 1: x11perf_xaa.log 2: x11perf_xaa_patched.log 1 2 Operation -------- ---------------- ----------------- 124000.0 202000.0 ( 1.63) Composite 10x10 from pixmap to window 3340.0 24400.0 ( 7.31) Composite 100x100 from pixmap to window 131.0 1150.0 ( 8.78) Composite 500x500 from pixmap to window You can see the serve performance gain when composing larger pixmaps to window. The patches replace the ioremap() function with the variant matching the mtrr- parameter. To create "write-back" PAT entries, the ioremap_cache() function must be called after creating the MTRR entries, and the ioremap_cache() region must completely fit into the MTRR region, this is why the MTRR region size is now rounded up to the next power-of-two. Signed-off-by: Thomas Schlichter Signed-off-by: Paul Mundt commit 7b0e278519eba8050f2b37d7c408958745f30ecd Author: axel lin Date: Tue Feb 8 14:58:45 2011 +0000 video: ffb: fix ffb_probe error path Current implementation calls of_iounmap for par->fbc twice in error path. In the case of goto out_unmap_dac, we should call of_iounmap for par->dac. Signed-off-by: Axel Lin Acked-by: David S. Miller Signed-off-by: Paul Mundt commit 49bb0943329929e73c9a22c97d53c6c8967eb243 Author: Jean Delvare Date: Thu Feb 3 08:23:10 2011 +0000 radeonfb: Let hwmon driver probe the "monid" I2C bus Some Radeon cards have an I2C-based thermal sensor chip connected to the "monid" I2C bus. Set the I2C probing class of this bus properly so that hwmon drivers can detect devices on it and bind to them. This closes kernel.org bug #26172. We exclude PPC for the time being, as Benjamin doesn't want us to mess up with them without explicit testing, and there is no evidence that this change is needed for them either. Reported-by: Alexander Goomenyuk Signed-off-by: Jean Delvare Cc: Benjamin Herrenschmidt Signed-off-by: Paul Mundt commit beee1f20a185c7e79fd33bb83e04fe44ecd75af3 Author: Dan Carpenter Date: Mon Mar 21 15:03:13 2011 +0000 fbdev: sh_mobile_lcdc: checking NULL instead of IS_ERR() backlight_device_register() returns an ERR_PTR. It doesn't return NULL. Signed-off-by: Dan Carpenter Signed-off-by: Paul Mundt commit e0998eab678233fae7dff7b92db08ad0f01acf91 Author: axel lin Date: Sat Jan 29 09:35:45 2011 +0000 video: sh7760fb: use resource_size() The size calculation is done incorrectly in request_mem_region because it should include both the start and end (end - start + 1). Signed-off-by: Axel Lin Signed-off-by: Paul Mundt commit 56fb22f7ca11ba5f04c297b7f7aa758ac8dbb2ce Author: axel lin Date: Sat Jan 29 09:33:48 2011 +0000 video: hpfb: use resource_size() The size calculation is done incorrectly here because it should include both the start and end (end - start + 1). Signed-off-by: Axel Lin Signed-off-by: Paul Mundt commit 7fe029df4245b7765efeebbcfd1b3dfda1432a8e Author: Ondrej Zary Date: Tue Mar 1 19:18:43 2011 +0000 s3fb: use new start address register Use "new" start address register 0x69 (bits 16-20) instead of "old" 0x31 (bits 16-17) and 0x51 (bits 18-19). This is needed for panning to work correctly on Trio3D/2X cards (and does no harm on other ones). Signed-off-by: Ondrej Zary Acked-by: Ondrej Zajicek Signed-off-by: Paul Mundt commit cb11c048928b519548dbfb7da149dd2521500db0 Author: Ondrej Zary Date: Tue Mar 1 19:18:35 2011 +0000 s3fb: enable DTPC Enable Data Transfer Position Control (DTPC). This is needed at least on Virge/DX to correctly display at higher pixclocks. Signed-off-by: Ondrej Zary Acked-by: Ondrej Zajicek Signed-off-by: Paul Mundt commit 3827d10ed4278323b75bf25d09c146c050519254 Author: Ondrej Zary Date: Tue Mar 1 19:18:27 2011 +0000 s3fb: fix 15/16bpp modes with over 115MHz pixclocks on 86C365 Trio3D Enable pixel multiplexing in 15/16bpp modes when pixclock is over 115MHz on Trio3D (86C365) cards to fix artifacts on the left side of screen. Signed-off-by: Ondrej Zary Acked-by: Ondrej Zajicek Signed-off-by: Paul Mundt commit 5694f9ce5801d58bfc1b011592a5e460cc0a274b Author: Ondrej Zary Date: Tue Mar 1 19:18:17 2011 +0000 s3fb: add support for 86C365 Trio3D Add support for S3 Trio3D (86C365) cards to s3fb driver. Tested with one 4MB card. Signed-off-by: Ondrej Zary Acked-by: Ondrej Zajicek Signed-off-by: Paul Mundt commit 99d054d8253b1dbc6ab2d4ebcb25ad4a4e6ba1c8 Author: Ondrej Zary Date: Tue Mar 1 19:18:08 2011 +0000 s3fb: maximize virtual vertical size for fast scrolling Maximize virtual vertical framebuffer size during init to allow fast scrolling (accelerated by panning). Signed-off-by: Ondrej Zary Acked-by: Ondrej Zajicek Signed-off-by: Paul Mundt commit 6a2f6d5e970afbc1b8b08bafae9d9138a3206960 Author: David Miller Date: Tue Jan 11 23:55:17 2011 +0000 vt8623fb: Compute VGA base iomem pointer explicitly. This allows the driver to work in multi-domain PCI configurations. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 892c24ca40ffebf6d0ca4cc1454e58db131a4f5a Author: David Miller Date: Tue Jan 11 23:54:35 2011 +0000 arkfb: Compute VGA base iomem pointer explicitly. This allows the driver to work in multi-domain PCI configurations. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 94c322c30bd14ae6cdd369cb4a1f94c5c3809ac9 Author: David Miller Date: Tue Jan 11 23:54:21 2011 +0000 s3fb: Compute VGA base iomem pointer explicitly. This allows the driver to work in multi-domain PCI configurations. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 0144a2568c7d8e58806d3f176f8454c3a3a35ba0 Author: David Miller Date: Tue Jan 11 23:54:07 2011 +0000 vt8623fb: Don't clobber par->state.vgabase during open method. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 3ff259f2ed21e4438dc7937348710397e5ebd71e Author: David Miller Date: Tue Jan 11 23:53:53 2011 +0000 s3fb: Don't clobber par->state.vgabase during open method. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit ec70a9435600a7b4c019671aa0b6e6644b60f0b2 Author: David Miller Date: Tue Jan 11 23:53:38 2011 +0000 arkfb: Don't clobber par->state.vgabase during open method. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit ed3eb4c803dec3cf2976701f0b5722f98e642855 Author: David Miller Date: Tue Jan 11 23:53:11 2011 +0000 vt8623fb: Pass par->state.vgabase to vga_*() calls. Instead of just plain NULL. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit f8645933513c65ac55f23c63b2649097289795c6 Author: David Miller Date: Tue Jan 11 23:52:57 2011 +0000 s3fb: Pass par->state.vgabase to vga_*() calls. Instead of just plain NULL. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit c5e04633b3b765a06986008e577930555e0f544b Author: David Miller Date: Tue Jan 11 23:52:40 2011 +0000 arkfb: Pass par->state.vgabase to vga_*() calls. Instead of just plain NULL. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 38d2620ea40c2f9a5f17d6488bf004973570279c Author: David Miller Date: Tue Jan 11 23:52:25 2011 +0000 svga: Make svga_set_timings() take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 55db092388455457791cf00216b6b3965a8071f8 Author: David Miller Date: Tue Jan 11 23:52:11 2011 +0000 svga: Make svga_tilecursor() take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 9c96394bb90f855d265116f37897294fa1bdb072 Author: David Miller Date: Tue Jan 11 23:51:56 2011 +0000 svga: Make svga_set_textmode_vga_regs() take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 1d28fcadb0e277844ebffb528cdfd25d44591035 Author: David Miller Date: Tue Jan 11 23:51:41 2011 +0000 svga: Make svga_set_default_crt_regs() take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit ea770789dce2d27afab39c3891a475624acbd82f Author: David Miller Date: Tue Jan 11 23:51:26 2011 +0000 svga: Make svga_wcrt_mask() take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit d907ec04cc498e11e039e0fff8eb58cf01e885da Author: David Miller Date: Tue Jan 11 23:51:08 2011 +0000 svga: Make svga_wseq_mask() take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit a4ade83948e0ffc317b8227d92107271a0acdda5 Author: David Miller Date: Tue Jan 11 23:50:54 2011 +0000 svga: Make svga_set_default_seq_regs take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit f51a14dded14457e45b1f026a6af5ca6a51e4502 Author: David Miller Date: Tue Jan 11 23:50:36 2011 +0000 svga: Make svga_set_default_atc_regs take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit e2fade2c146ec718796049104b45267ddbfdf7a1 Author: David Miller Date: Tue Jan 11 23:50:04 2011 +0000 svga: Make svga_set_default_gfx_regs take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit dc6aff3a5d3e4f565cb07cd5f3b6983850971da7 Author: David Miller Date: Tue Jan 11 23:49:49 2011 +0000 svga: Make svga_wseq_multi take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 21da386d0e4c55f6f7482b4637532b942e22b70a Author: David Miller Date: Tue Jan 11 23:49:34 2011 +0000 svga: Make svga_wcrt_multi take an iomem regbase pointer. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit f6b0cc477de99fe715f1071b13ab822daed9a34f Author: David Miller Date: Tue Jan 11 23:49:18 2011 +0000 svga: Make svga_wattr take an iomem regbase pointer. And use vga_{r,w}(). Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 1284e49cf186eaa19056e85a76a443d4eca8995d Author: David Miller Date: Tue Jan 11 23:49:03 2011 +0000 svga: Use proper VGA register name macros in svga_wattr. Instead of magic register location constants. Signed-off-by: David S. Miller Signed-off-by: Paul Mundt commit 42dea903bf56414aa1eb299412a744b0fd269931 Author: Aaro Koskinen Date: Sun Feb 13 22:11:28 2011 +0000 sisfb: add support for XGI Z9 DDR2 POST Add support for ZGI Z9 DDR2 POST. The init sequence is from XGI's xgifb driver. Tested with ARM board using a PCI card with XGI Z9s and 32 MB DDR2 memory. After a cold reset the POST succeeds. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit c9982d59c5c877a65fbdef3c875e82eaa95c2505 Author: Aaro Koskinen Date: Sun Feb 13 22:11:27 2011 +0000 sisfb: move XGI POST DDR2 bootup code into subroutines Move DDR2 register setting code into separate subroutines. No changes in functionality. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 5e8700bf6db24ccf6814c765519d8986f1c16357 Author: Aaro Koskinen Date: Sun Feb 13 22:11:26 2011 +0000 sisfb: add RAM type detection for XGI Z9 Detect the XGI Z9 RAM type as "documented" by the XGI's xgifb driver. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 929c972e9589644805577317a38f1cd6b3ce5fc2 Author: Aaro Koskinen Date: Sun Feb 13 22:11:25 2011 +0000 sisfb: add subroutine for detecting XGI Z9 Z7 and Z9 have the same PCI ID, so additional checking is needed to detect Z9. The method was "documented" in XGI's xgifb driver. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 74de5f4e52bf6e2ee1fe559d53c5dbf0d9d6e4cd Author: Aaro Koskinen Date: Sun Feb 13 22:11:24 2011 +0000 sisfb: move XGI POST RAM type detection into a subroutine Move XGI POST RAM type detection into a separate subroutine to make further code changes easier. No changes in functionality Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 83ea0f164c35fb847afd9309be9ba40431fc501d Author: Aaro Koskinen Date: Sun Feb 13 22:11:23 2011 +0000 sisfb: POST should fail if R/W test fails Currently there is no indication if R/W test fails during POST. This can happen e.g. when user plugs in a card with unsupported type of memory. Since the driver will be unusable, it's better to fail the whole POST if the memory cannot be configured properly. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 1721af4d8581587409d66d4fe0be6bc455611e5b Author: Kirill A. Shutemov Date: Tue Mar 15 22:53:19 2011 +0000 vmlfb: use list_move() instead of list_del()/list_add() combination Signed-off-by: Kirill A. Shutemov Signed-off-by: Paul Mundt commit 9913319fc0b47f3f740633165dee4807d94d0096 Author: Kirill A. Shutemov Date: Tue Mar 15 22:53:18 2011 +0000 omap: use list_move() instead of list_del()/list_add() combination Signed-off-by: Kirill A. Shutemov Acked-by: Tomi Valkeinen Signed-off-by: Paul Mundt commit 25076246e80c0c48cc4c9115335b83343b9dc727 Merge: 05534c9 c413d76 Author: Len Brown Date: Tue Mar 22 01:41:47 2011 -0400 Merge branch 'apei-release' into release commit 4fdf30c44bb2e97a9f8f2b57764c5acd89267d4c Author: Paul Mundt Date: Tue Mar 22 14:31:35 2011 +0900 mailmap: Update for OMAP DSS developers. TI folks seem to have a rather schizophrenic relationship with author naming conventions, stub in mailmap entries to match with the sign-off convention. Signed-off-by: Paul Mundt commit da49252fb0392d8196833ef3da92e48fb371f8d7 Merge: eddecbb b295d6e Author: Paul Mundt Date: Tue Mar 22 14:27:36 2011 +0900 Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux Conflicts: arch/arm/mach-omap2/board-overo.c Signed-off-by: Paul Mundt commit 736561a01f11114146b1b7f82d486fa9c95828ef Author: Simon Horman Date: Mon Mar 21 15:18:01 2011 +0000 IPVS: Use global mutex in ip_vs_app.c As part of the work to make IPVS network namespace aware __ip_vs_app_mutex was replaced by a per-namespace lock, ipvs->app_mutex. ipvs->app_key is also supplied for debugging purposes. Unfortunately this implementation results in ipvs->app_key residing in non-static storage which at the very least causes a lockdep warning. This patch takes the rather heavy-handed approach of reinstating __ip_vs_app_mutex which will cover access to the ipvs->list_head of all network namespaces. [ 12.610000] IPVS: Creating netns size=2456 id=0 [ 12.630000] IPVS: Registered protocols (TCP, UDP, SCTP, AH, ESP) [ 12.640000] BUG: key ffff880003bbf1a0 not in .data! [ 12.640000] ------------[ cut here ]------------ [ 12.640000] WARNING: at kernel/lockdep.c:2701 lockdep_init_map+0x37b/0x570() [ 12.640000] Hardware name: Bochs [ 12.640000] Pid: 1, comm: swapper Tainted: G W 2.6.38-kexec-06330-g69b7efe-dirty #122 [ 12.650000] Call Trace: [ 12.650000] [] warn_slowpath_common+0x75/0xb0 [ 12.650000] [] warn_slowpath_null+0x15/0x20 [ 12.650000] [] lockdep_init_map+0x37b/0x570 [ 12.650000] [] ? trace_hardirqs_on+0xd/0x10 [ 12.650000] [] debug_mutex_init+0x38/0x50 [ 12.650000] [] __mutex_init+0x5c/0x70 [ 12.650000] [] __ip_vs_app_init+0x64/0x86 [ 12.660000] [] ? ip_vs_init+0x0/0xff [ 12.660000] [] T.620+0x43/0x170 [ 12.660000] [] ? register_pernet_subsys+0x1a/0x40 [ 12.660000] [] ? ip_vs_init+0x0/0xff [ 12.660000] [] ? ip_vs_init+0x0/0xff [ 12.660000] [] register_pernet_operations+0x57/0xb0 [ 12.660000] [] ? ip_vs_init+0x0/0xff [ 12.670000] [] register_pernet_subsys+0x29/0x40 [ 12.670000] [] ip_vs_app_init+0x10/0x12 [ 12.670000] [] ip_vs_init+0x4c/0xff [ 12.670000] [] do_one_initcall+0x7a/0x12e [ 12.670000] [] kernel_init+0x13e/0x1c2 [ 12.670000] [] kernel_thread_helper+0x4/0x10 [ 12.670000] [] ? restore_args+0x0/0x30 [ 12.680000] [] ? kernel_init+0x0/0x1c2 [ 12.680000] [] ? kernel_thread_helper+0x0/0x1global0 Signed-off-by: Simon Horman Cc: Ingo Molnar Cc: Eric Dumazet Cc: Julian Anastasov Cc: Hans Schillstrom Signed-off-by: David S. Miller commit f40f94fc6c3b5a5542d5ed976e9ff69a3b463802 Author: Eric Dumazet Date: Mon Mar 21 10:15:40 2011 +0000 ipvs: fix a typo in __ip_vs_control_init() Reported-by: Ingo Molnar Signed-off-by: Eric Dumazet Cc: Simon Horman Cc: Julian Anastasov Acked-by: Simon Horman Signed-off-by: David S. Miller commit c413d7682020a127f54744a1b30f597692aea1fd Author: Huang Ying Date: Mon Feb 21 13:54:43 2011 +0800 ACPI, APEI, Add PCIe AER error information printing support The AER error information printing support is implemented in drivers/pci/pcie/aer/aer_print.c. So some string constants, functions and macros definitions can be re-used without being exported. The original PCIe AER error information printing function is not re-used directly because the overall format is quite different. And changing the original printing format may make some original users' scripts broken. Signed-off-by: Huang Ying CC: Jesse Barnes CC: Zhang Yanmin Signed-off-by: Len Brown commit b64a44146540a4761bb1cf8047fffd9dbf0c3090 Author: Huang Ying Date: Mon Feb 21 13:54:42 2011 +0800 PCIe, AER, use pre-generated prefix in error information printing When printing PCIe AER error information, each line is prefixed with PCIe device and driver information. In original implementation, the prefix is generated when each line is printed. In fact, all lines share the same prefix. So this patch pre-generated the prefix, and use that one when each line is printed. In addition to common prefix can be pre-generated, the trailing white spaces in string constants and NULLs in char * array constants can be removed too. These can reduce the object file size further. The size of object file before and after changing is as follow: text data bss dec before: 3038 0 0 3038 after: 2118 0 0 2118 Signed-off-by: Huang Ying CC: Jesse Barnes CC: Zhang Yanmin Signed-off-by: Len Brown commit 885b976fada5bc6595a9fd3e67e3cb1a3d11f50b Author: Huang Ying Date: Mon Feb 21 13:54:41 2011 +0800 ACPI, APEI, Add ERST record ID cache APEI ERST firmware interface and implementation has no multiple users in mind. For example, if there is four records in storage with ID: 1, 2, 3 and 4, if two ERST readers enumerate the records via GET_NEXT_RECORD_ID as follow, reader 1 reader 2 1 2 3 4 -1 -1 where -1 signals there is no more record ID. Reader 1 has no chance to check record 2 and 4, while reader 2 has no chance to check record 1 and 3. And any other GET_NEXT_RECORD_ID will return -1, that is, other readers will has no chance to check any record even they are not cleared by anyone. This makes raw GET_NEXT_RECORD_ID not suitable for used by multiple users. To solve the issue, an in-memory ERST record ID cache is designed and implemented. When enumerating record ID, the ID returned by GET_NEXT_RECORD_ID is added into cache in addition to be returned to caller. So other readers can check the cache to get all record ID available. Signed-off-by: Huang Ying Reviewed-by: Andi Kleen Signed-off-by: Len Brown commit 0562e0bad483d10e9651fbb8f21dc3d0bad57374 Author: Jiaying Zhang Date: Mon Mar 21 21:38:05 2011 -0400 ext4: add more tracepoints and use dev_t in the trace buffer - Add more ext4 tracepoints. - Change ext4 tracepoints to use dev_t field with MAJOR/MINOR macros so that we can save 4 bytes in the ring buffer on some platforms. - Add sync_mode to ext4_da_writepages, ext4_da_write_pages, and ext4_da_writepages_result tracepoints. Also remove for_reclaim field from ext4_da_writepages since it is usually not very useful. Signed-off-by: Jiaying Zhang Signed-off-by: "Theodore Ts'o" commit 4596fe07679ff0fae904515691ea747467614871 Author: Eric Sandeen Date: Mon Mar 21 21:25:13 2011 -0400 ext4: don't kfree uninitialized s_group_info members We can call kfree on uninitialized members of the s_group_info array on an the error path. We can avoid this by kzalloc'ing the array. This doesn't entirely solve the oops on mount if we fail down this path; failed_mount4: frees the sbi, for one, which gets referenced later in the failed mount paths - I haven't worked that out yet. https://bugzilla.kernel.org/show_bug.cgi?id=30872 Reported-by: Eugene A. Shatokhin Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" commit 675071a2ef3f4a6d25ee002a7437d50431168344 Author: Eric W. Biederman Date: Mon Mar 21 18:24:53 2011 -0700 veth: Fix the byte counters Commit 44540960 "veth: move loopback logic to common location" introduced a bug in the packet counters. I don't understand why that happened as it is not explained in the comments and the mut check in dev_forward_skb retains the assumption that skb->len is the total length of the packet. I just measured this emperically by setting up a veth pair between two noop network namespaces setting and attempting a telnet connection between the two. I saw three packets in each direction and the byte counters were exactly 14*3 = 42 bytes high in each direction. I got the actual packet lengths with tcpdump. So remove the extra ETH_HLEN from the veth byte count totals. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 9d2a8fa96a44ba242de3a6f56acaef7a40a97b97 Author: Eric W. Biederman Date: Mon Mar 21 18:23:34 2011 -0700 net ipv6: Fix duplicate /proc/sys/net/ipv6/neigh directory entries. When I was fixing issues with unregisgtering tables under /proc/sys/net/ipv6/neigh by adding a mount point it appears I missed a critical ordering issue, in the ipv6 initialization. I had not realized that ipv6_sysctl_register is called at the very end of the ipv6 initialization and in particular after we call neigh_sysctl_register from ndisc_init. "neigh" needs to be initialized in ipv6_static_sysctl_register which is the first ipv6 table to initialized, and definitely before ndisc_init. This removes the weirdness of duplicate tables while still providing a "neigh" mount point which prevents races in sysctl unregistering. This was initially reported at https://bugzilla.kernel.org/show_bug.cgi?id=31232 Reported-by: sunkan@zappa.cx Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit d5cd92448fded12c91f7574e49747c5f7d975a8d Author: Eric W. Biederman Date: Mon Mar 21 18:22:22 2011 -0700 macvlan: Fix use after free of struct macvlan_port. When the macvlan driver was extended to call unregisgter_netdevice_queue in 23289a37e2b127dfc4de1313fba15bb4c9f0cd5b, a use after free of struct macvlan_port was introduced. The code in dellink relied on unregister_netdevice actually unregistering the net device so it would be safe to free macvlan_port. Since unregister_netdevice_queue can just queue up the unregister instead of performing the unregiser immediately we free the macvlan_port too soon and then the code in macvlan_stop removes the macaddress for the set of macaddress to listen for and uses memory that has already been freed. To fix this add a reference count to track when it is safe to free the macvlan_port and move the call of macvlan_port_destroy into macvlan_uninit which is guaranteed to be called after the final macvlan_port_close. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit ac0a121d7906b049dfee3649f886c969fbb3c1b7 Author: Neil Horman Date: Mon Mar 21 18:20:26 2011 -0700 net: fix incorrect spelling in drop monitor protocol It was pointed out to me recently that my spelling could be better :) Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit 4f2d56c45fec7c15169599cab05e9f6df18769d0 Author: Jan Altenberg Date: Mon Mar 21 18:19:26 2011 -0700 can: c_can: Do basic c_can configuration _before_ enabling the interrupts I ran into some trouble while testing the SocketCAN driver for the BOSCH C_CAN controller. The interface is not correctly initialized, if I put some CAN traffic on the line, _while_ the interface is being started (which means: the interface doesn't come up correcty, if there's some RX traffic while doing 'ifconfig can0 up'). The current implementation enables the controller interrupts _before_ doing the basic c_can configuration. I think, this should be done the other way round. The patch below fixes things for me. Signed-off-by: Jan Altenberg Acked-by: Kurt Van Dijck Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit b20e7bbfc7a15a4182730f0936433145992b4b06 Author: Arnd Bergmann Date: Mon Mar 21 18:18:00 2011 -0700 net/appletalk: fix atalk_release use after free The BKL removal in appletalk introduced a use-after-free problem, where atalk_destroy_socket frees a sock, but we still release the socket lock on it. An easy fix is to take an extra reference on the sock and sock_put it when returning from atalk_release. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller commit 674f2115995b7b588cbf3540c9f9b2448a8c7ea8 Author: Eric Dumazet Date: Mon Mar 21 18:16:39 2011 -0700 ipx: fix ipx_release() Commit b0d0d915d1d1a0 (remove the BKL) added a regression, because sock_put() can free memory while we are going to use it later. Fix is to delay sock_put() _after_ release_sock(). Reported-by: Ingo Molnar Tested-by: Ingo Molnar Signed-off-by: Eric Dumazet Acked-by: Arnd Bergmann Signed-off-by: David S. Miller commit 20246a800389fe5442675c59863fec5a4f520c7c Author: Eric Dumazet Date: Mon Mar 21 18:12:54 2011 -0700 snmp: SNMP_UPD_PO_STATS_BH() always called from softirq We dont need to test if we run from softirq context, we definitely are. This saves few instructions in ip_rcv() & ip_rcv_finish() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8aa525a9340da4227797a06221ca08399006635f Author: James Chapman Date: Mon Mar 21 18:10:25 2011 -0700 l2tp: fix possible oops on l2tp_eth module unload A struct used in the l2tp_eth driver for registering network namespace ops was incorrectly marked as __net_initdata, leading to oops when module unloaded. BUG: unable to handle kernel paging request at ffffffffa00ec098 IP: [] ops_exit_list+0x7/0x4b PGD 142d067 PUD 1431063 PMD 195da8067 PTE 0 Oops: 0000 [#1] SMP last sysfs file: /sys/module/l2tp_eth/refcnt Call Trace: [] ? unregister_pernet_operations+0x32/0x93 [] ? unregister_pernet_device+0x2b/0x38 [] ? sys_delete_module+0x1b8/0x222 [] ? do_munmap+0x254/0x318 [] ? page_fault+0x25/0x30 [] ? system_call_fastpath+0x16/0x1b Signed-off-by: James Chapman Signed-off-by: David S. Miller commit b8413f98f997bb3ed7327e6d7117e7e91ce010c3 Author: Trond Myklebust Date: Mon Mar 21 15:37:01 2011 -0400 NFS: Fix a hang/infinite loop in nfs_wb_page() When one of the two waits in nfs_commit_inode() is interrupted, it returns a non-negative value, which causes nfs_wb_page() to think that the operation was successful causing it to busy-loop rather than exiting. It also causes nfs_file_fsync() to incorrectly report the file as being successfully committed to disk. This patch fixes both problems by ensuring that we return an error if the attempts to wait fail. Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit a454f0ccefbfdbfc0e1aa8a5f8010af5e48b8845 Author: Wei Yongjun Date: Mon Mar 21 18:08:28 2011 -0700 xfrm: Fix initialize repl field of struct xfrm_state Commit 'xfrm: Move IPsec replay detection functions to a separate file' (9fdc4883d92d20842c5acea77a4a21bb1574b495) introduce repl field to struct xfrm_state, and only initialize it under SA's netlink create path, the other path, such as pf_key, ipcomp/ipcomp6 etc, the repl field remaining uninitialize. So if the SA is created by pf_key, any input packet with SA's encryption algorithm will cause panic. int xfrm_input() { ... x->repl->advance(x, seq); ... } This patch fixed it by introduce new function __xfrm_init_state(). Pid: 0, comm: swapper Not tainted 2.6.38-next+ #14 Bochs Bochs EIP: 0060:[] EFLAGS: 00010206 CPU: 0 EIP is at xfrm_input+0x31c/0x4cc EAX: dd839c00 EBX: 00000084 ECX: 00000000 EDX: 01000000 ESI: dd839c00 EDI: de3a0780 EBP: dec1de88 ESP: dec1de64 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process swapper (pid: 0, ti=dec1c000 task=c09c0f20 task.ti=c0992000) Stack: 00000000 00000000 00000002 c0ba27c0 00100000 01000000 de3a0798 c0ba27c0 00000033 dec1de98 c0786848 00000000 de3a0780 dec1dea4 c0786868 00000000 dec1debc c074ee56 e1da6b8c de3a0780 c074ed44 de3a07a8 dec1decc c074ef32 Call Trace: [] xfrm4_rcv_encap+0x22/0x27 [] xfrm4_rcv+0x1b/0x1d [] ip_local_deliver_finish+0x112/0x1b1 [] ? ip_local_deliver_finish+0x0/0x1b1 [] NF_HOOK.clone.1+0x3d/0x44 [] ip_local_deliver+0x3e/0x44 [] ? ip_local_deliver_finish+0x0/0x1b1 [] ip_rcv_finish+0x30a/0x332 [] ? ip_rcv_finish+0x0/0x332 [] NF_HOOK.clone.1+0x3d/0x44 [] ip_rcv+0x20b/0x247 [] ? ip_rcv_finish+0x0/0x332 [] __netif_receive_skb+0x373/0x399 [] netif_receive_skb+0x4b/0x51 [] cp_rx_poll+0x210/0x2c4 [8139cp] [] net_rx_action+0x9a/0x17d [] __do_softirq+0xa1/0x149 [] ? __do_softirq+0x0/0x149 Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit b31268ac793fd300da66b9c28bbf0a200339ab96 Author: Trond Myklebust Date: Mon Mar 21 17:02:00 2011 -0400 FS: Use stable writes when not doing a bulk flush If we're only doing a single write, and there are no other unstable writes being queued up, we might want to just flip to using a stable write RPC call. Reviewed-by: NeilBrown Signed-off-by: Trond Myklebust commit 21149d611ecd0faf60f4ef94aa2bf8ed872f92bf Author: Robin Dong Date: Mon Mar 21 20:39:22 2011 -0400 ext4: add missing space in printk's in __ext4_grp_locked_error() When we do performence-testing on ext4 filesystem, we observed a warning like this: EXT4-fs error (device sda7): ext4_mb_generate_buddy:718: group 259825901 blocks in bitmap, 26057 in gd instead, it should be "group 2598, 25901 blocks in bitmap, 26057 in gd" Reviewed-by: Coly Li Cc: Tao Ma Signed-off-by: Robin Dong Signed-off-by: "Theodore Ts'o" commit 02adb1cc765b8c29dc83c6602bda19003cce62f1 Author: Sakari Ailus Date: Wed Mar 3 12:49:38 2010 -0300 [media] v4l: subdev: Events support Provide v4l2_subdevs with v4l2_event support. Subdev drivers only need very little to support events. Signed-off-by: Sakari Ailus Signed-off-by: David Cohen Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ea8aa4349e11c62242a8908fc172de27d7a151d7 Author: Laurent Pinchart Date: Wed Dec 9 08:39:54 2009 -0300 [media] v4l: subdev: Control ioctls support Pass the control-related ioctls to the subdev driver through the control framework. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3dd5ee0801ee10e5632b40fd8d0495417b32910a Author: Laurent Pinchart Date: Wed Dec 9 08:38:52 2009 -0300 [media] v4l: subdev: Uninline the v4l2_subdev_init function The function isn't small or performance sensitive enough to be inlined. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2096a5dcf9704f5a86ecba37169eb813aaf0431c Author: Laurent Pinchart Date: Wed Dec 9 08:38:49 2009 -0300 [media] v4l: subdev: Add device node support Create a device node named subdevX for every registered subdev. As the device node is registered before the subdev core::s_config function is called, return -EGAIN on open until initialization completes. Signed-off-by: Laurent Pinchart Signed-off-by: Vimarsh Zutshi Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0070d91e5b5ae594116202ab7d62d8264830b1cd Author: Laurent Pinchart Date: Mon May 31 05:33:06 2010 -0300 [media] v4l: subdev: Don't require core operations There's no reason to require subdevices to implement the core operations. Remove the check for non-NULL core operations when initializing the subdev. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fc0a80798576f80ca10b3f6c9c7097f12fd1d64e Author: Laurent Pinchart Date: Mon Jul 12 11:09:41 2010 -0300 [media] v4l: Share code between video_usercopy and video_ioctl2 The two functions are mostly identical. They handle the copy_from_user and copy_to_user operations related with V4L2 ioctls and call the real ioctl handler. Create a __video_usercopy function that implements the core of video_usercopy and video_ioctl2, and call that function from both. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 9f00edaef8a8741a2d5333676fe9aa23a2a3d2be Author: Laurent Pinchart Date: Sun Feb 27 14:38:19 2011 -0300 [media] v4l: videobuf2: Typo fix vb2_get_plane_payload() gets the bytesused field for a plane, it doesn't set it. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit b251e618470fee811535123c2775dfcf2b8223ab Author: Justin P. Mattock Date: Fri Feb 25 03:11:36 2011 -0300 [media] drivers:media:cx231xx.h remove one to many l's in the word The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Mauro Carvalho Chehab commit f41e4e99404ad7a6afce2817843336c681b63e46 Author: Justin P. Mattock Date: Fri Feb 25 03:11:17 2011 -0300 [media] drivers:media:cx23418.h remove one to many l's in the word The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Mauro Carvalho Chehab commit 0cd301f19a91b3e1fb4130dcd9106777003ed4ed Author: Arnd Bergmann Date: Wed Mar 2 17:15:15 2011 -0300 [media] staging/cx25721: serialize access to devlist Out of the three files accessing the device list, one uses a mutex, one uses the BKL and one does not have any locking. That is of course pointless, so let's make all of them use the same mutex, and get rid of one more BKL user. Signed-off-by: Arnd Bergmann Signed-off-by: Palash Bandyopadhyay Signed-off-by: Mauro Carvalho Chehab commit dc46b8c8e3d7e6c7c7ddb78fc2137a5462e98679 Author: Dmitri Belimov Date: Tue Mar 1 01:55:11 2011 -0300 [media] tm6000: add audio conf for new cards Add configuration of an audio for our new TV cards. With my best regards, Dmitry. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit fd5466d1dfeba87155c7af70b7d53faa60960c19 Author: Igor M. Liplianin Date: Sun Feb 27 16:22:52 2011 -0300 [media] dw2102: prof 1100 corrected Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit b16af29a561c92ed76b5b882dd68bb082b07a09b Author: Igor M. Liplianin Date: Sun Feb 27 16:22:57 2011 -0300 [media] dw2102: i2c transfer corrected for yet another cards Related to Acorp DS120 and some revisions of DVBWorld DW2102. If you read three or more registers at one time, you get wrong value for third etc. Actually, it didn't affect the driver as it reads registers only by one at a time. But it needs to correct. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit a84adf4007d80249cbe04da4ee80689a8cfdffda Author: Igor M. Liplianin Date: Sun Feb 27 16:18:38 2011 -0300 [media] dw2102: i2c transfer corrected for some cards Prof 7500 and TeVii s630, s660, s480 works better now Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit e86e4dfa5a436ccbef9ea4f7c28907aef40b875f Author: Igor M. Liplianin Date: Sun Feb 27 16:18:34 2011 -0300 [media] dw2102: remove unnecessary delays for i2c transfer for some cards Prof 7500 and TeVii s630, s660, s480 works faster now Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 5265ea54bf442cef83bcbb8b5da03d1fdb37bcb8 Author: Igor M. Liplianin Date: Sun Feb 27 16:17:25 2011 -0300 [media] dw2102: X3M TV SPC1400HD added The card consist of PCI to USB bridge and USB DVB-S2 receiver. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 738e8ff90fae01dccc9e7f92e0cfa4819567dbb8 Author: Igor M. Liplianin Date: Sun Feb 27 17:29:55 2011 -0300 [media] ds3000: wrong hardware tune function implemented It is taken from another tree, where it is modified. Patch to fix that Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 3b30e0a871389eda9034084faec67d43478fb4c0 Author: Abylay Ospan Date: Mon Feb 14 16:03:13 2011 -0300 [media] stv0900: Update status when LOCK is missed Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 38cdbce7634bdd914b6c6e673c2f6ebedca30d43 Author: Igor M. Liplianin Date: Mon Feb 28 16:52:08 2011 -0300 [media] stv0900: speed up DVB-S searching Simptoms: After zapping DVB-S2 channel searching for DVB-S tooks long time. Now it takes less than a second. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 050b648e63b6a3afd22181d6c2113c315113e4db Author: Igor M. Liplianin Date: Sun Feb 27 18:08:46 2011 -0300 [media] cx23885, altera-ci: remove operator return in void procedure Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit b00aff6a36aeafc68cf9044751041ba432ab4495 Author: Dan Carpenter Date: Wed Jan 19 11:28:27 2011 -0300 [media] dib9000: fix return type in dib9000_mbx_send_attr() dib9000_mbx_send_attr() returns an int. It doesn't work to save negative error codes in an unsigned char, so I've made "ret" an int type. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit ed54c0e33c6ac72c681f00a41b47840f6570262c Author: Dan Carpenter Date: Wed Jan 19 11:27:58 2011 -0300 [media] dib8000: fix small memory leak on error kfree(state) if fe allocation fails. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 40285f832b09feb621d8da9db7983200a4b29311 Author: Matti Aaltonen Date: Tue Mar 1 10:10:37 2011 -0300 [media] ASoC: WL1273 FM radio: Access I2C IO functions through pointers These changes are needed to keep up with the changes in the MFD core and V4L2 parts of the wl1273 FM radio driver. Use function pointers instead of exported functions for I2C IO. Also move all preprocessor constants from the wl1273.h to include/linux/mfd/wl1273-core.h. Also update the year in the copyright statement. Signed-off-by: Matti J. Aaltonen Acked-by: Mark Brown Signed-off-by: Mauro Carvalho Chehab commit 96a9cc681ecfaf2ed9b6c62090888550f604d783 Author: Matti Aaltonen Date: Tue Mar 1 10:10:36 2011 -0300 [media] V4L2: WL1273 FM Radio: TI WL1273 FM radio driver This module implements V4L2 controls for the Texas Instruments WL1273 FM Radio and handles the communication with the chip. Signed-off-by: Matti J. Aaltonen Signed-off-by: Mauro Carvalho Chehab commit 94fd5b7401e330498331ea3667d796e74c63d08a Author: Matti Aaltonen Date: Tue Mar 1 10:10:35 2011 -0300 [media] MFD: WL1273 FM Radio: MFD driver for the FM radio This is the core of the WL1273 FM radio driver, it connects the two child modules. The two child drivers are drivers/media/radio/radio-wl1273.c and sound/soc/codecs/wl1273.c. The radio-wl1273 driver implements the V4L2 interface and communicates with the device. The ALSA codec offers digital audio, without it only analog audio is available. Signed-off-by: Matti J. Aaltonen Acked-by: Samuel Ortiz Signed-off-by: Mauro Carvalho Chehab commit 3822f18d8f1c2cf13ade623b2bba6d4a7a1a3f53 Author: Mauro Carvalho Chehab Date: Tue Mar 1 16:03:11 2011 -0300 [media] DocBook/v4l2.xml: Update version of the spec Signed-off-by: Mauro Carvalho Chehab commit a602d520acd331ba8bbc02aacccb5e9a0f561f25 Author: Mauro Carvalho Chehab Date: Tue Mar 1 10:12:36 2011 -0300 [media] DocBook: Document the removal of the old VIDIOC_*_OLD ioctls Those ioctls passed away. Properly documented it. Signed-off-by: Mauro Carvalho Chehab commit f6a373fb0569c98d6a44108f5e879f06abd46df3 Author: Mauro Carvalho Chehab Date: Tue Mar 1 09:48:27 2011 -0300 [media] videodev2.h.xml: Update to reflect videodev2.h changes A few changes happened at videodev2.h: - Addition of multiplane API; - removal of VIDIOC_*_OLD ioctls; - a few more video standards. Update the file to reflect the latest changes. Signed-off-by: Mauro Carvalho Chehab commit d4c9adb742abd1e8025b6f2e3bb24e3efab86da9 Author: Mauro Carvalho Chehab Date: Tue Mar 1 08:17:47 2011 -0300 matrox: Remove legacy VIDIOC_*_OLD ioctls Those ioctls were produced by the wrong arguments for _IO macros, and were replaced by fixed versions on an early 2.6 kernel. Signed-off-by: Mauro Carvalho Chehab commit 1b149bbe9156d2eb2afd5a072bd61ad0d4bfaca7 Author: Randy Dunlap Date: Sun Feb 27 14:51:54 2011 -0300 [media] media/radio/wl1273: fix build errors RADIO_WL1273 needs to make sure that the mfd core is built to avoid build errors: ERROR: "mfd_add_devices" [drivers/mfd/wl1273-core.ko] undefined! ERROR: "mfd_remove_devices" [drivers/mfd/wl1273-core.ko] undefined! Signed-off-by: Randy Dunlap Cc: Matti Aaltonen Signed-off-by: Mauro Carvalho Chehab commit 0522921c0f89f274a99d5084ca0a6fd370749cc8 Author: Daniel Drake Date: Fri Feb 11 18:15:02 2011 -0300 [media] via-camera: Add suspend/resume support Add suspend/resume support to the via-camera driver, so that the video continues streaming over a suspend-resume cycle. Originally implemented by Jon Corbet. [mchehab@redhat.com: fix a small CodingStyle issue] Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 498e677cfd78b098342640f382293782bfa0bd63 Author: Lukas Max Fisch Date: Tue Feb 8 16:51:45 2011 -0300 [media] Technisat AirStar TeleStick 2 Based on staging 2.6.39. This patch is based on Veit Berwig's work. Signed-off-by: Lukas Fisch Thanks-to: Veit Berwig Signed-off-by: Mauro Carvalho Chehab commit 07988007f8dd2827ba1eb39e6e3c5bbb29cfc30b Author: Dan Carpenter Date: Tue Feb 15 07:10:08 2011 -0300 [media] stv090x: handle allocation failures kmalloc() can fail so check whether state->internal is NULL. append_internal() can return NULL on allocation failures so check that. Also if we hit the error condition later in the function then there is a memory leak and we need to call remove_dev() to fix it. Also Oliver Endriss pointed out an additional leak that I missed in the first version of this patch. Signed-off-by: Dan Carpenter Acked-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 57f05bfa2e90fe52fa36755f4cb91e6f495f8353 Author: Manjunatha Halli Date: Mon Jan 24 02:26:59 2011 -0300 [media] drivers:media:radio: Update Kconfig and Makefile for wl128x FM driver Signed-off-by: Manjunatha Halli Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a68793d2dac1f753b82e55fb5c6b7dccff1ca4e4 Author: Manjunatha Halli Date: Tue Jan 11 06:39:22 2011 -0300 [media] drivers:media:radio: wl128x: Kconfig & Makefile for wl128x driver Signed-off-by: Manjunatha Halli Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8b7a186c9b9322a4519af710736210bf8d5aa7a7 Author: Manjunatha Halli Date: Tue Jan 11 06:37:53 2011 -0300 [media] drivers:media:radio: wl128x: FM driver TX sources This has implementation for FM TX functionality. It communicates with FM V4l2 module and FM common module. Signed-off-by: Manjunatha Halli Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 59da522a4e1eaa10e3cbb7b86ec94dc42eff0ede Author: Manjunatha Halli Date: Tue Jan 11 06:37:17 2011 -0300 [media] drivers:media:radio: wl128x: FM driver RX sources This has implementation for FM RX functionality. It communicates with FM V4l2 module and FM common module Signed-off-by: Manjunatha Halli Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e8454ff7b9a4d56f02c095bff12d3c92ef4c7fa6 Author: Manjunatha Halli Date: Tue Jan 11 06:35:22 2011 -0300 [media] drivers:media:radio: wl128x: FM Driver Common sources These are the sources for the common interfaces required by the FM V4L2 driver for TI WL127x and WL128x chips. These implement the FM channel-8 protocol communication with the chip. This makes use of the Shared Transport as its transport. Signed-off-by: Manjunatha Halli Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7e38849631c2f570fe66b52b5b54697fe338f194 Author: Manjunatha Halli Date: Tue Jan 11 06:34:26 2011 -0300 [media] drivers:media:radio: wl128x: FM Driver V4L2 sources This module interfaces V4L2 subsystem and FM common module. It registers itself with V4L2 as Radio module. Signed-off-by: Manjunatha Halli Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8d19824ba2ef37ff989bee5941c87b45c4c6f468 Author: Manjunatha Halli Date: Tue Jan 11 06:33:18 2011 -0300 [media] drivers:media:radio: wl128x: FM Driver common header file These are common headers used in FM submodules (FM V4L2, FM common, FM Rx,and FM TX). Signed-off-by: Manjunatha Halli Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7fd4b41f053681cccf188cc1731ae43fe38fa969 Author: Paul Cassella Date: Sat Feb 12 10:39:51 2011 -0300 [media] ivtv: yuv: handle get_user_pages() -errno returns get_user_pages() may return -errno, such as -EFAULT. So don't blindly use its return value as an offset into dma->map[] for the next get_user_pages() call. Since we'll give up and return an error if either fails, don't even make the second call if the first failed to give us exactly what we were looking for. The old code would also call put_page() on as many elements of dma->map[] as we'd asked for, regardless of how many were valid. [Andy Walls modified this patch to return -EFAULT instead of -EINVAL as Paul's observation "I'm not sure -EINVAL is the best return code vs -EFAULT or -ENOMEM, [...]" was correct. The return value bubbles up as a return code for write(), for which the V4L2 API spec indicates EINVAL is incorrect and EFAULT is correct.] Signed-off-by: Paul Cassella Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 0d44b1235c60bf3134f5730ebb4a115f857a2da4 Author: Andy Walls Date: Tue Feb 8 22:39:28 2011 -0300 [media] ivtv: Fix sparse warning regarding a user pointer in ivtv_write_vbi_from_user() Fix the first, botched attempt at preventing direct use of a user pointer in ivtv_write_vbi(). Reported-by: Dr. David Alan Gilbert Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 793e71b667856ed6163ad0dc7de1f453e9385590 Author: Paul Cassella Date: Tue Feb 8 22:22:52 2011 -0300 [media] ivtv: udma: handle get_user_pages() returning fewer pages than we asked for get_user_pages() may return fewer page than we ask for. As we give up and return an error in this case, we need to put_page() each of the pages we did get. [Andy Walls modified the patch, only removing the braces in the 'for' statement, to eliminate a checkpatch warning.] Signed-off-by: Paul Cassella Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit e45c2be9704381971d78d711e58dec35b1c4cf6f Author: Paul Cassella Date: Tue Feb 8 21:07:00 2011 -0300 [media] Documentation: README.ivtv: Remove note that ivtvfb is not yet in the kernel ivtvfb is now in the kernel, so stop saying it's not. Signed-off-by: Paul Cassella Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 0cb73639cfbdc9a074cbb7737d173f7a7381036d Author: Igor M. Liplianin Date: Fri Feb 25 18:41:24 2011 -0300 [media] cx88: add support for TeVii S464 PCI card The card uses ds3000 demod from Montage. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit dcc8a122230b1c65ee8ba83536fd53fcaf27884d Author: Igor M. Liplianin Date: Fri Feb 25 18:41:24 2011 -0300 [media] ds3000: hardware tune algorithm Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit a5bf834b4a29b0c7f813ce1c456563c470d4181f Author: Igor M. Liplianin Date: Fri Feb 25 18:41:24 2011 -0300 [media] ds3000: add carrier offset calculation Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit cb8f74da107cf593eb50ac4968faaa5f49fbad4a Author: Igor M. Liplianin Date: Fri Feb 25 18:41:24 2011 -0300 [media] ds3000: remove unnecessary dnxt, dcur structures All necessary parameters already stored in frontend cache. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 18a73f36a2109563beee00f8be3f19f6c1fe2ff6 Author: Igor M. Liplianin Date: Fri Feb 25 18:41:23 2011 -0300 [media] ds3000: clean up in tune procedure Variable 'retune' does not make sense. Loop is not needed for only one try. Remove unnecessary dprintk's. Remove a lot of debug messages and delays. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 2f30fb49c347e8696a8784c57810b41d185707ec Author: Igor M. Liplianin Date: Fri Feb 25 18:41:23 2011 -0300 [media] dw2102: Copyright, cards list updated Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit e8f5055ac85fb68eeaa335f0dae14b31cc037f6d Author: Igor M. Liplianin Date: Fri Feb 25 18:41:23 2011 -0300 [media] dw2102: add support for the TeVii S480 PCIe The card consists of a PCI-e to USB Host Controller and two TeVii S660 equivalent cards. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 5a530cbecaa5a21d185e0549ea9a866483661f6f Author: Igor M. Liplianin Date: Fri Feb 25 18:41:23 2011 -0300 [media] dw2102: fix TeVii s660 remote control Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 52c506e09cd624cbf7d21d9c16283f3e8b32f4bc Author: Igor M. Liplianin Date: Fri Feb 25 18:41:23 2011 -0300 [media] dw2102: corrections for TeVii s660 LNB power control There are two TeVii s660 modifications with different LNB power control implementations. It is safe to call both methods for each card. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 69519c3eff2a4a164351792d70666efa900b697e Author: Igor M. Liplianin Date: Fri Feb 25 18:41:23 2011 -0300 [media] dw2102: unnecessary NULL's removed Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit d3210b5f9618fc3d231caf39ffd32fda490e3ea5 Author: Igor M. Liplianin Date: Fri Feb 25 18:41:23 2011 -0300 [media] dw2102: Prof 1100 initialization fix RC keys structure for Prof 1100 already defined, so remove extra initialization. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 4e59df8f25950520cd6a8b16a39d48b5fa5aeeda Author: Igor M. Liplianin Date: Fri Feb 25 18:41:23 2011 -0300 [media] dw2102: Prof 7500 remote fix Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit fa8bae102fbbabe9ecc4381ace3b74a199684594 Author: Igor M. Liplianin Date: Fri Feb 25 18:41:22 2011 -0300 [media] dw2102: Prof 7500: Lock LED implemented Code changed for dw2102, stv0900 in order to achieve that. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 2adc591fb7764bf70f65a5923ff50c1c1b671c20 Author: Igor M. Liplianin Date: Fri Feb 25 18:41:22 2011 -0300 [media] dw2102: Add Terratec Cinergy S2 USB HD MarkusF wrote: I accidently got a Terratec Cinergy S2 USB HD (instead of a Terratec Cinergy S2 PCI HD). I found in the windows driver, that the driver is for the usb ids: 0CCD:00A8 1F4D:3000 The dvb-s2 usb adapter has the id 0CCD-00A8. So I patches your driver and added the usb id, where the 1F4D:3000 is and it worked (after I downloaded the firmware dvb-fe-ds3000.fw). w_scan found the channels and vdr is working fine. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit d2ffc447cabb3a497d7f413403abd8793b348329 Author: Igor M. Liplianin Date: Fri Feb 25 18:41:22 2011 -0300 [media] dw2102: add support for Geniatech SU3000 USB DVB-S2 card The card uses ds3000 demod from Montage. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 195288da53e03c35f97df8fa08f48f5b625bfb4e Author: Igor M. Liplianin Date: Fri Feb 25 18:41:22 2011 -0300 [media] dw2102: use separate firmwares for Prof 1100, TeVii S630, S660 Before this patch we can use only one card type from list due to sharing one firmware name. Now it's fixed. Also driver tries to attach only appropriate demod for this cards. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit feb16e9833ad06ac00f23c1abf1e7d649192e3f5 Author: Igor M. Liplianin Date: Fri Feb 25 18:41:22 2011 -0300 [media] dw2102: Extend keymap parameter for not used remote Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit ba0fd56a4fbb92999554a2e417924796c2ad2f8f Author: Jesper Juhl Date: Sun Feb 6 17:49:02 2011 -0300 [media] TTUSB DVB: ttusb_boot_dsp() needs to release_firmware() or it leaks memory In drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c:ttusb_boot_dsp() we need to call release_firmware(fw) before returning or we'll leak - no matter if we succeed or fail. Signed-off-by: Jesper Juhl Signed-off-by: Mauro Carvalho Chehab commit 19a0a296f2df31c24f87fd3e7ee7f2640e49e5d4 Author: Mike Isely Date: Sun Feb 13 17:57:19 2011 -0300 [media] pvrusb2: Use sysfs_attr_init() where appropriate Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 058caa878476a09159e2fcc65463b9174c4fde8d Author: Mike Isely Date: Sun Feb 13 17:53:07 2011 -0300 [media] pvrusb2: Minor VBI tweak to help potential CC support pvrusb2: Declare closed-caption setup for line 21 - this is needed for sliced VBI capture support. (However none of that works right now anyway.) Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 6188a0f151204d6f895822e8c0059b8951879a42 Author: Servaas Vandenberghe Date: Sun Feb 13 17:51:09 2011 -0300 [media] pvrusb2: width and height maximum values pvrusb2: The origin of the capability bounds rectangle may differ from (left=0,top=0) so the calculation should use absolute coordinates, here below, or use relative coordinates like cropl_val-cap->bounds.left and cropt_val-cap->bounds.top. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 35fa5d4c48fbb02d637c3659f00331aa33f0f029 Author: Mike Isely Date: Sun Feb 13 17:34:33 2011 -0300 [media] pvrusb2: Fix a few missing default control values, for cropping Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 4cfe3319a11613690c3cd755b890149d0532c833 Author: Mike Isely Date: Sun Feb 13 17:32:47 2011 -0300 [media] pvrusb2: Minor cosmetic code tweak Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 9bf98321b4894b1e6787b4b93cd8fb81906a0f79 Author: Mike Isely Date: Sun Feb 13 17:31:55 2011 -0300 [media] pvrusb2: Handle change of mode before handling change of video standard pvrusb2: Recognize and handle mode change before dealing with changes related to the video standard. Even though the video standard should only matter when in analog mode, doing this way is technically cleaner in case there's other stuff that might depend on both. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 2b74334d12914eb10b8dac90300c3799a2115569 Author: Malcolm Priestley Date: Sun Feb 6 12:29:51 2011 -0300 [media] dvb_pll: DVB-S incorrect tune settings for dw2102/dm1105/cx88/opera1 This tuner PLL has missing initialisation settings resulting in haphazard tuning. The PLL LPF was set to just 22000 symbol rate. Basically, the module is a Sharp BS2F7HZ0194 (STV0299+IX2410) I have had problems implementing the PLL in a new driver and did not want to break the IX2410 out of the PLL. This applies to DW2102, DM1105, CX88 and OPERA1 drivers. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit 92374e886c7518387e6816dedfe60fc7bdfa8fdd Author: Stefan Richter Date: Sun Feb 6 11:41:44 2011 -0300 [media] firedtv: drop obsolete backend abstraction Since the drivers/ieee1394/ backend was removed from firedtv, its I/O no longer needs to be abstracted as exchangeable backend methods. Also, ieee1394 variants of module and device probe and removal are no longer there. Move module probe and removal into firedtv-fw.c where device probe and removal are implemented. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 14ddc3188d50855ae2a419a6aced995e2834e5d4 Author: Vasiliy Kulikov Date: Fri Feb 4 09:23:33 2011 -0300 [media] video: sn9c102: world-wirtable sysfs files Don't allow everybody to change video settings. Signed-off-by: Vasiliy Kulikov Acked-by: Mauro Carvalho Chehab Acked-by: Luca Risolia Signed-off-by: Mauro Carvalho Chehab commit 8aff8ba95155dff265de5ea6f5d5d92caa7bc728 Author: Dmitri Belimov Date: Thu Feb 17 22:11:05 2011 -0300 [media] tm6000: add radio support to the driver Changes: Add function tm6000_set_reg_mask for change some bits in regs. Very usefull, simplify some code with this function. Add control mute Add control volume Add control audio input MUX Add support radio Radio works well. TV works too Known bugs: The programm gnomeradio can't set freq for radio, it use old v4l API. Audio over USB works via arecord. The programm mplayer can set freq but no any audio mplayer -v -rawaudio rate=48000 radio://105.2/capture driver=v4l2:alsa:adevice=hw.1,0:amode=1:audiorate=48000:forceaudio:immediatemode=0 When start watch TV very shortly after radio the kernel crashed hardly. Didn't stop all USB URBs, need some time for stop. [mchehab@redhat.com: fix merge conflicts] Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 6ca000479fdb80b9059b69c67c82f8dc0d5f5d47 Author: Holger Nelson Date: Thu Feb 3 01:59:29 2011 -0300 [media] tm6000: Add support for Terratec Grabster AV 150/250 MX This patch adds support for Terratec Grabster AV 150/250 MX. For now it is only possible to use composite input as switching inputs does not work. [mchehab@redhat.com: Fix merge conflicts and simplify board entries] Signed-off-by: Holger Nelson Signed-off-by: Mauro Carvalho Chehab commit 1f65dd365831ff6836eeaf66c9d7bf1ae46ac4d2 Author: Dmitri Belimov Date: Wed Feb 2 12:15:52 2011 -0300 [media] tm6000: add new TV cards of Beholder Add two new TV cards of Beholder. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit b9bf2eafaad9c1ef02fb3db38c74568be601a43a Author: Igor M. Liplianin Date: Tue Feb 1 19:40:36 2011 -0300 [media] ds3000: don't load firmware during demod init Speed up tuning, as firmware is not necessary to load every attempt to tune Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit caa687c805332a384afd292e2b20e25a6282ed66 Author: Igor M. Liplianin Date: Tue Feb 1 19:40:25 2011 -0300 [media] ds3000: loading firmware in bigger chunks Decrease firmware loading time. Before it is ~4000 i2c calls, now it is ~256 i2c calls to load ds3000 firmware. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 2a66bf370c2aca617fad8dd8fe6c276d6bb1b44c Author: Igor M. Liplianin Date: Tue Feb 1 19:40:17 2011 -0300 [media] ds3000: decrease mpeg clock output TeVii s480 works fine with that on DVB-S2 channels Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit a0ea298d57153cf71f9f7628830dbba1a9a8a15d Author: Igor M. Liplianin Date: Tue Feb 1 19:40:03 2011 -0300 [media] ds3000: fill in demod init function Make some initializations in init, not in tune function Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 6951803c2402d1af0e76df051cc9b117f504550f Author: Lawrence Rust Date: Sun Feb 6 17:46:12 2011 -0300 [media] Add proper audio support for Nova-S Plus with wm8775 ADC This patch adds audio DMA capture and ALSA mixer elements for the line input jack of the Hauppauge Nova-S-plus DVB-S PCI card. The Nova-S-plus has a WM8775 ADC that is currently not detected. This patch enables this chip and exports volume, balance mute and ALC elements for ALSA mixer controls. [mchehab@redhat.com: Changed the patch to only talk with wm8775 if board info says so. Also, added platform_data support, to avoid changing the behaviour for other boards, and fixed CodingStyle] [awalls@md.metrocast.net: Changed patch to make the WM8775_GID defintion bridge driver private and let the bridge driver set the value of v4l2_subdev.grp_id.] -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andy Walls commit 724dcbfa9c24af5afdaa2b7e0449e20066d6555a Author: Dmitri Belimov Date: Tue Feb 1 05:25:19 2011 -0300 [media] xc5000: add set_config and other Add one more radio input, usefull for tm6010 Add control output amplitude. Add set_config function for configure tuner when TV card hasn't dvb part. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit d1303567f7738c07c0e5fd22420a9a8e2f55a0c4 Author: Thomas Weber Date: Mon Jan 31 09:16:09 2011 -0300 [media] omap24xxcam: Fix compilation Add linux/sched.h because of missing declaration of TASK_NORMAL. This patch fixes the following error: drivers/media/video/omap24xxcam.c: In function 'omap24xxcam_vbq_complete': drivers/media/video/omap24xxcam.c:415: error: 'TASK_NORMAL' undeclared (first use in this function) drivers/media/video/omap24xxcam.c:415: error: (Each undeclared identifier is reported only once drivers/media/video/omap24xxcam.c:415: error: for each function it appears in.) Signed-off-by: Thomas Weber Signed-off-by: Mauro Carvalho Chehab commit 61ca1500c5ee04f2be34a4f58bb9baed0214b7a9 Author: Peter Huewe Date: Sun Jan 30 16:33:01 2011 -0300 [media] video/saa7164: Fix sparse warning: Using plain integer as NULL pointer This patch fixes the warning "Using plain integer as NULL pointer", generated by sparse, by replacing if (var == 0) with if (!var) after an allocation and all other offending 0s with NULL. KernelVersion: linus' tree-1f0324c Signed-off-by: Peter Huewe Signed-off-by: Mauro Carvalho Chehab commit 7ee9e64a3d7379fd443090880158374181f754cf Author: Hans Verkuil Date: Tue Jan 25 18:25:39 2011 -0300 [media] cx18: fix kernel oops when setting MPEG control before capturing The cxhdl->priv field was not set initially, only after capturing started. Signed-off-by: Hans Verkuil Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 2f2710bd4ee11a06e4c87956be4733566e288a2e Author: Igor M. Liplianin Date: Tue Jan 25 17:08:00 2011 -0300 [media] cx23885, altera-ci: enable all PID's less than 0x20 in hardware PID filter It takes too long time to scan due to low symbol rate PID's like PAT, PMT, CAT, NIT. For that matter we enabled permanently all PID's less 0x20 in hardware PID filter for NetUP Dual DVB-T/C CI RF card to combine rates. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 702dd7903bda0b83f6f6cb66fdadc4e5bbb60646 Author: Igor M. Liplianin Date: Tue Jan 25 17:07:00 2011 -0300 [media] cx23885: disable MSI for NetUP cards, otherwise CI is not working Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 10d0dcd73c619d86b8ba1c9cd753ce749f578bf4 Author: Igor M. Liplianin Date: Tue Jan 25 17:06:00 2011 -0300 [media] cx23885: implement num_fds_portb, num_fds_portc parameters for cx23885_board structure This is needed for multifrontend support. NetUP Dual DVB-T/C CI RF card has frontends connected to port B & C Each frontend has two switchable cores - DVB-T & DVB-C Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 557f48d5720b45dae07788bc9976762c363b8ad0 Author: Igor M. Liplianin Date: Tue Jan 25 17:05:00 2011 -0300 [media] cx23885: implement tuner_bus parameter for cx23885_board structure There is two external I2C buses in cx23885 chip. Currently, analog tuners supported for second I2C bus only In NetUP Dual DVB-T/C CI RF card tuners connected to first bus So, in order to support analog tuners sitting on first bus we need modifications. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 78db854757aa4110f9c6873d1529b851037a3405 Author: Igor M. Liplianin Date: Tue Jan 25 17:04:00 2011 -0300 [media] Initial commit to support NetUP Dual DVB-T/C CI RF card The card based on cx23885 PCI-e brige. Altera FPGA for CI, multistandard demods stv0367 from STM for QAM & OFDM, Xcieve xc5000 tuners and additional cx25840 for second analog input. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit e80edce1abfabf637edc68e8dd13ef0af6e46cdf Author: Igor M. Liplianin Date: Tue Jan 25 17:03:00 2011 -0300 [media] xc5000: add support for DVB-C tuning Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 17cce932e8be9a3e32e1928524b73795b3f0e3aa Author: Igor M. Liplianin Date: Tue Jan 25 17:02:00 2011 -0300 [media] Support for stv0367 multi-standard demodulator The STV0367 is a multi-standard demodulator which is capable of processing DVB-T as well as DVB-C signals. It is fully compliant with DVB-T and DVB-C recommendations for broadcast services. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 349bcf02e3615556e9c49ea73a04abab2a4d8ed7 Author: Igor M. Liplianin Date: Tue Jan 25 17:01:00 2011 -0300 [media] Altera FPGA based CI driver module An Altera FPGA CI module for NetUP Dual DVB-T/C RF CI card. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit fa766c9be58bd872784b081074a7d15a3ce61c5f Author: Igor M. Liplianin Date: Tue Jan 25 17:00:00 2011 -0300 [media] Altera FPGA firmware download module It uses STAPL files and programs Altera FPGA through JTAG. Interface to JTAG must be provided from main device module, for example through cx23885 GPIO. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit f72cfd859b0e436d9f680790cb665ad1390187ae Author: Peter Huewe Date: Tue Jan 25 17:38:52 2011 -0300 [media] video/cx231xx: Fix sparse warning: Using plain integer as NULL pointer This patch fixes the warning "Using plain integer as NULL pointer", generated by sparse, by replacing the offending 0s with NULL. Signed-off-by: Peter Huewe Reviewed-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 9bd060e492a2725c55404988ceed473a090bd04d Author: Andrew Chew Date: Thu Feb 17 19:14:33 2011 -0300 [media] V4L: Initial submit of OV9740 driver This soc_camera driver is for Omnivision's OV9740 sensor. This initial submission provides support for YUV422 output at 1280x720 (720p), which is the sensor's native resolution. 640x480 (VGA) is also supported, with cropping and scaling performed by the sensor's ISP. This driver is heavily based off of the existing OV9640 driver. Signed-off-by: Andrew Chew Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 787d0f9d5ca3e98f23af94037094a9a3fafec665 Author: Guennadi Liakhovetski Date: Wed Feb 16 18:42:24 2011 -0300 [media] V4l: sh_mobile_ceu_camera: fix cropping offset calculation Use the correct scales to calculate cropping offsets. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 379fa5d3567ca2c20843bdba06e456de51b195e9 Author: Guennadi Liakhovetski Date: Mon Feb 21 07:14:01 2011 -0300 [media] V4L: mx3_camera: convert to videobuf2 Now that soc-camera supports videobuf API v1 and v2, camera-host drivers can be converted to videobuf2 individually. This patch converts the mx3_camera driver. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit a616898d6df29b8ffaea5742f678b3ac223b307c Author: Guennadi Liakhovetski Date: Fri Feb 18 05:30:15 2011 -0300 [media] V4L: sh_mobile_ceu_camera: convert to videobuf2 Convert the sh_mobile_ceu_camera driver to the videobuf2 API. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 8eb4476d44b39fe2f5829de030328223bda2abaf Author: Guennadi Liakhovetski Date: Mon Feb 7 18:09:30 2011 -0300 [media] V4L: soc-camera: add helper functions for videobuf queue handling Add two helper inline functions to retrieve soc-camera device context from videobuf and videobuf2 queue pointers. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 592c2aba266ca5be0dce300d0400817d943d49af Author: Guennadi Liakhovetski Date: Sat Jan 29 12:44:51 2011 -0300 [media] V4L: soc-camera: extend to also support videobuf2 Extend soc-camera core to also support the videobuf2 API. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit bd94f588283b167f7fa8c2dc2164dcd2f4a4a7a5 Author: Guennadi Liakhovetski Date: Fri Jan 28 21:06:19 2011 -0300 [media] V4L: add missing EXPORT_SYMBOL* statements to vb2 videobuf2-memops and videobuf2-core can be compiled as modules, in which case 3 more symbols from videobuf2-memops.c have to be exported. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 353c2129fdff2047237193932971e50734c64336 Author: Guennadi Liakhovetski Date: Wed Feb 2 17:38:22 2011 -0300 [media] V4L: omap1_camera: join split format lines Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit a48be1d626ceb05b58a980a962214431af8041e8 Author: Alberto Panizzo Date: Mon Jan 17 06:52:10 2011 -0300 [media] V4L: mx3_camera: fix capture issues for non 8-bit per pixel formats If the camera was set to output formats like RGB565 YUYV or SBGGR10, the resulting image was scrambled due to erroneous interpretations of horizontal parameter's units. This patch in fourcc_to_ipu_pix, eliminate also the pixel formats mappings that, first are not used within mainline code and second, standing at the datasheets, they will not work properly: The IPU internal bus support only the following data formatting (44.1.1.3 Data Flows and Formats): 1 YUV 4:4:4 or RGB-8 bits per color component 2 YUV 4:4:4 or RGB-10 bits per color component 3 Generic data (from sensor to the system memory only) And format conversions are done: - from memory: unpacking from other formats to IPU supported ones - to memory: packing in the inverse order. So, assigning a packing/unpacking strategy to the IPU for those formats will produce a packing to memory and not the inverse. Signed-off-by: Alberto Panizzo Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 44facdc8c43a8b5172d6cbe995845c9889561aa0 Author: Anatolij Gustschin Date: Mon Jan 31 09:58:01 2011 -0300 [media] V4L: mx3_camera: correct 'sizeimage' value reporting The 'pix->width' field may be updated in mx3_camera_set_fmt() to fulfill the IPU stride line alignment requirements. If this update takes place, the 'fmt.pix.sizeimage' field in the struct v4l2_format stucture returned by VIDIOC_S_FMT is wrong. We need to update the 'pix->sizeimage' field in the mx3_camera_set_fmt() function to fix this issue. Signed-off-by: Anatolij Gustschin Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 5bccd60852fc0a5ccc1980c10266896df99b8bda Author: Mathias Krause Date: Sun Jan 30 07:05:58 2011 -0300 [media] V4L: omap1_camera: fix use after free Even though clk_put() is a no-op on most architectures it is not for some ARM implementations. To not fail on those, release the clock timer before freeing the surrounding structure. This bug was spotted by the semantic patch tool coccinelle using the script found at scripts/coccinelle/free/kfree.cocci. More information about semantic patching is available at http://coccinelle.lip6.fr/ Signed-off-by: Mathias Krause Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 48a3c77338d725d4976fa792d822eb940ce5c296 Author: Alberto Panizzo Date: Wed Jan 12 08:16:19 2011 -0300 [media] V4L: soc_mediabus: add a method to obtain the number of samples per pixel Add a function to calculate the number of samples on the media-bus, required to retrieve one pixel of a certain format. Signed-off-by: Alberto Panizzo Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 7fdbd85bce033e2d0f74e5d326ab43906653cb81 Author: Anatolij Gustschin Date: Mon Jan 31 09:19:32 2011 -0300 [media] V4L: soc-camera: start stream after queueing the buffers Some camera systems have strong requirement for capturing an exact number of frames after starting the stream and do not tolerate losing captured frames. By starting the stream after the videobuf has queued the buffers, we ensure that no frame will be lost. Signed-off-by: Anatolij Gustschin Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit ed5b65dc362d488958075381d97931d865e77259 Author: Qing Xu Date: Thu Jan 20 05:19:40 2011 -0300 [media] V4L: soc-camera: add enum-frame-size ioctl add vidioc_enum_framesizes implementation, follow default_g_parm() and g_mbus_fmt() method Signed-off-by: Qing Xu Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 03519b7e7ea531f5425be9d9bfe5f114e80951a0 Author: Qing Xu Date: Thu Jan 20 05:19:40 2011 -0300 [media] V4L: add enum_mbus_fsizes video operation Add enum_mbus_fsizes V4L2 subdevice video operation. Signed-off-by: Qing Xu Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit d63044401a107ef22521e62c7f9b30c40b7c44ed Author: Hans Verkuil Date: Mon Feb 7 04:37:38 2011 -0300 [media] saa7134-empress: add missing MPEG controls Reported by, and based on a patch from, Martin Dauskardt. The AUDIO_AC3_BITRATE control is still missing from this list, but such optional controls are a bit hard to handle. This will be fixed automatically when we switch to the control framework. Signed-off-by: Hans Verkuil Reported-by: Martin Dauskardt Signed-off-by: Mauro Carvalho Chehab commit e68044e2351ee937997c1e014fbbbe1c97b935cf Author: Hans Verkuil Date: Sat Feb 5 10:07:39 2011 -0300 [media] firedtv: remove obsolete ieee1394 backend code drivers/ieee1394/ has been removed in Linux 2.6.37. The corresponding backend code in firedtv is no longer built in now and can be deleted. Firedtv continues to work with drivers/firewire/. Also, fix a Kconfig menu comment: Removal of CONFIG_IEEE1394 made the "Supported FireWire (IEEE 1394) Adapters" comment disappear; bring it back with corrected dependency. Signed-off-by: Hans Verkuil Reviewed-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 7ee40aadabd59b6cab60835f0ef9cdbe385df438 Author: Hans Verkuil Date: Sat Feb 5 10:10:38 2011 -0300 [media] v4l: removal of old, obsolete ioctls Some ioctl's were defined wrong on 2.6.2 and 2.6.6, using the wrong type of R/W arguments. They were fixed, but the old ioctl names are still there, maintained to avoid breaking binary compatibility: There's no sense on preserving those forever, as it is very doubtful that someone would try to use a such old binary with a modern kernel. Removing them will allow us to remove some magic done at the V4L ioctl handler. Note that any application compiled with a videodev2.h from 2.6.7 or later will be using the correct ioctls. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dae86ccbc3c185aebfc396e8e668aa3d73d748d8 Author: Hans Verkuil Date: Sat Feb 5 09:29:31 2011 -0300 [media] dabusb: remove obsolete driver The dabusb driver was conceived as an experimental driver for a test device. The driver never supported any shipped product, and, while there were some updates for it in 2003, for an ancient product, those changes were never submitted upstream. Also, there's no DocBook for its API, nor any upstream discussion. So it was decided to remove it in 2.6.39. Future support for a DAB API should be discussed on the linux-media list first. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b287db119edb92548b53f63f05fd593c43cba200 Author: Hans Verkuil Date: Sat Feb 5 09:25:02 2011 -0300 [media] se401: remove last V4L1 driver This driver is for obsolete hardware that the old maintainer didn't care (or not have the hardware anymore), and that no other developer could find any hardware to buy. The V4L1 API is no longer supported, and since nobody stepped in to convert them to V4L2 the decision was made to remove them. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 37d803ed0b86a3252457da971e0e9a8a937c2ba4 Author: Hans de Goede Date: Tue Feb 22 13:39:36 2011 -0300 [media] staging-usbvideo: remove With the new gspca v4l2 vicam driver, there is no more reason to keep the old v4l1 usbvideo vicam driver around, and since that is the last usbvideo framework using driver, the old usbvideo framework itself can go too. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 76fafe78df9e4062b9b6595f3225a2c0c2847ae5 Author: Hans de Goede Date: Mon Feb 21 11:30:30 2011 -0300 [media] gspca_cpia1: Don't allow the framerate divisor to go above 2 Having a framerate divisor of 3 is not really necesarry and leads to various troubles (frames going missing, compression issues) when allowed. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 49b61ec9b5afdb739e07bc085ed12678bc932a22 Author: Hans de Goede Date: Mon Feb 21 11:06:29 2011 -0300 [media] gspca: Add new vicam subdriver This is a complete rewrite of the old v4l1 vicam subdriver, featuring multiple resolutions, gain + exposure control and still has less code. Oh and it is a v4l2 driver rather then v4l1 ofcourse :) Many thanks to Devin Heitmueller for donating his 3com homeconnect to me, which made this rewrite possible. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit bcc6f669066d490f10484f44561f9c2ebb38c25b Author: Hans de Goede Date: Thu Feb 17 06:27:57 2011 -0300 [media] gspca_sn9c20x: Add another MSI laptop to the sn9c20x upside down list Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 6899a9c7778a6d19edc74e2ef7dfb6daf21dc366 Author: Hans de Goede Date: Wed Feb 16 08:37:54 2011 -0300 [media] gspca_sn9c20x: Make buffers slightly larger for JPEG frames In good lighting conditions (lots of details visible) the current buffers are sometimes too small. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit b39e0cb9018bf95348078ad74b3e0171e985389a Author: Hans de Goede Date: Wed Feb 16 08:33:16 2011 -0300 [media] gspca_sn9c20x: Add LED_REVERSE flag for 0c45:62bb This fixes the led not working on this camera Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 779b51f7a5ec0e95dcc3690cd68c2631a971a65e Author: Hans de Goede Date: Wed Feb 16 08:17:36 2011 -0300 [media] gspca_sn9c20x: Add hflip and vflip controls for the ov7660 sensor Tested with a camera with usb-id: 0c45:62bb Also enable dmi based flopped laptop detection for the 0c45:627b ov7660 model. Some of the MSI laptops with upside down camera have this one instead of the 0c45:624f. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 8bc50f354047f4afb31fc85f0efb6bfe28ce9e57 Author: Hans de Goede Date: Wed Feb 16 07:11:14 2011 -0300 [media] gspca_sn9c20x: Fix colored borders with ov7660 sensor Tested with a camera with usb-id: 0c45:62bb Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 9839029b052f094b9c14cb60e7c729950dd28712 Author: Stefan Ringel Date: Tue Jan 25 13:40:55 2011 -0300 [media] tm6000: relabeling any registers relabeling any registers Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit c42cedbb658bde9b7bea0ce24e2388b7c717fdb3 Author: Jean-François Moine Date: Thu Feb 10 13:37:48 2011 -0300 [media] gspca - ov519: Add the 800x600 resolution for sensors ov2610/2610ae Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 07c6c9c6d0e797590a7cc76fc8f0b740f34d21a2 Author: Jean-François Moine Date: Thu Feb 10 13:32:22 2011 -0300 [media] gspca - ov519: Add the sensor ov2610ae Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 20c957b360f85c293fbb6bcec9d1ec11b241ef1a Author: Jean-François Moine Date: Thu Feb 10 13:18:58 2011 -0300 [media] gspca - sonixj: The pin S_PWR_DN is inverted for sensor mi0360 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d57747f1e738cf1aa4a743ea10e0fb640b502c7d Author: Jean-François Moine Date: Thu Feb 10 10:15:45 2011 -0300 [media] gspca - ov534: Add saturation control for ov767x Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 458efe2d558b51fff38026e8ede9374899340e60 Author: Jean-François Moine Date: Thu Feb 10 10:11:04 2011 -0300 [media] gspca - ov534: Add the webcam 06f8:3002 and sensor ov767x Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 228dd2660c4cee10fda47aa105b0152f8de7a766 Author: Jean-François Moine Date: Thu Feb 10 09:34:57 2011 -0300 [media] gspca - ov534: Use the new control mechanism Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 062909f64981678899a1abbe16a616b0e92fc615 Author: Jean-François Moine Date: Thu Feb 10 08:10:50 2011 -0300 [media] gspca - sonixj, zc3xx: Let some bandwidth for audio when USB 1.1 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 5c95606b1d94a6dc62df0af2bc0d3e0e9a2e6cce Author: Jean-François Moine Date: Thu Feb 10 08:03:24 2011 -0300 [media] gspca - sonixj: Set both pins for infrared of mt9v111 webcams This avoids to define the webcam model. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 336d23ef88fd71564fb07fdc1d1d871f8e1eeadd Author: Jean-François Moine Date: Thu Feb 10 08:00:40 2011 -0300 [media] gspca - sonixj: Same init for all bridges but the sn9c102p Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit e6a92a7445cc33bbfe2775eb50473fb43bb3a2da Author: Jean-François Moine Date: Thu Feb 10 07:52:58 2011 -0300 [media] gspca - sonixj: Simplify GPIO setting when audio present Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 222036765ccbdb1ff4feef22d8e2fc687a9cdcfd Author: Jean-François Moine Date: Thu Feb 10 07:49:32 2011 -0300 [media] gspca - sonixj: Adjust autogain for sensor mt9v111 The gain/expo adjustment was too long. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 804632201f2d749b7cb35fce42fc28552ad595c1 Author: Jean-François Moine Date: Thu Feb 10 07:44:59 2011 -0300 [media] gspca - sonixj: Fix start sequence of sensor mt9v111 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit b96cfc33e74f5ee5a206b2d43bf0bc3898c5a572 Author: Jean-François Moine Date: Thu Feb 10 07:38:58 2011 -0300 [media] gspca - sonixj: Update the JPEG quality for best image transfer During image capture, the filling rate of the isoc packets is computed. It is then used by a work queue to update the current JPEG quality. Tested-by: Franck Bourdonnec Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit dccdcccdd36bf7570967ff53411c7401b8e645d6 Author: Jean-François Moine Date: Thu Feb 10 07:30:03 2011 -0300 [media] gspca - sonixj: Have the same JPEG quality for encoding and decoding Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a4a3076ffcdbcf40358edc2068aa4d9103fe0a28 Author: Jean-François Moine Date: Thu Feb 10 07:15:24 2011 -0300 [media] gspca - sonixj: Better scanning of isochronous packets A marker 'ff ff 00 c4 c4 96' indicates an end of frame. It is 62 bytes long and may be splitted on 2 packets. It contains a flag 'USB full' which indicates that the frame is truncated. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0f77f40c300c18c15e7aeb2f9eee510aa96d58fd Author: Jean-François Moine Date: Thu Feb 10 07:01:30 2011 -0300 [media] gspca - sonixj: Move the avg lum computation to a separate function Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d39155d91d034e2b2c9154892e29c8a8eb193b7f Author: Pawel Osciak Date: Sun Jan 16 13:53:31 2011 -0300 [media] Remove compatibility layer from multi-planar API documentation This feature will probably be moved to libv4l2. Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit 87a0c94ce616b231f3c0bd09d7dbd39d43b0557a Author: Hans Verkuil Date: Tue Feb 22 12:31:07 2011 -0300 [media] v4l2-ctrls: Fix control enumeration for multiple subdevs with ctrl v4l2-ctl and qv4l2 enumerate controls using V4L2_CTRL_FLAG_NEXT_CTRL, falling back to the old method if the flag isn't supported. The v4l2_subdev_queryctrl function will currently handle that flag, but for the controls of the subdev only. This isn't right, it should refuse this flag, otherwise v4l2-ctl will only see the controls of the first subdev. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fb8decfabdf841a199b297076ff9f890dee55e53 Author: Mauro Carvalho Chehab Date: Tue Feb 22 01:00:58 2011 -0300 [media] em28xx: properly handle subdev controls Subdev controls return codes are evil, as they return -EINVAL to mean both unsupported and invalid arguments. Due to that, we need to use a trick to identify what controls are supported by a subdev. Signed-off-by: Mauro Carvalho Chehab commit 78e51566f0c56daa58f7bbe2591336b7d478c148 Author: Mauro Carvalho Chehab Date: Tue Feb 22 00:27:41 2011 -0300 [media] em28xx: Fix return value for s_ctrl On some cases, driver returns 1. This should be OK, but qv4l2 is too strict about return values. Signed-off-by: Mauro Carvalho Chehab commit 0e09a3c92bfd54a6ac03f8225c4fd10f50111beb Author: Mauro Carvalho Chehab Date: Tue Feb 22 00:10:22 2011 -0300 [media] tvp5150: device detection should be done only once Having the device detection happening at reset is bad, as every time, it will produce a message like: tvp5150 2-005c: tvp5150am1 detected. This only polutes the log and for an accidental kernel hacker, it looks like a real problem. So, move those printk's to happen during device probe. Signed-off-by: Mauro Carvalho Chehab commit 437f5fa34225db0d981536692678afc590e5c87f Author: Mauro Carvalho Chehab Date: Mon Feb 21 21:03:59 2011 -0300 [media] tuner: Remove remaining usages of T_DIGITAL_TV A few places used T_DIGITAL_TV internally. Remove the usage of this obsolete mode mask. Signed-off-by: Mauro Carvalho Chehab commit 550df5a450928172e284cb0f857ae73e5e705305 Author: Mauro Carvalho Chehab Date: Tue Feb 15 10:31:01 2011 -0200 [media] tuner-core: Don't touch at standby during tuner_lookup It makes no sense that tuner_lookup would touch at the standby state. Remove it. Thanks-to: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0eec66c0dfc1b066e6addbc6af755c779f65fd87 Author: Mauro Carvalho Chehab Date: Tue Feb 15 10:27:03 2011 -0200 [media] tuner-core: Rearrange some functions to better document Group a few functions together and add/fix comments for each block of the driver. This is just a cleanup patch meant to improve driver readability. No functional changes in this patch. Signed-off-by: Mauro Carvalho Chehab commit a2894e3f8ed691b4873c8122e66902fbf0e78e0b Author: Mauro Carvalho Chehab Date: Tue Feb 15 10:15:19 2011 -0200 [media] tuner-core: Improve function documentation This driver is complex, and used by everyone. Better to have it properly documented. No functional changes are done in this patch. Signed-off-by: Mauro Carvalho Chehab commit ad020dc2fe9039628cf6cef42cd1b76531ee8411 Author: Mauro Carvalho Chehab Date: Tue Feb 15 09:30:50 2011 -0200 [media] tuner-core: remove usage of DIGITAL_TV tuner-core has no business to do with digital TV. So, don't use T_DIGITAL_TV on it, as it has no code to distinguish between them, and nobody fills T_DIGITAL_TV right. Signed-off-by: Mauro Carvalho Chehab commit 2d351df443b0b324a440b5fd053074562d36a7f5 Author: Mauro Carvalho Chehab Date: Mon Feb 14 18:53:12 2011 -0200 [media] Remove the remaining usages for T_STANDBY tda9887 used to use the T_STANDBY type internally, while tea5761 used it to put the device to sleep. Fix the code for it to work properly with the tuner core changes and remove this flag from tuner.h. Signed-off-by: Mauro Carvalho Chehab commit 0ae79d993cd5ce425bedebcbd2f8c4fa310acfe6 Author: Mauro Carvalho Chehab Date: Tue Feb 15 01:10:20 2011 -0300 [media] tuner-core: Fix a few comments on it Signed-off-by: Mauro Carvalho Chehab commit a34ec5f3743950cadb8f512c884b8c9dbaa9a7a5 Author: Mauro Carvalho Chehab Date: Tue Feb 15 00:55:18 2011 -0300 [media] tuner-core: dead code removal Remove the now obsolete set_freq. Also merge set_addr and set_type_addr. In the past, it used to have two different setup calls, one to set just the tuner type to any tuner found, and another to set the type only if the address matches. Those two internal calls were grouped together, but the functions weren't merged, making the code uglier. No functional changes are done in this patch. Signed-off-by: Mauro Carvalho Chehab commit 900f734b3bafb4e111b9ec5d865c448a9911b2ab Author: Mauro Carvalho Chehab Date: Fri Feb 4 12:56:39 2011 -0300 [media] tuner-core: Don't use a static var for xc5000_cfg A static var is evil, especially if a device has two boards with xc5000. Instead, just like the other drivers, use stack to store its config during setup. Signed-off-by: Mauro Carvalho Chehab commit 7d275bf840a8f390b8fd3d686545e09ef01f7915 Author: Mauro Carvalho Chehab Date: Fri Feb 4 11:28:00 2011 -0300 [media] tuner-core: CodingStyle cleanups Signed-off-by: Mauro Carvalho Chehab commit e2f63d9ba51efe8930bf1c952c66b971047d355d Author: Mauro Carvalho Chehab Date: Fri Feb 4 11:15:21 2011 -0300 [media] tuner-core: do the right thing for suspend/resume Power down tuners at suspend. At resume, if the tuner is in standby, calls set_mode, that will turn it on and set the latest frequencies. Signed-off-by: Mauro Carvalho Chehab commit cbde689823776d187ba1b307a171625dbc02dd4f Author: Mauro Carvalho Chehab Date: Fri Feb 4 10:42:09 2011 -0300 [media] tuner-core: Better implement standby mode In the past, T_STANDBY were used on devices with a separate radio tuner to mark a tuner that were disabled. With the time, it got newer meanings. Also, due to a bug at the logic, the driver might incorrectly return T_STANDBY to userspace. So, instead of keeping the abuse, just use a boolean for storing such information. We can't remove T_STANDBY yet, as this is used on two other drivers. A latter patch will address its usage outside tuner-core. Thanks-to: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit e2d25a2474a8c0178bac4919729ab092783bd916 Author: Mauro Carvalho Chehab Date: Fri Feb 4 10:09:07 2011 -0300 [media] tuner-core: Some cleanups at check_mode/set_mode Properly document those functions and do some cleanups around that. There's just one behavior change on this patchset: it will now restore TV frequency when changing from radio to TV mode. Signed-off-by: Mauro Carvalho Chehab commit 9f3f71ef6d9a6179a16f82287f062cbf3f112ec6 Author: Mauro Carvalho Chehab Date: Thu Feb 3 23:32:07 2011 -0300 [media] tuner-core: Reorganize the functions internally This is a big patch with no functional changes. It just rearranges everything inside the driver, and prepares to break TV and Radio into two separate fops groups. Currently, it has an heuristics logic to determine if the call came from radio or video. However, the caller driver knows for sure, so tuner-core shouldn't try to guess it. Signed-off-by: Mauro Carvalho Chehab commit b77bdb028807bb1f78b5b50127456e1f664bd501 Author: Mauro Carvalho Chehab Date: Thu Feb 3 23:03:19 2011 -0300 [media] tuner-core: move some messages to the proper place Move the frequency set debug printk's to the code that actually are changing it. Signed-off-by: Mauro Carvalho Chehab commit 04f590e82bdd5fa6fc36d7abf806006d27ea9e5d Author: Mauro Carvalho Chehab Date: Thu Feb 3 22:18:14 2011 -0300 [media] tuner-core: remove the legacy is_stereo() call Nobody is using this legacy call. Just remove it. Signed-off-by: Mauro Carvalho Chehab commit 5620094a2eaa6527d7f038ad3d65ce6a76c8272a Author: Mauro Carvalho Chehab Date: Thu Feb 3 22:05:23 2011 -0300 [media] tuner-core: Remove V4L1/V4L2 API switch V4L1 was removed. So, the code there is just dead code. Signed-off-by: Mauro Carvalho Chehab commit 121ec13267fabcf2c81e4584f1505069e234b30d Author: Mauro Carvalho Chehab Date: Mon Feb 14 07:01:51 2011 -0300 [media] cx88: Don't allow opening a device while it is not ready After registering the cdev, it would be possible do have an open on it. In a matter of fact, some versions of udev do this. So, move registration to the end and protect it with a mutex. Signed-off-by: Mauro Carvalho Chehab commit b618726414f3eb7b0b122e459efe3c5edc36b2fc Author: Mauro Carvalho Chehab Date: Sun Feb 13 21:52:02 2011 -0300 [media] cx88: use unlocked_ioctl for cx88-video. cx88-video has locks. don't use the locked ioctl version, as it is not needed. Signed-off-by: Mauro Carvalho Chehab commit 4e105039da20f57958a2f538048a0f1bfb576b8b Author: Mauro Carvalho Chehab Date: Mon Jan 31 22:18:21 2011 -0300 [media] cx231xx: Add support for PV Xcapture USB Adds support for Pixelviex Xcapture USB grabber device. This device has one composite and one s-video entry only, plus a button. For now, the button is not supported. Signed-off-by: Mauro Carvalho Chehab commit 38f5ddc1bf12887c0abe287de359e853e12fcc19 Author: Mauro Carvalho Chehab Date: Mon Jan 31 16:25:39 2011 -0300 [media] cx231xx: Allow some boards to not use I2C port 3 Some devices don't need to use it. So allow to just disable this logic. Having it enabled on some devices cause power management to complain, generating error -71. Signed-off-by: Mauro Carvalho Chehab commit 2f86138706d3b5c85a69e72ca2959717372386dd Author: Mauro Carvalho Chehab Date: Mon Jan 31 22:12:15 2011 -0300 [media] cx231xx: Use parameters to describe some board variants Instead of per-model tests all over the code, use some parameters at the board entries to describe the model variants for: - devices with 417 MPEG encoder; - devices that use external AV; - devices where vbi VANC endpoint doesn't work; - devices with xc5000 that require different IF initialization (and probably will cover also xc3028). - devices with xceive tuner that require a reset during init. Signed-off-by: Mauro Carvalho Chehab commit 3f25ffa2cd946333d29a668993f5aa78e9b56a02 Author: Mauro Carvalho Chehab Date: Sun Jan 30 09:03:24 2011 -0300 [media] cx231xx: Use a generic check for TUNER_XC5000 The check for xc5000 assumes that the tuner will always be using the same bus and will have the same address. As those are configurable via dev->board, it should use, instead, the values defined there. Also, a similar type of test will be needed by other tuners (for example, for TUNER_XC2028) Signed-off-by: Mauro Carvalho Chehab commit 8bb84227d1ba41d6c1ec9350a4424ece5fe00e33 Author: Mauro Carvalho Chehab Date: Sat Jan 29 22:10:56 2011 -0300 [media] cx231xx: Simplify interface checking logic at probe Just a cleanup patch. Removes one indent level by moving the return -ENODEV to happen before the device register logic, if the interface is not the audio/video (int 1). Signed-off-by: Mauro Carvalho Chehab commit b8bc77db1e23c6e141734511db873902c66bec8c Author: Alina Friedrichsen Date: Sun Jan 23 12:27:05 2011 -0300 [media] tuner-xc2028: More firmware loading retries My Hauppauge WinTV HVR-1400 needs sometimes more then only one retry to load the firmware successfully. Signed-off-by: Alina Friedrichsen Signed-off-by: Mauro Carvalho Chehab commit 2b97e2201eb76d56c4901d39e8ed276f2de0e2e9 Author: iceberg Date: Fri Jan 21 15:00:25 2011 -0300 [media] double mutex lock in drivers/media/radio/si470x/radio-si470x- KERNEL_VERSION: 2.6.37 common.c in function ssize_t si470x_fops_read. 1. First mutex_lock on &radio->lock in line 441 2. Second in line 462 I think that mutex in line 462 is not needed. 433static ssize_t si470x_fops_read(struct file *file, char __user *buf, 434 size_t count, loff_t *ppos) 435{ .... 441 mutex_lock(&radio->lock); 442 if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0) 443 si470x_rds_on(radio); 444 445 /* block if no new data available */ 446 while (radio->wr_index == radio->rd_index) { 447 if (file->f_flags & O_NONBLOCK) { 448 retval = -EWOULDBLOCK; 449 goto done; 450 } 451 if (wait_event_interruptible(radio->read_queue, 452 radio->wr_index != radio->rd_index) < 0) { 453 retval = -EINTR; 454 goto done; 455 } 456 } 457 458 /* calculate block count from byte count */ 459 count /= 3; 460 461 /* copy RDS block out of internal buffer and to user buffer */ 462 mutex_lock(&radio->lock); Found by Linux Device Drivers Verification Project Remove second mutex. Signed-off-by: Alexander Strakh Signed-off-by: Mauro Carvalho Chehab commit 8e030cabf1bb8601ad3efe09b9dc65a441a294ec Author: Dmitri Belimov Date: Thu Jan 20 03:05:08 2011 -0300 [media] tm6000: add/rework reg.defines Rework registers defines. Add TM6000 specific registers defines. Add marks and comments for TM6010 specific registers. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit cbfb3daa66bc43f4e2d4f2063db7472a8b2837f5 Author: Hans Verkuil Date: Sat Jan 22 06:36:02 2011 -0300 [media] cpia2: convert to video_ioctl2 Unable to test this due to lack of hardware. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit afa38521614dcdfe12c765ff76d4c137a056e905 Author: Hans Verkuil Date: Sat Jan 22 06:34:55 2011 -0300 [media] pwc: convert to video_ioctl2 Tested with a Logitech QuickCam Pro 4000. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b577f962d27c055571f72ddd73ae3aded39a6261 Author: Hans Verkuil Date: Thu Jan 13 05:05:36 2011 -0300 [media] pwc: convert to core-assisted locking Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5b2830298dc0534eb33277a31f353bb524e2cc2e Author: Hans Verkuil Date: Tue Jan 11 17:32:28 2011 -0300 [media] vivi: fix compiler warning drivers/media/video/vivi.c:1059: warning: this decimal constant is unsigned only in ISO C90 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7e996afa81f71ade7870eb26b1b17350b4395646 Author: Hans Verkuil Date: Sun Jan 23 12:33:16 2011 -0200 [media] vivi: convert to the control framework and add test controls Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0eb73de019da80facad559c8a5ef21a4b357d8d5 Author: Hans Verkuil Date: Sun Dec 12 08:46:15 2010 -0300 [media] tvp7002: use control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 9a775323ee0cbc93b5a1801c7b9264226fb0885c Author: Hans Verkuil Date: Sun Dec 12 08:45:59 2010 -0300 [media] vpx3220: use control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6c45ec718e3b641da41654b31f35ae3e13306264 Author: Hans Verkuil Date: Sun Dec 12 08:45:43 2010 -0300 [media] tvp5150: use the control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cf6832afe59f37b154bf0e41bf5e59cfd7f46d24 Author: Hans Verkuil Date: Sun Dec 12 08:45:22 2010 -0300 [media] tvp514x: use the control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e3d5ef0410806d94cf58afd87a753ad5932ca8a8 Author: Hans Verkuil Date: Sun Dec 12 08:45:04 2010 -0300 [media] tlv320aic23b: use control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4744ebf631bc9276f7c10e37801f05c8ceea7bab Author: Hans Verkuil Date: Sun Dec 12 08:27:48 2010 -0300 [media] saa7110: use control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit bd84a65aefbd669bcd2ff7bcee96f0f666d7a820 Author: Hans Verkuil Date: Sun Dec 12 08:19:41 2010 -0300 [media] bt819: use control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ceed52d67e1cf7866fa96514525c615554a0e44e Author: Hans Verkuil Date: Sun Dec 12 08:19:16 2010 -0300 [media] adv7343: use control framework Also fixed a memory leak in the probe function if an error occurred. The gain control range was also fixed (a proper range from -64 to 64). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a75b9be1c2fb52dee765d35f29031dd788d522eb Author: Hans Verkuil Date: Fri Dec 31 10:22:52 2010 -0300 [media] cx18: Use the control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 34a078da8e20ca40a09bfa635ff2c4e2c4b648b1 Author: Hans Verkuil Date: Sun Dec 12 07:53:28 2010 -0300 [media] cs5345: use the control framework Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1f075d1f1bfb7101be9a651a4d087193b4f05b23 Author: Mauro Carvalho Chehab Date: Tue Nov 9 22:31:40 2010 -0200 [media] technisat-usb2: CodingStyle cleanups Signed-off-by: Mauro Carvalho Chehab commit d642f2f3c5be4737ec021c6d6e9cda99262564f8 Author: Mauro Carvalho Chehab Date: Wed Jan 19 16:25:17 2011 -0200 [media] add support for Encore FM3 Signed-off-by: Mauro Carvalho Chehab commit 99fb079aad031712283d555aa87251706aa60212 Author: Mauro Carvalho Chehab Date: Wed Jan 19 16:11:58 2011 -0200 [media] saa7134: Properly report when a board doesn't have eeprom When a device is not detected, the driver prints a warning message. That's ok, except for the fact that, even on newer devices that have eeprom but aren't yet supported, it prints a message saying that the device doesn't have eeprom. Fix it by having a separate message for devices with eeprom, but not yet known by the driver. Signed-off-by: Mauro Carvalho Chehab commit 0cda12556bf3ebe47ee98eb6767a085c204ee35e Author: Mauro Carvalho Chehab Date: Wed Jan 19 16:05:30 2011 -0200 [media] tuner-simple: add support for Tena TNF5337 MFD Signed-off-by: Mauro Carvalho Chehab commit db4d56835e07ec793f143431170ba2fc17bf0191 Author: Hans Verkuil Date: Sun Jan 16 17:21:02 2011 -0300 [media] DocBook/v4l: fix validation errors Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e007a32526e9c5fc2746f0b84a32d3355f129634 Author: Pawel Osciak Date: Wed Jan 19 13:02:29 2011 -0200 [media] v4l: vivi: port to videobuf2 Make vivi use videobuf2 in place of videobuf. Signed-off-by: Pawel Osciak Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park CC: Pawel Osciak Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dbf05b279b8ed398a8e92b0c1187882f6df2bf7f Author: Mauro Carvalho Chehab Date: Mon Jan 17 22:18:02 2011 -0200 [media] ngene: Fix compilation when cxd2099 is not enabled drivers/media/dvb/ngene/ngene-i2c.o: In function `cxd2099_attach': ngene-i2c.c:(.text+0x195): multiple definition of `cxd2099_attach' drivers/media/dvb/ngene/ngene-core.o:ngene-core.c:(.text+0x100): first defined here drivers/media/dvb/ngene/ngene-cards.o: In function `cxd2099_attach': ngene-cards.c:(.text+0x116): multiple definition of `cxd2099_attach' drivers/media/dvb/ngene/ngene-core.o:ngene-core.c:(.text+0x100): first defined here drivers/media/dvb/ngene/ngene-dvb.o: In function `cxd2099_attach': ngene-dvb.c:(.text+0x7ad): multiple definition of `cxd2099_attach' drivers/media/dvb/ngene/ngene-core.o:ngene-core.c:(.text+0x100): first defined here Signed-off-by: Mauro Carvalho Chehab commit 8112248a1b66440f6c562c2669aba6950ef48199 Author: Mauro Carvalho Chehab Date: Mon Jan 17 14:20:49 2011 -0200 [media] Move CI cxd2099 driver to staging This driver is abusing the kernel<=>userspace API, due to the lack of a proper solution for it. A discussion were done at: http://www.mail-archive.com/linux-media@vger.kernel.org/msg22196.html But there's not a solution for it yet. So, move the driver to staging, while we don't have a final solution. Signed-off-by: Mauro Carvalho Chehab commit 4862d6b2e23f0573ef60c784341e05e1ac0804eb Author: Oliver Endriss Date: Mon Jan 10 06:36:24 2011 -0300 [media] stv090x: 22kHz workaround must also be performed for the 2nd frontend 22kHz workaround must also be performed for the 2nd frontend. Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 3d0cef2c3c7e19a2425f8e1379a535c46427951b Author: Oliver Endriss Date: Mon Jan 10 06:36:23 2011 -0300 [media] ngene: Improved channel initialisation and release Refactored code for channel initialisation and release: - Do not create device nodes which are not required. - Better error handling. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 179fd15a99175e8e22516edbb1894c3348842f3a Author: Oliver Endriss Date: Mon Jan 10 06:36:22 2011 -0300 [media] stv090x: Fix losing lock in dual DVB-S2 mode Do not clear registers ACLC/BCLC in DVB-S2 mode for Cut <= 20. Otherwise, the demod could lose the lock periodically. Verified with cineS2 and Duoflex. Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 908f668bfbe4d268462352b9227bfe4cb458feb6 Author: Oliver Endriss Date: Mon Jan 10 06:36:21 2011 -0300 [media] stv090x: Fixed typos in register macros Fixed typos in register macros. Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit e549bedf8fd9887529adf1a511501d4c036a2cfe Author: Oliver Endriss Date: Mon Jan 10 06:36:20 2011 -0300 [media] ngene: Fix copy-paste error Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit f33de4aa24646b445f4dd52ebd57e322730644b2 Author: Oliver Endriss Date: Mon Jan 10 06:36:19 2011 -0300 [media] get_dvb_firmware: ngene_18.fw added Add download link for ngene firmware rev 18. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit f164396ff54b95d709a5ee5ffc601cf9cd85f298 Author: Oliver Endriss Date: Mon Jan 10 06:36:18 2011 -0300 [media] ngene: Enable CI for Mystique SaTiX-S2 Dual (v2) Enable CI for Mystique SaTiX-S2 Dual (v2). Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit cce33c34937dec038567681d4755e75affed9742 Author: Ralph Metzler Date: Mon Jan 10 06:36:17 2011 -0300 [media] ngene: Add net device Add dvb net device. Note that the physical address must be setup manually. Signed-off-by: Ralph Metzler Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 1b7c41ef33f38c88dcf9a1b7544d9e4eaa045e6f Author: Ralph Metzler Date: Mon Jan 10 06:36:16 2011 -0300 [media] ngene: Shutdown workaround Implement shutdown workaround for some chipsets. Signed-off-by: Ralph Metzler Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 0f0b270f905bbb0c8e75988ceaf10ff9a401e712 Author: Ralph Metzler Date: Mon Jan 10 06:36:15 2011 -0300 [media] ngene: CXD2099AR Common Interface driver Driver for the Common Interface Controller CXD2099AR. Supports the CI of the cineS2 DVB-S2. For now, data is passed through '/dev/dvb/adapterX/sec0': - Encrypted data must be written to 'sec0'. - Decrypted data can be read from 'sec0'. - Setup the CAM using device 'ca0'. Signed-off-by: Ralph Metzler Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 8a484719c790772bc51c87c56323611752361bef Author: Oliver Endriss Date: Mon Jan 10 06:36:14 2011 -0300 [media] ngene: Clean-up driver initialisation (part 1) If tuner initialisation failed, the frontend node was not removed. When the frontend was opened, a kernel oops occurred... This is the first step to improve error handling during initialisation. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 5fec18574fec3eaffcab596c1a4e943e2d413cc3 Author: Oliver Endriss Date: Mon Jan 10 06:36:13 2011 -0300 [media] ngene: Support up to 4 tuners Support up to 4 tuners for cineS2 v5, duoflex & mystique v2. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit ac9725d224544954a8d3413a2a66bdf49f735d8b Author: Oliver Endriss Date: Mon Jan 10 06:36:12 2011 -0300 [media] ngene: Fixes for TS input over I2S Fix TS input over I2S. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 09961aae7b3ea8640051e464b346ed3984521de8 Author: Oliver Endriss Date: Mon Jan 10 06:36:11 2011 -0300 [media] ngene: Firmware 18 support Small modifications for firmware 18. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit f790bdd00da937845b38467abfebdea09acfea0e Author: Oliver Endriss Date: Mon Jan 10 06:36:10 2011 -0300 [media] stv090x: Optional external lock routine Card driver may supply its own lock routine now. Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 5bd0dc2d8a0db2f2e119ea50d07bf49e5e038f12 Author: Andreas Regel Date: Mon Jan 10 06:36:09 2011 -0300 [media] stv090x: make sleep/wakeup specific to the demod path The STV0900 features two demodulator paths in one chip. Thus it is not possible to use the generic power off function of the chip when sending one of them to standby. The other path will stop working in that case. The sleep function now switches off functionality specific to the demod path. The global stuff is only switched off, when both paths are in sleep mode. The wakeup function always turns on the global functionality and then works specific to the path. Signed-off-by: Andreas Regel Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 2c2c441b10644a273ff82a43ec18034ec1dd4c4e Author: Mauro Carvalho Chehab Date: Sun Jan 16 13:02:52 2011 -0200 [media] dib8000: Fix some wrong alignments Something went wrong with the alignments for the if clause at line 2113. Instead of using one tab for alignments, it used 3 tabs, plus one space character. WARNING: suspect code indent for conditional statements (8, 33) + if ((state->fe[0]->dtv_property_cache.delivery_system != SYS_ISDBT) || [...] + int i = 80000; WARNING: suspect code indent for conditional statements (33, 41) + for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { + dib8000_set_bandwidth(state->fe[index_frontend], fe->dtv_property_cache.bandwidth_hz / 1000); WARNING: suspect code indent for conditional statements (33, 41) + do { + msleep(20); WARNING: suspect code indent for conditional statements (41, 49) + for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { + if (((tune_failed >> index_frontend) & 0x1) == 0) { WARNING: suspect code indent for conditional statements (49, 57) + if (((tune_failed >> index_frontend) & 0x1) == 0) { + found = dib8000_autosearch_irq(state->fe[index_frontend]); WARNING: suspect code indent for conditional statements (41, 49) + if ((nbr_pending == 0) && (exit_condition == 0)) + exit_condition = 1; Cc: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 46f7296a52caf4e270ee43d9402eb0cecef13fdd Author: Mauro Carvalho Chehab Date: Sun Jan 16 13:01:20 2011 -0200 [media] dib7000p: Fix 4-byte wrong alignments for some case statements ERROR: switch and case should be at the same indent switch (ch->u.ofdm.transmission_mode) { [...] + case TRANSMISSION_MODE_4K: WARNING: please, no spaces at the start of a line + case TRANSMISSION_MODE_4K:$ ERROR: switch and case should be at the same indent switch (ch->u.ofdm.transmission_mode) { [...] + case TRANSMISSION_MODE_4K: WARNING: please, no spaces at the start of a line + case TRANSMISSION_MODE_4K:$ ERROR: switch and case should be at the same indent switch (ch->u.ofdm.transmission_mode) { [...] + case TRANSMISSION_MODE_4K: WARNING: please, no spaces at the start of a line + case TRANSMISSION_MODE_4K:$ Cc: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit b4d6046e841955be9cc49164b03b91c9524f9c2e Author: Olivier Grenie Date: Tue Jan 4 13:08:14 2011 -0300 [media] DiBxxxx: Codingstype updates This patchs fix several conding-style violations. Signed-off-by: Olivier Grenie Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit be9bae10ffa5aeeef051e893c3b15a5d10eb657d Author: Olivier Grenie Date: Tue Jan 4 05:42:19 2011 -0300 [media] DiB0700: add support for several board-layouts This patchs adds support for DiBcom's NIM8096MD, NIM9090M, NIM9090MD, NIM7090, TFE7090PVR (no diversity) reference designs. Signed-off-by: Olivier Grenie Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 713d54a8bd812229410a1902cd9b332a2a27af9f Author: Olivier Grenie Date: Tue Jan 4 04:54:31 2011 -0300 [media] DiB7090: add support for the dib7090 based This patch adds support for the SoC DiB7090 DVB-T demodulator and its melt-in UHF/VHF RF tuner. Signed-off-by: Olivier Grenie Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit dd316c6bacc2bdb22288507fd479bd2181eb7a7b Author: Olivier Grenie Date: Tue Jan 4 04:28:59 2011 -0300 [media] DIB9000: initial support added This patchs add initial support for the DiB9000-device. This demodulator is firmware-driven. Signed-off-by: Olivier Grenie Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 28fafca78797be701208c0880ec1c79ffa267f9d Author: Olivier Grenie Date: Tue Jan 4 04:27:11 2011 -0300 [media] DiB0090: misc improvements This patch adds several performance improvements and prepares the usage of firmware-based devices. Signed-off-by: Olivier Grenie Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit b994d19268756b640ccc76f0b0d47ee13c0f8af9 Author: Olivier Grenie Date: Mon Jan 3 15:39:35 2011 -0300 [media] DiBx000: add addition i2c-interface names This patch adds the possibitity to use different I2C-ports to talk to slave-devices than the standard ones. Signed-off-by: Olivier Grenie Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 4c70e074f8c496dc06798188d71be13162115d32 Author: Olivier Grenie Date: Mon Jan 3 15:33:37 2011 -0300 [media] DiB8000: add diversity support This patch adds a set a functions which allow the handling of multiple demodulator in a diversity reception chain. Signed-off-by: Olivier Grenie Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 7757ddda6f4febbc52342d82440dd4f7a7d4f14f Author: Olivier Grenie Date: Mon Jan 3 15:30:14 2011 -0300 [media] DiB0700: add function to change I2C-speed This commit adds a function to the DiB0700 USB driver which allows drivers to change the I2C clock speed. Signed-off-by: Olivier Grenie Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit f8e2e3eab8f70103fb4680e2da202e14199c199a Author: Sylwester Nawrocki Date: Mon Jan 3 08:07:30 2011 -0300 [media] Add v4l2 subdev driver for NOON010PC30L image sensor Add I2C/V4L2 subdev driver for Siliconfile NOON010PC30 CIF camera. The driver implements basic functionality, i.e. CIF/QCIF/QQCIF resolution and color format selection, automatic/manual color balance control. Other functions like cropping, rotation/flip, exposure etc. can be easily implemented if needed. Reviewed-by: Hans Verkuil Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 22fb985adad023de15ad1a4ee0271a4dd97ed995 Author: Sylwester Nawrocki Date: Tue Nov 30 12:54:56 2010 -0300 [media] Add chip identity for NOON010PC30 camera sensor Add ID for NOON010PC30 camera chip and reserve ID range for Siliconfile sensors. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit ba10795ed1018488964e6054b5076ec31a471d96 Author: Sungchun Kang Date: Thu Dec 30 02:35:28 2010 -0300 [media] s5p-fimc: fimc_stop_capture bug fix When is called fimc_stop_capture, it seems that wait_event_timeout used improperly. It should be wake up by irq handler. Reviewed-by Jonghun Han Signed-off-by: Sungchun Kang Signed-off-by: Mauro Carvalho Chehab commit 5bbe425e57d3ca715cfe9c98bac5f8f07a96c81a Author: Hyunwoong Kim Date: Wed Dec 29 07:08:32 2010 -0300 [media] s5p-fimc: fix MSCTRL.FIFO_CTRL for performance enhancement This patch fixes the value of FIFO_CTRL in MSCTRL. Main-scaler has the value to specify a basis FIFO control of input DMA. The description of FIFO_CTRL has been changed as below. 0 = FIFO Empty (Next burst transaction is possible when FIFO is empty) 1 = FIFO Full (Next burst transaction is possible except Full FIFO) Value '1' is recommended to enhance the FIMC operation performance. Reviewed-by: Jonghun Han Signed-off-by: Hyunwoong Kim Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab commit 65777e5c58bd3b25fcba39eddb98d8a8ce35d3be Author: Hyunwoong Kim Date: Wed Dec 29 04:47:49 2010 -0300 [media] s5p-fimc: Support stop_streaming and job_abort This patch adds callback functions, stop_streaming and job_abort, to abort or finish any DMA in progress. stop_streaming is called by videobuf2 framework and job_abort is called by m2m framework. ST_M2M_PEND state is added to discard the next job. Reviewed-by: Jonghun Han Signed-off-by: Hyunwoong Kim Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab commit 1b09f292eb99fd6a3601e8421c463905dbb0a866 Author: Hyunwoong Kim Date: Tue Dec 28 22:12:43 2010 -0300 [media] s5p-fimc: update checking scaling ratio range Horizontal and vertical scaling range are according to the following equations. If (SRC_Width >= 64 x DST_Width) { Exit(-1); /* Out of Horizontal scale range} If (SRC_Height >= 64 x DST_Height) { Exit(-1); /* Out of Vertical scale range} fimc_check_scaler_ratio() is used to check if horizontal and vertical scale range are valid or not. To use fimc_check_scaler_ratio, source and destination format should be set by VIDIOC_S_FMT. And in case of scaling up, it doesn't have to check the scale range. Reviewed-by: Jonghun Han Signed-off-by: Hyunwoong Kim Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab commit 70f66ea2aafbd9022a5dcdfd823538e540873585 Author: Sylwester Nawrocki Date: Tue Dec 28 11:37:55 2010 -0300 [media] s5p-fimc: Move scaler details handling to the register API file Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit b241c6d6f4ceddddfd8097c702dcfdd6b38fbe18 Author: Hyunwoong Kim Date: Tue Dec 28 11:27:13 2010 -0300 [media] s5p-fimc: Configure scaler registers depending on FIMC version The main scaler has four SFRs for main scaler ratio depending on FIMC version. FIMC 4.x has only two SFRs and FIMC 5.x has four SFRs for main scaler. Those are MainHorRatio, MainHorRatio_ext, MainVerRatio and MainverRatio_ext. The FIMC 5.x has 15 bit resolution for scaling ratio as below. {MainHorRatio,MainHorRatio_ext} = {[14:6],[5:0]}. {MainVerRatio,MainVerRatio_ext} = {[14:6],[5:0]}. MainHorRatio = CISCCTRL[24:16], MainHorRatio_ext = CIEXTEN[15:10] MainVerRatio = CISCCTRL[8:0], MainVerRatio_ext = CIEXTEN[5:0] This patch supports FIMC 4.x and FIMC 5.x using platform_device_id::driver_data. Reviewed-by: Jonghun Han Signed-off-by: Hyunwoong Kim Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab commit 10038bea7a729bcb8c51a2c856f5b58b33646d65 Author: Hyunwoong Kim Date: Wed Dec 22 00:56:05 2010 -0300 [media] s5p-fimc: fix the value of YUV422 1-plane formats Some color formats are mismatched in s5p-fimc driver. CIOCTRL[1:0], order422_out, should be set 2b'00 not 2b'11 to use V4L2_PIX_FMT_YUYV. Because in V4L2 standard V4L2_PIX_FMT_YUYV means "start + 0: Y'00 Cb00 Y'01 Cr00 Y'02 Cb01 Y'03 Cr01". According to datasheet 2b'00 is right value for V4L2_PIX_FMT_YUYV. Signed-off-by: Mauro Carvalho Chehab commit a25be18dfb6e1b172498a9f6c9793d67057000b0 Author: Sylwester Nawrocki Date: Mon Dec 27 15:34:43 2010 -0300 [media] s5p-fimc: Add control of the external sensor clock Manage the camera sensor clock in the host driver rather than leaving this task for sensor drivers. The clock frequency must be passed in the sensor's and host driver's platform data. Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab commit ac75934cc644051dc1b33b234448ea4a0990f31f Author: Sylwester Nawrocki Date: Mon Dec 27 14:47:32 2010 -0300 [media] s5p-fimc: Enable simultaneous rotation and flipping Map all (0, 90, 180, 270) deg counterclockwise rotation and horizontal and vertical flip controls to (0, 90) deg rotation, horizontal and vertical flip transformations available in the device. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit d9160afd31565e44ebbd909b283baad8c9a3c224 Author: Sylwester Nawrocki Date: Wed Dec 8 12:48:23 2010 -0300 [media] s5p-fimc: Use default input DMA burst count Increase the input DMA "successive burst count" to default value 4 to improve DMA performance. Minor cleanup. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit e9654ef28740867c0aa151bbaec93f090f60cd24 Author: Sylwester Nawrocki Date: Mon Dec 27 15:05:58 2010 -0300 [media] s5p-fimc: Enable interworking without subdev s_stream Prevent VIDIOC_STREAMON failing when s_stream callback is not implemented by a sensor subdev driver. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 3d0ce7ed037af9bafec498246d0e4af8302d993a Author: Sylwester Nawrocki Date: Mon Dec 27 15:02:16 2010 -0300 [media] s5p-fimc: Derive camera bus width from mediabus pixelcode Remove bus_width from s5p_fimc_isp_info data structure. Determine camera data bus width based on mediabus pixel format. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit df7e09a351199ad9a70eb9ae3b072cc4fc59a9bb Author: Sylwester Nawrocki Date: Mon Dec 27 14:42:15 2010 -0300 [media] s5p-fimc: Rename s3c_fimc* to s5p_fimc* Change s3c_fimc.h header file name to s5p_fimc.h, replace s3c_fimc_* names with s5p_fimc_*. s3c_fimc need to be reserved for S3C series and s5p-fimc driver will not cover CAMIF devices in S3C SoC series. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 8293ebfce2053242e30069e65427e7560aff1fee Author: Sylwester Nawrocki Date: Wed Dec 1 10:25:18 2010 -0300 [media] s5p-fimc: Use v4l core mutex in ioctl and file operations Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit ef7af59b2cf950a44576d4364459ffd3d5d1d9bc Author: Sylwester Nawrocki Date: Wed Dec 8 14:05:08 2010 -0300 [media] s5p-fimc: Conversion to multiplanar formats Conversion to multiplanar color formats and minor cleanup. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 2dab38e2272e9b30540e2782ef7aa8bc45848144 Author: Sylwester Nawrocki Date: Wed Dec 1 10:14:59 2010 -0300 [media] s5p-fimc: Porting to videobuf 2 Porting to videobuf 2 and minor cleanup. Separate videobuf_queue_ops are are created for m2m and capture video nodes. Signed-off-by: Sylwester Nawrocki Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 269da4027c9a3466150308a9fe5f2a3a58336cd8 Author: Sylwester Nawrocki Date: Sun Jan 9 09:01:10 2011 -0300 [media] v4l: Add DocBook documentation for YU12M, NV12M image formats Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab commit 4a3c9b4f0df43207eb0b4d0da9cb51e185506bd5 Author: Sylwester Nawrocki Date: Tue Dec 28 12:32:39 2010 -0300 [media] v4l: Add multiplanar format fourccs for s5p-fimc driver Add definitions for format with color planes non-contiguous in physical memory. These formats apply only if the V4L2 multiplane extension is used. V4L2_PIX_FMT_NV12M - 2-plane Y/CbCr V4L2_PIX_FMT_NV12MT - 2-plane Y/CbCr tiled (64x32 pixel macroblocks) V4L2_PIX_FMT_YUV420M - 3-plane Y/Cb/Cr Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit d80ee38cd845baadef175893b99df24e7a03ec40 Author: Marek Szyprowski Date: Wed Jan 12 06:50:55 2011 -0300 [media] v4l: mem2mem: port m2m_testdev to vb2 This patch ports mem2mem test device to videobuf2 framework. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 908a0d7c588ef87e5cf0a26805e6002a78ac9d13 Author: Marek Szyprowski Date: Wed Jan 12 06:50:24 2011 -0300 [media] v4l: mem2mem: port to videobuf2 Port memory-to-memory framework to videobuf2 framework. Add support for multi-planar Video for Linux 2 API extensions to the memory-to-memory driver framework. Based on the original patch written by Pawel Osciak. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 53b5d5749b6fcca37c7ad60cd40feafadd390b70 Author: Pawel Osciak Date: Fri Jan 7 01:41:33 2011 -0300 [media] Add multi-planar API documentation Add DocBook documentation for the new multi-planar API extensions to the Video for Linux 2 API DocBook. Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit c4c0a78d459f2e4fcc7c4f3621a34e71ec7970d0 Author: Pawel Osciak Date: Wed Jan 12 05:57:26 2011 -0300 [media] Fix mmap() example in the V4L2 API DocBook Correct ioctl return value handling and fix coding style issues. [mchehab@redhat.com: return -1 is OK, according with ioctl manpages. Reverting ioctl changes] Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit 08b99e26a347441c50c1113802801a122dd1eb7a Author: Mauro Carvalho Chehab Date: Tue Jan 11 17:12:34 2011 -0300 [media] vb2 core: Fix a few printk warnings drivers/media/video/videobuf2-core.c: In function ‘__vb2_perform_fileio’: drivers/media/video/videobuf2-core.c:1638: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type ‘size_t’ drivers/media/video/videobuf2-core.c:1697: warning: format ‘%ld’ expects type ‘long int’, but argument 2 has type ‘size_t’ drivers/media/video/videobuf2-core.c:1703: warning: format ‘%ld’ expects type ‘long int’, but argument 2 has type ‘size_t’ Signed-off-by: Mauro Carvalho Chehab commit b25748fe612626d6c9e344482bb028d76c1e11f2 Author: Marek Szyprowski Date: Mon Dec 6 05:56:55 2010 -0300 [media] v4l: videobuf2: add read() and write() emulator Add a generic file io (read and write) emulator for videobuf2. It uses MMAP memory type buffers and generic vb2 calls: req_bufs, qbuf and dqbuf. Video date is being copied from mmap buffers to userspace with standard copy_to_user() function. To add support for file io the driver needs to provide an additional callback - read_setup or write_setup. It should provide the default number of buffers used by emulator and flags. With these flags one can detemine the style of read() or write() emulation. By default 'streaming' style is used. With VB2_FILEIO_READ_ONCE flag one can select 'one shot' mode for read() emulator. With VB2_FILEIO_WRITE_IMMEDIATE flag one can select immediate conversion of write calls to qbuf for write() emulator, so the vb2 will not wait until each buffer is filled completely before queueing it to the driver. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park CC: Pawel Osciak Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5ba3f757f0592ca001266b4a6214d0332349909c Author: Andrzej Pietrasiewicz Date: Mon Nov 29 11:53:34 2010 -0300 [media] v4l: videobuf2: add DMA scatter/gather allocator Add an implementation of DMA scatter/gather allocator and handling routines for videobuf2. For mmap operation mode it is implemented on top of alloc_page + sg_set_page/_free_page. For userptr operation mode it is implemented on top of get_user_pages + sg_set_page/put_page. Signed-off-by: Andrzej Pietrasiewicz Signed-off-by: Kyungmin Park Signed-off-by: Marek Szyprowski CC: Pawel Osciak Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1a758d4e847f7743ac1b5aa79fde3ba2d8b5132b Author: Pawel Osciak Date: Mon Oct 11 10:59:36 2010 -0300 [media] v4l: videobuf2: add DMA coherent allocator Add an implementation of DMA coherent memory allocator and handling routines for videobuf2, implemented on top of dma_alloc_coherent() call. Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park Signed-off-by: Marek Szyprowski CC: Pawel Osciak Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3c18ff06d811f743d380e6436fac0143ffcf1266 Author: Pawel Osciak Date: Mon Oct 11 10:58:53 2010 -0300 [media] v4l: videobuf2: add vmalloc allocator Add an implementation of contiguous virtual memory allocator and handling routines for videobuf2, implemented on top of vmalloc()/vfree() calls. Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park Signed-off-by: Marek Szyprowski CC: Pawel Osciak Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 004cc3781c40a577b0349eef825efaaebc42dd43 Author: Marek Szyprowski Date: Thu Dec 9 10:20:47 2010 -0300 [media] v4l: videobuf2: add generic memory handling routines Add generic memory handling routines for userspace pointer handling, contiguous memory verification and mapping. Signed-off-by: Marek Szyprowski Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park CC: Pawel Osciak Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e23ccc0ad9258634e6d52cedf473b35dc34416c7 Author: Pawel Osciak Date: Mon Oct 11 10:56:41 2010 -0300 [media] v4l: add videobuf2 Video for Linux 2 driver framework Videobuf2 is a Video for Linux 2 API-compatible driver framework for multimedia devices. It acts as an intermediate layer between userspace applications and device drivers. It also provides low-level, modular memory management functions for drivers. Videobuf2 eases driver development, reduces drivers' code size and aids in proper and consistent implementation of V4L2 API in drivers. Videobuf2 memory management backend is fully modular. This allows custom memory management routines for devices and platforms with non-standard memory management requirements to be plugged in, without changing the high-level buffer management functions and API. The framework provides: - implementations of streaming I/O V4L2 ioctls and file operations - high-level video buffer, video queue and state management functions - video buffer memory allocation and management Signed-off-by: Pawel Osciak Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park CC: Pawel Osciak Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 52a3082fea41ffe77003be76ac1496d60bb7908e Author: Pawel Osciak Date: Thu Jul 29 14:56:47 2010 -0300 [media] v4l: Add compat functions for the multi-planar API Add multi-planar ioctl handling to the 32bit compatibility layer. [mchehab@redhat.com: Merged with a fixup patch from Pawel] Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park Signed-off-by: Marek Szyprowski Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d14e6d76ebf740fd0d0bd296933993a555938896 Author: Pawel Osciak Date: Thu Dec 23 04:15:27 2010 -0300 [media] v4l: Add multi-planar ioctl handling code Add multi-planar API core ioctl handling and conversion functions. [mchehab@redhat.com: CondingStyle fixup] Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park Reviewed-by: Marek Szyprowski Signed-off-by: Marek Szyprowski Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f8f3914cf922f5f9e1d60e9e10f6fb92742907ad Author: Pawel Osciak Date: Thu Jul 29 14:44:25 2010 -0300 [media] v4l: Add multi-planar API definitions to the V4L2 API Multi-planar API is as a backwards-compatible extension of the V4L2 API, which allows video buffers to consist of one or more planes. Planes are separate memory buffers; each has its own mapping, backed by usually separate physical memory buffers. Many different uses for the multi-planar API are possible, examples include: - embedded devices requiring video components to be placed in physically separate buffers, e.g. for Samsung S3C/S5P SoC series' video codec, Y and interleaved Cb/Cr components reside in buffers in different memory banks; - applications may receive (or choose to store) video data of one video buffer in separate memory buffers; such data would have to be temporarily copied together into one buffer before passing it to a V4L2 device; - applications or drivers may want to pass metadata related to a buffer and it may not be possible to place it in the same buffer, together with video data. [mchehab@redhat.com: CodingStyle fixes] Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park Reviewed-by: Marek Szyprowski Signed-off-by: Marek Szyprowski Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4ec02ea0d88d811f61e2c7765418eff770936871 Author: Mauro Carvalho Chehab Date: Mon Jan 10 21:42:12 2011 -0200 [media] technisat-usb2: Don't use a deprecated call drivers/media/dvb/dvb-usb/technisat-usb2.c: In function ‘technisat_usb2_disconnect’: drivers/media/dvb/dvb-usb/technisat-usb2.c:770: warning: ‘cancel_rearming_delayed_work’ is deprecated (declared at include/linux/workqueue.h:421) Cc: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 739ff04f63ba6498b287021649cb999e639c3c83 Author: Patrick Boettcher Date: Sun Oct 31 16:24:19 2010 -0300 [media] technisat-usb2: added driver for Technisat's USB2.0 DVB-S/S2 receiver This patch is adding support for Technisat's new USB2.0 DVB-S/S2 receiver device. The development was sponsored by Technisat. The Green led is toggle depending on the frontend-state. The Red LED is turned on all the time. The MAC address reading from the EEPROM along with the LRC-method to check whether its valid. Support for the IR-receiver of the Technisat USB2 box. The keys of small, black remote-control are built-in, repeated key behaviour are simulated. The i2c-mutex of the dvb-usb-structure is used as a general mutex for USB requests, as there are 3 threads racing for atomic requests consisting of multiple usb-requests. A module option is there which disables the toggling of LEDs by the driver on certain triggers. Useful when being used in a "dark" environment. [mchehab@redhat.com: Fix merge conflicts with RC renaming patches] Signed-off-by: Martin Wilks Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 4f7200a8a0253e7a4b74cbf1a0a3868cccdee647 Author: Patrick Boettcher Date: Sat Oct 9 10:12:34 2010 -0300 [media] stv090x: add tei-field to config-structure Some backends want to receive the full transport stream including uncorrected packets. To have that feature this patchs add a field to the config-structure called TEI (transport stream error indicator). Cc: Manu Abraham Signed-off-by: Martin Wilks Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit b4797048f70e142a65ee2139085edb44b166d238 Author: Patrick Boettcher Date: Sun Oct 10 13:45:54 2010 -0300 [media] stv090x: added function to control GPIOs from the outside This patch STV090X adds and exports a function to control the GPIOs of the stv090x-devices. Cc: Manu Abraham Signed-off-by: Martin Wilks Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 9edb240696bacd53f4331119d2dfd13d4cd4852f Author: Vasily Khoruzhick Date: Thu Mar 17 20:04:57 2011 +0200 ARM: H1940/RX1950: Change default LED triggers Change LED triggers to mimic WinMobile behavior: red blinking when battery is charging, orange solid when battery is charged. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 97491ba3f64c2137101efdfe7593305d692d7d63 Author: Vasily Khoruzhick Date: Sun Mar 13 15:53:29 2011 +0200 i2c-pxa2xx: Don't clear isr bits too early isr is passed later into i2c_pxa_irq_txempty and i2c_pxa_irq_rxfull and they may use some other bits than irq sources. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit a0774f4511371319418f959ce838f81d47a3fd56 Merge: e4394d5 23e74a8 173442f 6b7d815 Author: Ben Dooks Date: Mon Mar 21 22:57:25 2011 +0000 Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-2 commit eddecbb601c9ea3fab7e67d7892010fc9426d1e6 Merge: 0bf8c86 f2c23f6 Author: Linus Torvalds Date: Mon Mar 21 15:55:26 2011 -0700 Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: Make DEBUG_SECTION_MISMATCH selectable, but not on by default genksyms: Regenerate lexer and parser genksyms: Track changes to enum constants genksyms: simplify usage of find_symbol() genksyms: Add helpers for building string lists genksyms: Simplify printing of symbol types genksyms: Simplify lexer genksyms: Do not paste the bison header file to lex.c modpost: fix trailing comma KBuild: silence "'scripts/unifdef' is up to date." kbuild: Add extra gcc checks kbuild: reenable section mismatch analysis unifdef: update to upstream version 2.5 commit 0bf8c869701039b12c3520cb1bb1689595ab108b Author: Jesper Juhl Date: Mon Mar 21 20:47:31 2011 +0100 Reduce sequential pointer derefs in scsi_error.c and reduce size as well This patch reduces the number of sequential pointer derefs in drivers/scsi/scsi_error.c This has been submitted a number of times over a couple of years. I believe this version adresses all comments it has gathered over time. Please apply or reject with a reason. The benefits are: - makes the code easier to read. Lots of sequential derefs of the same pointers is not easy on the eye. - theoretically at least, just dereferencing the pointers once can allow the compiler to generally slightly faster code, so in theory this could also be a micro speed optimization. - reduces size of object file (tiny effect: on x86-64, in at least one configuration, the text size decreased from 9439 bytes to 9400) - removes some pointless (mostly trailing) whitespace. Signed-off-by: Jesper Juhl Signed-off-by: Linus Torvalds commit 38f7aa23c4dd5f9af13dffca49879c42a61b0a01 Author: Gary Hade Date: Mon Mar 21 10:28:59 2011 -0700 matroxfb: remove incorrect Matrox G200eV support Remove incorrect Matrox G200eV support that was previously added by commit e3a1938805d2e81b27d3d348788644f3bad004f2 A serious issue with the incorrect G200eV support that reproduces on the Matrox G200eV equipped IBM x3650 M2 is the total lack of text (login banner, login prompt, etc) on the console when X is not running and total lack of text on all of the virtual consoles after X is started. Any concerns that the incorrect code (upstream since October 2008) has been successfully used on non-IBM G200eV equipped system(s) appear to be unwarranted. In addition to the serious/non-intermittent nature of issues that have been spotted on IBM systems, complete removal of the incorrect code is clearly supported by the following Matrox (Yannick Heneault) provided input: "It impossible that this patch should have work on a system. The patch only declare the G200eV as a regular G200 which is not case. Many registers are different, including at least the PLL programming sequence. If the G200eV is programmed like a regular G200, it will not display anything." v1 - Initial patch that removed the incorrect code for _all_ G200eV equipped systems. v2 - Darrick Wong provided patch that blacklisted the incorrect code on G200eV equipped IBM systems leaving it enabled on all G200eV equipped non-IBM systems. v3 - Same code changes included with v1 plus additional justification for complete removal of the incorrect code. Signed-off-by: Gary Hade Cc: Darrick J. Wong Cc: Krzysztof Helt Cc: Petr Vandrovec Cc: Andrew Morton Cc: Linus Torvalds Cc: Yannick Heneault Cc: Christian Toutant Signed-off-by: Linus Torvalds commit 55b00bae111030bd0dfcc898a920e54725aed1bf Author: Sage Weil Date: Mon Mar 21 15:06:50 2011 -0700 rbd: update email address in Documentation Signed-off-by: Sage Weil commit 3155fe6df553472fd7c07e7788b0e542cd828c91 Merge: da48524 0c9ba97 Author: Linus Torvalds Date: Mon Mar 21 14:24:56 2011 -0700 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits) xfs: don't name variables "panic" xfs: factor agf counter updates into a helper xfs: clean up the xfs_alloc_compute_aligned calling convention xfs: kill support/debug.[ch] xfs: Convert remaining cmn_err() callers to new API xfs: convert the quota debug prints to new API xfs: rename xfs_cmn_err_fsblock_zero() xfs: convert xfs_fs_cmn_err to new error logging API xfs: kill xfs_fs_mount_cmn_err() macro xfs: kill xfs_fs_repair_cmn_err() macro xfs: convert xfs_cmn_err to xfs_alert_tag xfs: Convert xlog_warn to new logging interface xfs: Convert linux-2.6/ files to new logging interface xfs: introduce new logging API. xfs: zero proper structure size for geometry calls xfs: enable delaylog by default xfs: more sensible inode refcounting for ialloc xfs: stop using xfs_trans_iget in the RT allocator xfs: check if device support discard in xfs_ioc_trim() xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1 ... commit da48524eb20662618854bb3df2db01fc65f3070c Author: Julien Tinnes Date: Fri Mar 18 15:05:21 2011 -0700 Prevent rt_sigqueueinfo and rt_tgsigqueueinfo from spoofing the signal code Userland should be able to trust the pid and uid of the sender of a signal if the si_code is SI_TKILL. Unfortunately, the kernel has historically allowed sigqueueinfo() to send any si_code at all (as long as it was negative - to distinguish it from kernel-generated signals like SIGILL etc), so it could spoof a SI_TKILL with incorrect siginfo values. Happily, it looks like glibc has always set si_code to the appropriate SI_QUEUE, so there are probably no actual user code that ever uses anything but the appropriate SI_QUEUE flag. So just tighten the check for si_code (we used to allow any negative value), and add a (one-time) warning in case there are binaries out there that might depend on using other si_code values. Signed-off-by: Julien Tinnes Acked-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit b52307ca144881bf9ef1c2610b3f1911472eb467 Merge: afd8c40 2d01b26 Author: Linus Torvalds Date: Mon Mar 21 14:13:48 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest: ktest: Add STOP_TEST_AFTER to stop the test after a period of time ktest: Monitor kernel while running of user tests ktest: Fix bug where the test would not end after failure ktest: Add BISECT_FILES to run git bisect on paths ktest: Add BISECT_SKIP ktest: Add manual bisect ktest: Handle kernels before make oldnoconfig ktest: Start failure timeout on panic too ktest: Print logfile name on failure commit afd8c40431cc9e3b468a506cbf9957ffca3466fe Merge: 366f7e7 c004686 Author: Linus Torvalds Date: Mon Mar 21 14:02:55 2011 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (ads1015) Make gain and datarate configurable hwmon: (ads1015) Drop dynamic attribute group hwmon: Add support for Texas Instruments ADS1015 hwmon: New driver for SMSC SCH5627 hwmon: (abituguru*) Update my email address hwmon: (lm75) Speed up detection hwmon: (lm75) Add detection of the National Semiconductor LM75A hp_accel: Fix driver name Move lis3lv02d drivers to drivers/misc Move hp_accel to drivers/platform/x86 Let Kconfig handle lis3lv02d dependencies hwmon: (sht15) Fix integer overflow in humidity calculation hwmon: (sht15) Spelling fix hwmon: (w83795) Document pin mapping commit 366f7e7a79b19bd8c4e8f55fdf12b81538d1a7a4 Author: Luck, Tony Date: Fri Mar 18 15:33:43 2011 -0700 pstore: use mount option instead sysfs to tweak kmsg_bytes /sys/fs is a somewhat strange way to tweak what could more obviously be tuned with a mount option. Suggested-by: Christoph Hellwig Signed-off-by: Tony Luck Signed-off-by: Linus Torvalds commit 147851d2dc4d2be2f60d40276d12d7ef82f8a7ce Author: Sage Weil Date: Tue Mar 15 14:57:41 2011 -0700 ceph: rename dentry_release -> d_release, fix comment Just for consistency's sake. Fix obsolete comment too. Signed-off-by: Sage Weil commit 49bcb93236ce1c60d9b7eb21a0aea1999f4d8709 Author: Henry C Chang Date: Tue Mar 15 09:18:02 2011 +0000 ceph: add request to the tail of unsafe write list In sync_write_wait(), we assume that the newest request is at the tail of unsafe write list. We should maintain the semantics here. Signed-off-by: Henry C Chang Signed-off-by: Sage Weil commit 78a255654fa7f01945dea0dcedcf5113b3ad9f93 Author: Henry C Chang Date: Tue Mar 15 09:18:01 2011 +0000 ceph: remove request from unsafe list if it is canceled/timed out This fixes the list corruption warning like this: ------------[ cut here ]------------ WARNING: at lib/list_debug.c:30 __list_add+0x68/0x81() Hardware name: X8DTU list_add corruption. prev->next should be next (ffff880618931250), but was (null). (prev=ffff880c188b9130). Modules linked in: nfsd lockd nfs_acl auth_rpcgss exportfs ceph libceph libcrc32c sunrpc ipv6 fuse igb i2c_i801 ioatdma i2c_core iTCO_wdt iTCO_vendor_support joydev dca serio_raw usb_storage [last unloaded: scsi_wait_scan] Pid: 10977, comm: smbd Tainted: G W 2.6.32.23-170.Elaster.xendom0.fc12.x86_64 #1 Call Trace: [] warn_slowpath_common+0x7c/0x94 [] warn_slowpath_fmt+0x41/0x43 [] __list_add+0x68/0x81 [] ceph_aio_write+0x614/0x8a2 [ceph] [] do_sync_write+0xe8/0x125 [] ? autoremove_wake_function+0x0/0x39 [] ? selinux_file_permission+0x5c/0xb3 [] ? security_file_permission+0x16/0x18 [] vfs_write+0xae/0x10b [] sys_pwrite64+0x5a/0x76 [] system_call_fastpath+0x16/0x1b ---[ end trace 08573eb9f07ff6f4 ]--- Signed-off-by: Henry C Chang Signed-off-by: Sage Weil commit 80456f8672f7e69d05c01627da03587dc1ea1603 Author: Sage Weil Date: Thu Mar 10 13:33:26 2011 -0800 ceph: move readahead default to fs/ceph from libceph Signed-off-by: Sage Weil commit ad1fee96cbaf873520064252c5dc3212c9844861 Author: Yehuda Sadeh Date: Fri Jan 21 16:44:03 2011 -0800 ceph: add ino32 mount option The ino32 mount option forces the ceph fs to report 32 bit ino values. This is useful for 64 bit kernels with 32 bit userspace. Signed-off-by: Yehuda Sadeh commit 483fac71485e5063ff4033b6dc7d91567f1b6ff1 Author: Yehuda Sadeh Date: Thu Jan 20 16:36:06 2011 -0800 ceph: update common header files This updates the common header files used by the different ceph related modules. Specifically it adds definitions required by the rbd watch/notify feature. Signed-off-by: Yehuda Sadeh commit 21f3b5f1bbc3c27e82a8c9fc9861fa20bcb31f26 Author: Sage Weil Date: Wed Jan 19 09:45:22 2011 -0800 ceph: remove debugfs debug cruft Whoops! Signed-off-by: Sage Weil commit 6f6c7006755b667f9f6c1f3b6f08cd65f75cc471 Author: Sage Weil Date: Mon Jan 17 20:34:08 2011 -0800 libceph: fix osd request queuing on osdmap updates If we send a request to osd A, and the request's pg remaps to osd B and then back to A in quick succession, we need to resend the request to A. The old code was only calling kick_requests after processing all incremental maps in a message, so it was very possible to not resend a request that needed to be resent. This would make the osd eventually time out (at least with the current default of osd timeouts enabled). The correct approach is to scan requests on every map incremental. This patch refactors the kick code in a few ways: - all requests are either on req_lru (in flight), req_unsent (ready to send), or req_notarget (currently map to no up osd) - mapping always done by map_request (previous map_osds) - if the mapping changes, we requeue. requests are resent only after all map incrementals are processed. - some osd reset code is moved out of kick_requests into a separate function - the "kick this osd" functionality is moved to kick_osd_requests, as it is unrelated to scanning for request->pg->osd mapping changes Signed-off-by: Sage Weil commit 8bc8aecdc5e26cfda12dbd6867af4aa67836da6a Author: Felix Fietkau Date: Mon Mar 21 20:01:00 2011 +0100 mac80211: initialize sta->last_rx in sta_info_alloc This field is used to determine the inactivity time. When in AP mode, hostapd uses it for kicking out inactive clients after a while. Without this patch, hostapd immediately deauthenticates a new client if it checks the inactivity time before the client sends its first data frame. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 61e1b0b00c793ad5a32fe2181c9f77115fed5dc4 Author: Mohammed Shafi Shajakhan Date: Mon Mar 21 18:27:21 2011 +0530 ath9k: Fix kernel panic in AR2427 Kernel panic occurs just after AR2427 establishes connection with AP. Unless aggregation is enabled we don't initialize the TID structure. Thus accesing the elements of the TID structure when aggregation is disabled, leads to NULL pointer dereferencing. [ 191.320358] Call Trace: [ 191.320364] [] ? ath9k_tx+0xa7/0x200 [ath9k] [ 191.320376] [] ? __ieee80211_tx+0x5c/0x1e0 [mac80211] [ 191.320386] [] ? ieee80211_tx+0x7b/0x90 [mac80211] [ 191.320395] [] ? ieee80211_xmit+0x9d/0x1d0 [mac80211] [ 191.320401] [] ? wake_up_state+0xf/0x20 [ 191.320405] [] ? signal_wake_up+0x28/0x40 [ 191.320410] [] ? default_spin_lock_flags+0x8/0x10 [ 191.320420] [] ? ieee80211_subif_start_xmit+0x2e8/0x7c0 [mac80211] [ 191.320425] [] ? do_page_fault+0x295/0x3a0 [ 191.320431] [] ? dev_hard_start_xmit+0x1ad/0x210 [ 191.320436] [] ? sch_direct_xmit+0x105/0x170 [ 191.320445] [] ? get_sta_flags+0x2a/0x40 [mac80211] [ 191.320449] [] ? dev_queue_xmit+0x37f/0x4b0 [ 191.320452] [] ? eth_header+0x0/0xb0 [ 191.320456] [] ? neigh_resolve_output+0xe9/0x310 [ 191.320461] [] ? ip6_output_finish+0xa5/0x110 [ 191.320464] [] ? ip6_output2+0x134/0x250 [ 191.320468] [] ? ip6_output+0x6d/0x100 [ 191.320471] [] ? mld_sendpack+0x395/0x3e0 [ 191.320475] [] ? add_grhead+0x31/0xa0 [ 191.320478] [] ? mld_send_cr+0x1bc/0x2b0 [ 191.320482] [] ? irq_exit+0x39/0x70 [ 191.320485] [] ? mld_ifc_timer_expire+0x10/0x40 [ 191.320489] [] ? run_timer_softirq+0x13e/0x2c0 [ 191.320493] [] ? common_interrupt+0x30/0x40 [ 191.320498] [] ? mld_ifc_timer_expire+0x0/0x40 [ 191.320502] [] ? __do_softirq+0x98/0x1b0 [ 191.320506] [] ? do_softirq+0x45/0x50 [ 191.320509] [] ? irq_exit+0x65/0x70 [ 191.320513] [] ? smp_apic_timer_interrupt+0x5c/0x8b [ 191.320516] [] ? apic_timer_interrupt+0x31/0x40 [ 191.320521] [] ? k_getrusage+0x12b/0x2f0 [ 191.320525] [] ? acpi_idle_enter_simple+0x117/0x148 [ 191.320529] [] ? cpuidle_idle_call+0x7a/0x100 [ 191.320532] [] ? cpu_idle+0x94/0xd0 [ 191.320536] [] ? rest_init+0x58/0x60 [ 191.320541] [] ? start_kernel+0x351/0x357 [ 191.320544] [] ? unknown_bootoption+0x0/0x19e [ 191.320548] [] ? i386_start_kernel+0xaa/0xb1 [ 191.320550] Code: 03 66 3d 00 03 0f 84 7c 02 00 00 83 c3 18 0f b6 03 8b 4d e0 89 c3 83 e3 0f 6b c3 48 89 5d d8 8d 04 06 8d 50 0c 89 55 d0 8b 40 20 <8b> 00 3b 01 0f 85 8e 02 00 00 f6 47 20 40 0f 84 29 ff ff ff 8b [ 191.320634] EIP: [] ath_tx_start+0x474/0x770 [ath9k] SS:ESP 0068:c0761a90 [ 191.320642] CR2: 0000000000000000 [ 191.320647] ---[ end trace 9296ef23b9076ece ]--- [ 191.320650] Kernel panic - not syncing: Fatal exception in interrupt Cc: stable@kernel.org Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 858022aa6fad90ec86c567cbf54682a61dd39a01 Author: Randy Dunlap Date: Fri Mar 18 09:33:02 2011 -0700 wireless: fix 80211 kernel-doc warnings Fix many of each of these warnings: Warning(include/net/cfg80211.h:519): No description found for parameter 'rxrate' Warning(include/net/mac80211.h:1163): bad line: Signed-off-by: Randy Dunlap Cc: Johannes Berg Signed-off-by: John W. Linville commit 6e9d592f02f657361168c94e22d9602cad71a09c Author: Ilia Mirkin Date: Thu Mar 17 14:08:57 2011 -0400 rtlwifi: Fix memset argument order These were found using the following semantic match: // @@expression E1; type T;@@ * memset(E1, ... * sizeof(T) * ..., ...); // Also take this opportunity to remove the unnecessary void* casts. Signed-off-by: Ilia Mirkin Tested-by: Larry Finger Acked-by: Larry Finger Signed-off-by: John W. Linville commit 5da201a4c86aac6c46a071c5c8255601090b65b2 Author: Peter Lemenkov Date: Wed Mar 16 17:12:18 2011 +0300 rt2x00: Add unknown Toshiba device Add unknown Toshiba device, mentioned in rt3572sta sources, under CONFIG_RT2800USB_UNKNOWN Signed-off-by: Peter Lemenkov Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 9a74597235e54c16c31da62835e2e9285c631044 Author: Peter Lemenkov Date: Wed Mar 16 17:12:17 2011 +0300 rt2x00: Add 2L Central Europe BV 8070 Add 2L Central Europe BV 8070 under CONFIG_RT2800USB_UNKNOWN Signed-off-by: Peter Lemenkov Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7a2a75bcc2a54c9b87c8b3831c5369717fcf513d Author: Peter Lemenkov Date: Wed Mar 16 17:12:16 2011 +0300 rt2x00: Add Planex Communications, Inc. RT8070 Add Planex Communications, Inc. RT8070 under CONFIG_RT2800USB_UNKNOWN Signed-off-by: Peter Lemenkov Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2cea5b3c0ce976eae78bdaa192223f952185045c Author: Peter Lemenkov Date: Wed Mar 16 17:12:15 2011 +0300 rt2x00: Add rt2870 device id Add ID for Asus USB-N11 Wi-FI adapter. Tested by me. Signed-off-by: Peter Lemenkov Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 3bf184a7e96ff21965fa524260f60af8ab4d9133 Author: Joe Gunn Date: Tue Mar 15 08:41:19 2011 -0700 orinoco: Maintain lock until entry removed from list Removing an entry from the scan_list should be performed while holding the lock. Signed-off-by: Joseph J. Gunn Signed-off-by: John W. Linville commit f8a22a2b165c79a46e275097fcadab7fd151c504 Author: Dan Carpenter Date: Tue Mar 15 10:01:58 2011 +0300 iwlwifi: missing unlock on error path We should unlock here instead of returning -EINVAL directly. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 9011cd250e26d9159943895adf29453af1b93298 Author: Tõnu Samuel Date: Sat Mar 12 11:29:25 2011 +0200 zd1211rw: TrendNet TEW-509UB id added Signed-off-by: Tõnu Samuel Signed-off-by: John W. Linville commit 071c7783479ac3beb09a21e74305a4f6af1e68d6 Merge: 7b7adc4 be8b981 Author: Roland Dreier Date: Mon Mar 21 11:52:00 2011 -0700 Merge branch 'external-indirect' of git://git.kernel.org/pub/scm/linux/kernel/git/dad/srp-initiator into srp commit 10effcb548c170d59ea1d2152f2ee0ad45ce4c9d Merge: c3ca48f 0f60f24 Author: Linus Torvalds Date: Mon Mar 21 10:06:51 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: FS: lookup_mnt() is only used in the core fs routines now bfs: fix bitmap size argument to find_first_zero_bit() fs: Use BUG_ON(!mnt) at dentry_open(). fs: devpts_pty_new() return -ENOMEM if dentry allocation failed nfs: lock() vs unlock() typo pstore: fix leaking ->i_private introduce sys_syncfs to sync a single file system Small typo fix... Filesystem: fifo: Fixed coding style issue. fs/inode: Fix kernel-doc format for inode_init_owner select: remove unused MAX_SELECT_SECONDS vfs: cleanup do_vfs_ioctl() commit c3ca48f062a37c2f79560a9b0b9f1b08039aa248 Merge: 4e76ae4 115881d Author: Linus Torvalds Date: Mon Mar 21 10:05:22 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: core: ignore link-active bit of new nodes, fix device recognition firewire: sbp2: revert obsolete 'fix stall with "Unsolicited response"' firewire: core: increase default SPLIT_TIMEOUT value firewire: ohci: Misleading kfree in ohci.c::pci_probe/remove firewire: ohci: omit IntEvent.busReset check rom AT queueing firewire: ohci: prevent starting of iso contexts with empty queue firewire: ohci: prevent iso completion callbacks after context stop firewire: core: rename some variables firewire: nosy: should work on Power Mac G4 PCI too firewire: core: fix card->reset_jiffies overflow firewire: cdev: remove unneeded reference firewire: cdev: always wait for outbound transactions to complete firewire: cdev: remove unneeded idr_find() from complete_transaction() firewire: ohci: log dead DMA contexts commit 4e76ae4406449811c0b743ccf0612ef6ffcf2acb Merge: f19ade4 1c0f647 Author: Linus Torvalds Date: Mon Mar 21 10:04:53 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] Convert to new irq_chip functions [PARISC] fix per-cpu flag problem in the cpu affinity checkers [PARISC] fix vmap flush/invalidate eliminate special FLUSH flag from page table parisc: flush pages through tmpalias space commit c0046867f34bb81ec3f237ebbc5241ae678b8379 Author: Dirk Eibach Date: Mon Mar 21 17:59:37 2011 +0100 hwmon: (ads1015) Make gain and datarate configurable Configuration for ads1015 gain and datarate is possible via devicetree or platform data. This is a followup patch to previous ads1015 patches on Jean Delvares tree. Signed-off-by: Dirk Eibach Signed-off-by: Jean Delvare commit fdf241a8ed93236915c70717a4b6dfb856274496 Author: Jean Delvare Date: Mon Mar 21 17:59:37 2011 +0100 hwmon: (ads1015) Drop dynamic attribute group It is cheaper to handle attributes individually. Signed-off-by: Jean Delvare Acked-by: Dirk Eibach commit 8c22a8f57516275afcd81c84f3724ac08cf6aa7b Author: Dirk Eibach Date: Mon Mar 21 17:59:36 2011 +0100 hwmon: Add support for Texas Instruments ADS1015 Signed-off-by: Dirk Eibach Signed-off-by: Jean Delvare commit a98d506c08ffe754fa013c7f70c4d578b991fb4b Author: Hans de Goede Date: Mon Mar 21 17:59:36 2011 +0100 hwmon: New driver for SMSC SCH5627 SMSC SCH5627 Super I/O chips include complete hardware monitoring capabilities. They can monitor up to 5 voltages, 4 fans and 8 temperatures. The hardware monitoring part of the SMSC SCH5627 is accessed by talking through an embedded microcontroller. An application note describing the protocol for communicating with the microcontroller is available upon request. Please mail me if you want a copy. Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare commit 93d0cc588345a9de304285781e010e298f74e06e Author: Hans de Goede Date: Mon Mar 21 17:59:36 2011 +0100 hwmon: (abituguru*) Update my email address Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare commit e76f67b5babc65cd620d395a1fd231409808df90 Author: Jean Delvare Date: Mon Mar 21 17:59:36 2011 +0100 hwmon: (lm75) Speed up detection Make the LM75/LM75A device detection faster: * Don't read the current temperature value when we don't use it. * Check for unused bits in the configuration register as soon as we have read its value. * Don't use word reads, not all devices support this, and some which don't misbehave when you try. * Check for cycling register values every 40 register addresses instead of every 8, it's 5 times faster and just as efficient. Some of these improvements come straight from the user-space sensors-detect script, so both detection routines are in line now. Signed-off-by: Jean Delvare Cc: Len Sorensen Acked-by: Guenter Roeck commit 05e82fe40faee8499b4e3ba12fddaaf013d84203 Author: Len Sorensen Date: Mon Mar 21 17:59:36 2011 +0100 hwmon: (lm75) Add detection of the National Semiconductor LM75A Add support for detection of the National Semiconductor LM75A using the ID register value. Signed-off-by: Len Sorensen Signed-off-by: Jean Delvare commit 96b4b9bfea28e38c38d26ca47e82ac0fbe2f28b6 Author: Jean Delvare Date: Mon Mar 21 17:59:36 2011 +0100 hp_accel: Fix driver name I suspect that the "lis3lv02d" driver name is a legacy from before the split into several modules. Use a specific name for the hp_accel driver, for better error messages and easier investigation of issues. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck Acked-by: Eric Piel Acked-by: Jonathan Cameron Tested-by: Eric Piel Tested-by: Takashi Iwai commit ff606677f6a47c63329cf8e6c7cf978c29f2d736 Author: Jean Delvare Date: Mon Mar 21 17:59:36 2011 +0100 Move lis3lv02d drivers to drivers/misc The lis3lv02d drivers aren't hardware monitoring drivers, so the don't belong to drivers/hwmon. Move them to drivers/misc, short of a better home. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck Acked-by: Eric Piel Acked-by: Jonathan Cameron Tested-by: Eric Piel Tested-by: Takashi Iwai commit efcfed9bad88be8193ee6a1b8e72d7381e7b0e0e Author: Jean Delvare Date: Mon Mar 21 17:59:36 2011 +0100 Move hp_accel to drivers/platform/x86 The hp_accel driver isn't a hardware monitoring driver, so it doesn't belong to drivers/hwmon. Move it to drivers/platform/x86, assuming HP doesn't ship non-x86 laptops. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck Acked-by: Eric Piel Acked-by: Jonathan Cameron Tested-by: Eric Piel Tested-by: Takashi Iwai commit 39c3e721d65793373e7bc6f5dad0591ef6d09268 Author: Jean Delvare Date: Mon Mar 21 17:59:35 2011 +0100 Let Kconfig handle lis3lv02d dependencies The dependencies between the various lis3lv02d drivers make it impossible to split them to different directories, while we really want to do this. Move handling of dependencies from Makefile to Kconfig, to make the move possible at all. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck Acked-by: Eric Piel Acked-by: Jonathan Cameron Tested-by: Eric Piel Tested-by: Takashi Iwai commit ccd32e735de7a941906e093f8dca924bb05c5794 Author: Vivien Didelot Date: Mon Mar 21 17:59:35 2011 +0100 hwmon: (sht15) Fix integer overflow in humidity calculation An integer overflow occurs in the calculation of RHlinear when the relative humidity is greater than around 30%. The consequence is a subtle (but noticeable) error in the resulting humidity measurement. Signed-off-by: Vivien Didelot Signed-off-by: Jean Delvare Cc: stable@kernel.org Cc: Jonathan Cameron commit 396bd766a604b823369962ee0203c603b9c0bdec Author: Justin P. Mattock Date: Mon Mar 21 17:59:35 2011 +0100 hwmon: (sht15) Spelling fix Remove one too many "n" in a word. Signed-off-by: Justin P. Mattock Acked-by: Jean Delvare commit bfcd415dcb8042084d560a69a7aebb4b1f98a4db Author: Jean Delvare Date: Mon Mar 21 17:59:35 2011 +0100 hwmon: (w83795) Document pin mapping Apparently users are interested in this information, so let's provide it. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck commit f19ade4dfbfefbb44b412fc33a2db26eafd63f0e Merge: 111f426 b3f80f6 Author: Linus Torvalds Date: Mon Mar 21 09:53:04 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Add {open_by,name_to}_handle_at and clock_adjtime syscalls. sparc: Implement of_iomap(). sparc: Implement of_address_to_resource(). sparc: Provide NO_IRQ definition. commit 111f4268bd69cb040bf05038785cfbc4087f6341 Merge: a44f99c a71f5d5 Author: Linus Torvalds Date: Mon Mar 21 09:52:27 2011 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ptrace: Remove BUG_ON when full register set not available powerpc: Factoring mpic cpu id fetching into a function powerpc: Make MPIC honor the "pic-no-reset" device tree property powerpc: Document the Open PIC device tree binding powerpc/pci: Fix crash in PCI code on ppc64 when matching device nodes commit eca67315e0e0d5fd91264d79c88694006dbc7d31 Author: Naga Chumbalkar Date: Mon Mar 21 03:29:20 2011 +0000 PCI: Disable ASPM when _OSC control is not granted for PCIe services v3 -> v2: Added text to describe the problem v2 -> v1: Split this patch from v1 v1 : Part of: http://marc.info/?l=linux-pci&m=130042212003242&w=2 Disable ASPM when no _OSC control for PCIe services is granted by the BIOS. This is to protect systems with a buggy BIOS that did not set the ACPI FADT "ASPM Controls" bit even though the underlying HW can't do ASPM. To turn "on" ASPM the minimum the BIOS needs to do: 1. Clear the ACPI FADT "ASPM Controls" bit. 2. Support _OSC appropriately There is no _OSC Control bit for ASPM. However, we expect the BIOS to support _OSC for a Root Bridge that originates a PCIe hierarchy. If this is not the case - we are better off not enabling ASPM on that server. Commit 852972acff8f10f3a15679be2059bb94916cba5d (ACPI: Disable ASPM if the Platform won't provide _OSC control for PCIe) describes the above scenario. To quote verbatim from there: [The PCI SIG documentation for the _OSC OS/firmware handshaking interface states: "If the _OSC control method is absent from the scope of a host bridge device, then the operating system must not enable or attempt to use any features defined in this section for the hierarchy originated by the host bridge." The obvious interpretation of this is that the OS should not attempt to use PCIe hotplug, PME or AER - however, the specification also notes that an _OSC method is *required* for PCIe hierarchies, and experimental validation with An Alternative OS indicates that it doesn't use any PCIe functionality if the _OSC method is missing. That arguably means we shouldn't be using MSI or extended config space, but right now our problems seem to be limited to vendors being surprised when ASPM gets enabled on machines when other OSs refuse to do so. So, for now, let's just disable ASPM if the _OSC method doesn't exist or refuses to hand over PCIe capability control.] Signed-off-by: Naga Chumbalkar Cc: Rafael J. Wysocki Cc: Matthew Garrett Signed-off-by: Jesse Barnes commit bbfa306a1e5d9618231aa0de3d52a8eb1219d0c3 Author: Naga Chumbalkar Date: Mon Mar 21 03:29:14 2011 +0000 PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs v3 -> v2: Modified the text that describes the problem v2 -> v1: Returned -EPERM v1 : http://marc.info/?l=linux-pci&m=130013194803727&w=2 For servers whose hardware cannot handle ASPM the BIOS ought to set the FADT bit shown below: In Sec 5.2.9.3 (IA-PC Boot Arch. Flags) of ACPI4.0a Specification, please see Table 5-11: PCIe ASPM Controls: If set, indicates to OSPM that it must not enable OPSM ASPM control on this platform. However there are shipping servers whose BIOS did not set this bit. (An example is the HP ProLiant DL385 G6. A Maintenance BIOS will fix that). For such servers even if a call is made via pci_no_aspm(), based on _OSC support in the BIOS, it may be too late because the ASPM code may have already allocated and filled its "link_list". So if a user sets the ASPM "policy" to "powersave" via /sys then pcie_aspm_set_policy() will run through the "link_list" and re-configure ASPM policy on devices that advertise ASPM L0s/L1 capability: # echo powersave > /sys/module/pcie_aspm/parameters/policy # cat /sys/module/pcie_aspm/parameters/policy default performance [powersave] That can cause NMIs since the hardware doesn't play well with ASPM: [ 1651.906015] NMI: PCI system error (SERR) for reason b1 on CPU 0. [ 1651.906015] Dazed and confused, but trying to continue Ideally, the BIOS should have set that FADT bit in the first place but we could be more robust - especially given the fact that Windows doesn't cause NMIs in the above scenario. There should be a sanity check to not allow a user to modify ASPM policy when aspm_disabled is set. Signed-off-by: Naga Chumbalkar Acked-by: Rafael J. Wysocki Cc: Matthew Garrett Signed-off-by: Jesse Barnes commit 1a680b7c325882188865f05b9a88d32f75f26495 Author: Naga Chumbalkar Date: Mon Mar 21 03:29:08 2011 +0000 PCI: PCIe links may not get configured for ASPM under POWERSAVE mode v3 -> v2: Moved ASPM enabling logic to pci_set_power_state() v2 -> v1: Preserved the logic in pci_raw_set_power_state() : Added ASPM enabling logic after scanning Root Bridge : http://marc.info/?l=linux-pci&m=130046996216391&w=2 v1 : http://marc.info/?l=linux-pci&m=130013164703283&w=2 The assumption made in commit 41cd766b065970ff6f6c89dd1cf55fa706c84a3d (PCI: Don't enable aspm before drivers have had a chance to veto it) that pci_enable_device() will result in re-configuring ASPM when aspm_policy is POWERSAVE is no longer valid. This is due to commit 97c145f7c87453cec90e91238fba5fe2c1561b32 (PCI: read current power state at enable time) which resets dev->current_state to D0. Due to this the call to pcie_aspm_pm_state_change() is never made. Note the equality check (below) that returns early: ./drivers/pci/pci.c: pci_raw_set_pci_power_state() 546 /* Check if we're already there */ 547 if (dev->current_state == state) 548 return 0; Therefore OSPM never configures the PCIe links for ASPM to turn them "on". Fix it by configuring ASPM from the pci_enable_device() code path. This also allows a driver such as the e1000e networking driver a chance to disable ASPM (L0s, L1), if need be, prior to enabling the device. A driver may perform this action if the device is known to mis-behave wrt ASPM. Signed-off-by: Naga Chumbalkar Acked-by: Rafael J. Wysocki Cc: Matthew Garrett Signed-off-by: Jesse Barnes commit 8b8bae901ce23addbdcdb54fa1696fb2d049feb5 Author: Rafael J. Wysocki Date: Sat Mar 5 13:21:51 2011 +0100 PCI/ACPI: Report ASPM support to BIOS if not disabled from command line We need to distinguish the situation in which ASPM support is disabled from the command line or through .config from the situation in which it is disabled, because the hardware or BIOS can't handle it. In the former case we should not report ASPM support to the BIOS through ACPI _OSC, but in the latter case we should do that. Introduce pcie_aspm_support_enabled() that can be used by acpi_pci_root_add() to determine whether or not it should report ASPM support to the BIOS through _OSC. Cc: stable@kernel.org References: https://bugzilla.kernel.org/show_bug.cgi?id=29722 References: https://bugzilla.kernel.org/show_bug.cgi?id=20232 Reported-and-tested-by: Ortwin Glück Reviewed-by: Kenji Kaneshige Tested-by: Kenji Kaneshige Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 0f60f240d522772467c7d2cebedb910748c78ed4 Author: David Howells Date: Mon Mar 21 14:28:58 2011 +0000 FS: lookup_mnt() is only used in the core fs routines now lookup_mnt() is only used in the core fs routines now, so it doesn't need to be globally declared anymore. It isn't exported to modules at the moment, so nothing that can be modularised seems to be using it. Signed-off-by: David Howells Signed-off-by: Al Viro commit 33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 Author: Jesper Nilsson Date: Mon Mar 21 16:07:05 2011 +0100 Correct auto-restart of syscalls via restartblock This would for example be poll(2) Signed-off-by: Jesper Nilsson commit 32cb0840ce8e13901fe71a9a8e834a531802ffc4 Author: Josef Bacik Date: Fri Mar 18 16:16:21 2011 -0400 Btrfs: don't be as aggressive about using bitmaps We have been creating bitmaps for small extents unconditionally forever. This was great when testing to make sure the bitmap stuff was working, but is overkill normally. So instead of always adding small chunks of free space to bitmaps, only start doing it if we go past half of our extent threshold. This will keeps us from creating a bitmap for just one small free extent at the front of the block group, and will make the allocator a little faster as a result. Thanks, Signed-off-by: Josef Bacik commit d0a365e84a886ce6b5b7f7a76be0bb24934ec8f0 Author: Josef Bacik Date: Fri Mar 18 15:27:43 2011 -0400 Btrfs: deal with min_bytes appropriately when looking for a cluster We do all this fun stuff with min_bytes, but either don't use it in the case of just normal extents, or use it completely wrong in the case of bitmaps. So fix this for both cases 1) In the extent case, stop looking for space with window_free >= min_bytes instead of bytes + empty_size. 2) In the bitmap case, we were looking for streches of free space that was at least min_bytes in size, which was not right at all. So instead search for stretches of free space that are at least bytes in size (this will make a difference when we have > page size blocks) and then only search for min_bytes amount of free space. Thanks, Reviewed-by: Li Zefan Signed-off-by: Josef Bacik commit 7d0d2e8e6b6f7da221a25238cf490a095c8c4788 Author: Josef Bacik Date: Fri Mar 18 15:13:42 2011 -0400 Btrfs: check free space in block group before searching for a cluster The free space cluster stuff is heavy duty, so there is no sense in going through the entire song and dance if there isn't enough space in the block group to begin with. Thanks, Signed-off-by: Josef Bacik commit e7c0a167860620bd2938366896964f729ddaeaaa Author: Miklos Szeredi Date: Mon Mar 21 13:58:06 2011 +0100 fuse: make fuse_dentry_revalidate() RCU aware Only bail out of fuse_dentry_revalidate() on LOOKUP_RCU when blocking is actually necessary. CC: Nick Piggin Signed-off-by: Miklos Szeredi commit 19690ddb65dbfc7be1b411fce12d3332acefbfb5 Author: Miklos Szeredi Date: Mon Mar 21 13:58:06 2011 +0100 fuse: make fuse_permission() RCU aware Only bail out of fuse_permission() on IPERM_FLAG_RCU when blocking is actually necessary. CC: Nick Piggin Signed-off-by: Miklos Szeredi commit 357ccf2b69bcefa650a54db83702381d1c9d6959 Author: Bryan Green Date: Tue Mar 1 16:43:52 2011 -0800 fuse: wakeup pollers on connection release/abort If a fuse dev connection is broken, wake up any processes that are blocking, in a poll system call, on one of the files in the now defunct filesystem. Signed-off-by: Miklos Szeredi commit 07d5f69b457019eda4ca568923b1d62b7ada89e1 Author: Miklos Szeredi Date: Mon Mar 21 13:58:05 2011 +0100 fuse: reduce size of struct fuse_request Reduce the size of struct fuse_request by removing cuse_init_out from the request structure and allocating it dinamically instead. CC: Tejun Heo Signed-off-by: Miklos Szeredi commit 69b195be51620d72956acbf3029adad5765695dc Author: Akinobu Mita Date: Mon Mar 21 08:32:53 2011 -0400 bfs: fix bitmap size argument to find_first_zero_bit() The usage of find_first_zero_bit() in bfs_create() is wrong for two reasons. The bitmap size argument to find_first_zero_bit() is info->si_lasti but the correct bitmap size is info->si_lasti + 1 as info->si_lasti is the last valid index in info->si_imap bitmap. Another problem is that it is impossible to detect that info->si_imap bitmap is full because there is an off-by-one bug in the return value check for find_first_zero_bit(). If no zero bits exist in info->si_imap, find_first_zero_bit() returns info->si_lasti. But the check can't catch it due to the off-by-one. Signed-off-by: Akinobu Mita Acked-by: "Tigran A. Aivazian" Signed-off-by: Andrew Morton Signed-off-by: Al Viro commit 75eb1c311da47d32ba47825226e110df703b35d0 Author: Andres Mejia Date: Sun Mar 20 14:07:40 2011 -0400 ALSA: hda - Set EAPD for Realtek ALC665 Set EAPD for Realtek ALC665 (Vendor Id: 0x10eSet EAPD for Realtek ALC665 (Vendor Id: 0x10ec0665). Signed-off-by: Andres Mejia Signed-off-by: Takashi Iwai commit 3ffc1222bd2c30b0ef2d3a797b0e0070c7c61a98 Author: Takashi Iwai Date: Mon Mar 21 12:00:00 2011 +0100 ALSA: usb - Remove trailing spaces from USB card name strings Some USB devices give trailing spaces in strings returned from usb_string(). This confuses the automatic card-id creation, resulting always in "default". This patch fixes the behavior by removing trailing spaces. Signed-off-by: Takashi Iwai commit 33874cb8cdce865938094e1a317cbfe2d7fb1ad7 Author: Jesper Nilsson Date: Mon Mar 21 11:52:41 2011 +0100 CRISv10: Fix return before mutex_unlock in pcf8563 Signed-off-by: Simone Contini Signed-off-by: Jesper Nilsson commit 7673538cf8c9ddd1eeb2c3712b5603816f576483 Author: Jesper Nilsson Date: Mon Mar 21 11:52:11 2011 +0100 Drop the CRISv32 version of pcf8563 No longer used. Signed-off-by: Jesper Nilsson commit f2c23f65f63fe0dd83fc94efdfae0364c74458b8 Author: Michal Marek Date: Mon Mar 21 10:44:30 2011 +0100 kbuild: Make DEBUG_SECTION_MISMATCH selectable, but not on by default CONFIG_DEBUG_SECTION_MISMATCH has also runtime effects due to the -fno-inline-functions-called-once compiler flag, so forcing it on everyone is not a good idea. Signed-off-by: Michal Marek commit 23e74a86ab43e5cccbf90edb76fc396e36acc998 Author: Vasily Khoruzhick Date: Sun Mar 13 15:53:28 2011 +0200 i2c-pxa2xx: Fix register offsets Fix regression that was introduced by dynamic register layout. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit baa8cab012ff07d6835580b19c2fd93a20627823 Author: Sebastian Andrzej Siewior Date: Wed Feb 23 12:38:20 2011 +0100 i2c-pxa2xx: pass of_node from platform driver to adapter and publish the of_node will auto-publish devices which are added to the device tree. Commit 925bb9c6 aka ("of/i2c: Fix module load order issue caused by of_i2c.c) moved the of_i2c_register_devices() function from the i2c core back to the drivers. This patch does the same thing for the pxa driver. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Signed-off-by: Ben Dooks commit 93c92cfdec8c3f8764894b37606c174f68fd9338 Author: Sebastian Andrzej Siewior Date: Wed Feb 23 12:38:19 2011 +0100 i2c-pxa2xx: check timeout correctly timeout here maybe 0 if the event occured and a task with a higher priority stole the cpu and we were sleeping longer than the timeout value we specified. In case of a real timeout I changed the error code to I2C_RETRY so we retry the transfer. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Signed-off-by: Ben Dooks commit c66dc529194be374556d166ee7ddb84a7d1d302b Author: Sebastian Andrzej Siewior Date: Wed Feb 23 12:38:18 2011 +0100 i2c-pxa2xx: add support for shared IRQ handler Sodaville has three of them on a single IRQ. IRQF_DISABLED is removed because it is a NOP allready and scheduled for removal. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Signed-off-by: Ben Dooks commit 7e94dd154e934aa2137c427c3b1c8e9a6e465fcd Author: Sebastian Andrzej Siewior Date: Wed Mar 2 11:26:53 2011 +0100 i2c-pxa2xx: Add PCI support for PXA I2C controller The Sodaville I2C controller is almost the same as found on PXA2xx. The difference: - the register are at a different offset - no slave support The PCI probe code adds three platform devices which are probed then by the platform code. The X86 part also adds dummy clock defines because we don't have HW clock support. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Signed-off-by: Ben Dooks commit 5e84ea3a9c662dc2d7a48703a4468fad954a3b7f Author: Jens Axboe Date: Mon Mar 21 10:14:27 2011 +0100 block: attempt to merge with existing requests on plug flush One of the disadvantages of on-stack plugging is that we potentially lose out on merging since all pending IO isn't always visible to everybody. When we flush the on-stack plugs, right now we don't do any checks to see if potential merge candidates could be utilized. Correct this by adding a new insert variant, ELEVATOR_INSERT_SORT_MERGE. It works just ELEVATOR_INSERT_SORT, but first checks whether we can merge with an existing request before doing the insertion (if we fail merging). This fixes a regression with multiple processes issuing IO that can be merged. Thanks to Shaohua Li for testing and fixing an accounting bug. Signed-off-by: Jens Axboe commit b459396ee9398bdf61e3118ca730394f58e90c9c Author: Sebastian Andrzej Siewior Date: Wed Feb 23 12:38:16 2011 +0100 ARM: pxa2xx: reorganize I2C files This patch moves the platform data definition from arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so it can be accessed from x86 the same way as on ARM. This change should make no functional change to the PXA code. The move is verified by building the following defconfigs: cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig pxa910_defconfig Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Signed-off-by: Ben Dooks commit d6668c7cd4defdab1a74c8dd271b5ca23d99b627 Author: Sebastian Andrzej Siewior Date: Wed Feb 23 12:38:15 2011 +0100 i2c-pxa2xx: use dynamic register layout This will prepare the driver to handle register layouts where certain registers are not available at all. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Ben Dooks commit c212f9aaf9101a037fb7f59e75e639437e11d758 Author: Tetsuo Handa Date: Wed Jan 19 21:08:41 2011 +0900 fs: Use BUG_ON(!mnt) at dentry_open(). dentry_open() requires callers to pass a valid vfsmount. Signed-off-by: Tetsuo Handa Signed-off-by: Al Viro commit aa597bc1f9476d0527e35d6dd9b481422e8205a0 Author: Andrey Vagin Date: Tue Feb 8 00:14:52 2011 +0300 fs: devpts_pty_new() return -ENOMEM if dentry allocation failed In this case nobody can open a slave point, so will be better return from devpts_pty_new() Now we should not check error code from d_find_alias() in devpts_pty_kill(), because the dentry exists all times. Signed-off-by: Andrey Vagin Signed-off-by: Al Viro commit 1c34092adf1feaba25b7c739cc4def2751f4fa05 Author: Dan Carpenter Date: Sun Mar 20 14:22:07 2011 +0300 nfs: lock() vs unlock() typo These should be spin_unlock() instead of spin_lock(). It's a typo. Signed-off-by: Dan Carpenter Signed-off-by: Al Viro commit a872d5101008b091035d579897bccefdeff70def Author: Tony Luck Date: Fri Mar 18 11:44:48 2011 -0700 pstore: fix leaking ->i_private Move kfree() of i_private out of ->unlink() and into ->evict_inode() Signed-off-by: Tony Luck Signed-off-by: Al Viro commit b7ed78f56575074f29ec99d8984f347f6c99c914 Author: Sage Weil Date: Thu Mar 10 11:31:30 2011 -0800 introduce sys_syncfs to sync a single file system It is frequently useful to sync a single file system, instead of all mounted file systems via sync(2): - On machines with many mounts, it is not at all uncommon for some of them to hang (e.g. unresponsive NFS server). sync(2) will get stuck on those and may never get to the one you do care about (e.g., /). - Some applications write lots of data to the file system and then want to make sure it is flushed to disk. Calling fsync(2) on each file introduces unnecessary ordering constraints that result in a large amount of sub-optimal writeback/flush/commit behavior by the file system. There are currently two ways (that I know of) to sync a single super_block: - BLKFLSBUF ioctl on the block device: That also invalidates the bdev mapping, which isn't usually desirable, and doesn't work for non-block file systems. - 'mount -o remount,rw' will call sync_filesystem as an artifact of the current implemention. Relying on this little-known side effect for something like data safety sounds foolish. Both of these approaches require root privileges, which some applications do not have (nor should they need?) given that sync(2) is an unprivileged operation. This patch introduces a new system call syncfs(2) that takes an fd and syncs only the file system it references. Maybe someday we can $ sync /some/path and not get sync: ignoring all arguments The syscall is motivated by comments by Al and Christoph at the last LSF. syncfs(2) seems like an appropriate name given statfs(2). A similar ioctl was also proposed a while back, see http://marc.info/?l=linux-fsdevel&m=127970513829285&w=2 Signed-off-by: Sage Weil Signed-off-by: Al Viro commit 1bef82917c74249ff21982127e57defd6ca2bb1b Author: Holger Hans Peter Freyther Date: Thu Feb 24 17:46:49 2011 +0100 Small typo fix... Hi, I was backporting the coredump over pipe feature and noticed this small typo, I wish I would have something bigger to contribute... >From 15d6080e0ed4267da103c706917a33b1015e8804 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 24 Feb 2011 17:42:50 +0100 Subject: [PATCH] fs: Fix a small typo in the comment The function is called umh_pipe_setup not uhm_pipe_setup. Signed-off-by: Holger Hans Peter Freyther Signed-off-by: Al Viro commit ff38c083ad3bb8dbbed80aa9090fcc96bc4af7db Author: David Jenni Date: Wed Feb 23 16:51:05 2011 +0100 Filesystem: fifo: Fixed coding style issue. Fixed coding style issue. Signed-off-by: David Jenni Signed-off-by: Al Viro commit eaae668d01e15435cf977cced3975ccc436257fc Author: Ben Hutchings Date: Tue Feb 15 12:48:09 2011 +0000 fs/inode: Fix kernel-doc format for inode_init_owner Signed-off-by: Ben Hutchings Signed-off-by: Al Viro commit 2c3d44dc4a1262168ef31bef22b3aa554c0572d8 Author: Namhyung Kim Date: Fri Jan 21 13:59:59 2011 +0900 select: remove unused MAX_SELECT_SECONDS Remove the leftover from the commit 8ff3e8e85fa6 ("select: switch select() and poll() over to hrtimers"). Signed-off-by: Namhyung Kim Acked-by: Arjan van de Ven Signed-off-by: Al Viro commit 27a4f7e61e1eb4f18737926f4a66db7c48349fea Author: Namhyung Kim Date: Mon Jan 17 00:48:17 2011 +0900 vfs: cleanup do_vfs_ioctl() Move declaration of 'inode' to beginning of the function. Since it is referenced directly or indirectly (in case of FIFREEZE/FITHAW/ FS_IOC_FIEMAP) it's not harmful IMHO. And remove unnecessary casts using 'argp' instead. Signed-off-by: Namhyung Kim Signed-off-by: Al Viro commit a56e69c28ad0782a99f3f196e93d57ba5a7e2324 Author: Tao Ma Date: Sun Mar 20 23:16:58 2011 -0400 ext4: add FITRIM to compat_ioctl. FITRIM isn't added in compat_ioctl. So a 32 bit program can't be executed in a 64 bit platform. Add it in the compat_ioctl. Signed-off-by: Tao Ma Signed-off-by: "Theodore Ts'o" commit d67d1218344009970ba0deb7eb15a3984518ddd0 Author: Amir Goldstein Date: Sun Mar 20 22:59:02 2011 -0400 ext4: handle errors in ext4_clear_blocks() Checking return code from ext4_journal_get_write_access() is important with snapshots, because this function invokes COW, so may return new errors, such as ENOSPC. ext4_clear_blocks() now returns < 0 for fatal errors, in which case, ext4_free_data() is aborted. Signed-off-by: Amir Goldstein Signed-off-by: "Theodore Ts'o" commit 537a03103c67c4688b1e8e6671ad119aec5e2efb Author: Amir Goldstein Date: Sun Mar 20 22:57:02 2011 -0400 ext4: unify the ext4_handle_release_buffer() api There are two wrapper functions which do exactly the same thing: ext4_journal_release_buffer(), and ext4_handle_release_buffer(). In addition, ext4_xattr_block_set() calls jbd2_journal_release_buffer() directly. Unify all of the code to use ext4_handle_release_buffer(), and get rid of ext4_journal_release_buffer(). Signed-off-by: Amir Goldstein Signed-off-by: "Theodore Ts'o" commit ef6078930263bfcdcfe4dddb2cd85254b4cf4f5c Author: Amir Goldstein Date: Sun Mar 20 21:18:44 2011 -0400 ext4: handle errors in ext4_rename Checking return code from ext4_journal_get_write_access() is important with snapshots, because this function invokes COW, so may return new errors, such as ENOSPC. We move the call to ext4_journal_get_write_access earlier in the function, to simplify error handling in the case that this function returns returns an error. Signed-off-by: Amir Goldstein Signed-off-by: "Theodore Ts'o" commit a44f99c7efdb88fa41128065c9a9445c19894e34 Merge: b87a2d3 22942c0 Author: Linus Torvalds Date: Sun Mar 20 18:14:55 2011 -0700 Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile commit 93737456d68ddcb86232f669b83da673dd12e351 Author: Amir Goldstein Date: Sun Mar 20 21:13:43 2011 -0400 jbd2: add COW fields to struct jbd2_journal_handle Add fields needed for the copy-on-write ext4 development work. The h_cowing flag is used by ext4 snapshots code to mark the task in COWING state. The h_XXX_credits fields are used to track buffer credits usage (accounted by COW and non-COW operations). The h_cow_XXX fields are used as per task debugging counters. Merging this commit into mainline will allow users to test ext4 snapshots as a standalone module, without the need to patch and install a development kernel. Signed-off-by: Amir Goldstein Signed-off-by: "Theodore Ts'o" commit b87a2d3e3147bd140da2eae584772c353d11421b Merge: 53a94c7 ab94e46 Author: Linus Torvalds Date: Sun Mar 20 18:13:09 2011 -0700 Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: scripts/extract-ikconfig: add xz compression support kbuild: add GNU GLOBAL tags generation setlocalversion: update mercurial tag parsing commit 53a94c7d55dceb73aab2876afce4c563bc9111fe Merge: 444699c 9a17f40 Author: Linus Torvalds Date: Sun Mar 20 18:12:42 2011 -0700 Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: Add make tarxz-pkg build option commit 444699c8503eaeb0cf15e24ad76f69b14df6097a Merge: 6113f39 662cda8 Author: Linus Torvalds Date: Sun Mar 20 17:54:13 2011 -0700 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-i801: SMBus patch for Intel DH89xxCC DeviceIDs i2c: Drop i2c_adapter.id i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter i2c-dev: Use standard bus notification mechanism i2c: Export i2c_for_each_dev i2c: Get rid of i2c: Minor fixes to upgrading-clients document i2c: make i2c_get_adapter prototype clearer i2c: Fix typo in instantiating-devices document i2c-boardinfo: Fix typo in comment commit 6113f39dd15e4beb5ce66a8e0d9062477c5e81e3 Merge: db552b3 339dc50 Author: Linus Torvalds Date: Sun Mar 20 17:53:50 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: asm-generic: support clock_adjtime() in arch/tile: fix futex sanitization definition/prototype mismatch commit db552b3331766e16c35550a4b83c3a42671ba73e Author: Eric Dumazet Date: Sat Mar 19 16:39:11 2011 +0100 r8169: fix a bug in rtl8169_init_phy() commit 54405cde7624 (r8169: support control of advertising.) introduced a bug in rtl8169_init_phy() Reported-and-tested-by: Piotr Hosowicz Reported-and-tested-by: Linus Torvalds Signed-off-by: Eric Dumazet Acked-by:: Oliver Neukum Cc: Francois Romieu Tested-by: Anca Emanuel Signed-off-by: Linus Torvalds commit a71f5d5d279375205009a4be56a3cf6682921292 Author: Mike Wolf Date: Mon Mar 21 11:14:53 2011 +1100 powerpc/ptrace: Remove BUG_ON when full register set not available In some cases during a threaded core dump not all the threads will have a full register set. This happens when the signal causing the core dump races with a thread exiting. The race happens when the exiting thread has entered the kernel for the last time before the signal arrives, but doesn't get far enough through the exit code to avoid being included in the core dump. So we get a thread included in the core dump which is never going to go out to userspace again and only has a partial register set recorded Normally we would catch each thread as it is about to go into userspace and capture the full register set then. However, this exiting thread is never going to go out to userspace again, so we have no way to capture its full register set. It doesn't really matter, though, as this is a thread which is effectively already dead. So instead of hitting a BUG() in this case (a really bad choice of action in the first place), we use a poison value for the register values. [BenH]: Some cosmetic/stylistic changes and fix build on ppc32 Signed-off-by: Mike Wolf Signed-off-by: Benjamin Herrenschmidt commit c2cc7028e41c76e44b6e247c4b495c7523b23c87 Author: Amir Goldstein Date: Sun Mar 20 20:08:48 2011 -0400 jbd2: add the b_cow_tid field to journal_head struct The b_cow_tid field will be used by the ext4 snapshots code to store the transaction id when the buffer was last cowed. Merging this patch to mainline will allow users to test ext4 snapshots as a standalone module, without the need to patch and install a development kernel. On 64bit machines this field uses fills in a padding "hole" and does not increase the size of the struct. On a 32bit machine this patch increases the size of the struct from 60 to 64 bytes. Signed-off-by: Amir Goldstein Signed-off-by: "Theodore Ts'o" commit fb3b06c8a1fd1a80298f13b738ab38ef8c73baff Author: Dave Airlie Date: Tue Feb 8 13:55:21 2011 +1000 drm: check for modesetting on modeset ioctls Noticed this while working on some other things, helps if we check for modeset enabled on modesetting ioctls. Cc: stable@kernel.org Signed-off-by: Dave Airlie commit d6a2639b887fcf90b422caccca4aee216bd1120e Author: Meador Inge Date: Mon Mar 14 10:01:07 2011 +0000 powerpc: Factoring mpic cpu id fetching into a function The following code snippet: unsigned int cpu = 0; if (mpic->flags & MPIC_PRIMARY) cpu = hard_smp_processor_id(); is seen in several places in the 'mpic.c' code. This changeset factors that pattern out into a helper function called 'mpic_processor_id'. Signed-off-by: Meador Inge Cc: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt commit dfec2202729e2460d67649a04756f0c3d8dcd8a6 Author: Meador Inge Date: Mon Mar 14 10:01:06 2011 +0000 powerpc: Make MPIC honor the "pic-no-reset" device tree property This property, defined in the Open PIC binding, tells the kernel not to use the reset bit in the global configuration register. Additionally, its presence mandates that only sources which are actually used (i.e. appear in the device tree) should have their VECPRI bits initialized. Although, "pic-no-reset" can be used for the same use cases that "protected-sources" is covering, the "protected-sources" implementation was left completely intact. This is a more pragmatic approach as there are already several existing systems which use protected sources. If "pic-no-reset" *and* "protected-sources" are both used, however, then "pic-no-reset" takes precedence in terms of the init behavior and the sanity checks done by protected sources will still take place. Signed-off-by: Meador Inge Cc: Hollis Blanchard Cc: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt commit a99eff39c0549fe68fed150d39ec0c750e5ce1f1 Author: Meador Inge Date: Mon Mar 14 10:01:05 2011 +0000 powerpc: Document the Open PIC device tree binding This binding documents several properties that have been in use for quite some time, and adds one new property 'pic-no-reset', which controls the runtime initialization behavior of the PIC. More specifically, the presence of 'pic-no-reset' mandates that the PIC shall not be reset during runtime initialization and that any initialization related to interrupt sources shall be limited to sources explicitly referenced in the device tree. This functionality is useful in AMP systems where multiple OSes are sharing the PIC and the reinitialization of the PIC can interfere with OSes that are already up and running. The interrupt specifier definition is based off of Stuart Yoder's FSL MPIC binding. Signed-off-by: Meador Inge Cc: Grant Likely Cc: Stuart Yoder Cc: Hollis Blanchard Signed-off-by: Benjamin Herrenschmidt commit 90407c9976939e061f32b0e07602e5ce4887d9e8 Author: Benjamin Herrenschmidt Date: Mon Mar 21 10:57:57 2011 +1100 powerpc/pci: Fix crash in PCI code on ppc64 when matching device nodes Commit b5d937de0367d26f65b9af1aef5f2c34c1939be0 has a bug which causes basically a NULL dereference in the PCI code during boot on ppc64 machines. fetch_dev_dn() is called when dev->dev.of_node is NULL, so using that as the starting point for the search makes no sense. It should instead start from the device node of the PHB. Signed-off-by: Benjamin Herrenschmidt commit 6b7d815c3f37f22c355b00362bc7c7d0bac9baea Author: Sascha Hauer Date: Fri Feb 25 18:54:51 2011 +0100 i2c-mxs: set controller to pio queue mode after reset mxs_reset_block() clears the PIO_QUEUE_MODE bit. So we have to set it again after a controller reset. Signed-off-by: Sascha Hauer Signed-off-by: Wolfram Sang Cc: Ben Dooks Signed-off-by: Ben Dooks commit 19b01b5fbf0b78930b3b06ee6080539c17b5d1fd Author: Ilija Hadzic Date: Fri Mar 18 16:58:04 2011 -0500 drm/kernel: vblank wait on crtc > 1 Below is a patch against drm-next branch of 2.6.38-rc8+ kernel that adds the capability to wait on vblank events for CRTCs that are greater than 1 and thus cannot be represented with primary/secondary flags in the legacy interface. It was discussed on the dri-devel list in these two threads: http://lists.freedesktop.org/archives/dri-devel/2011-March/009009.html http://lists.freedesktop.org/archives/dri-devel/2011-March/009025.html This patch extends the interface to drm_wait_vblank ioctl so that crtc>1 can be represented. It also adds a new capability to drm_getcap ioctl so that the user space can check whether the new interface to drm_wait_vblank is supported (and fall back to the legacy interface if not) Signed-off-by: Ilija Hadzic Reviewed-by: Mario Kleiner Acked-by: Mario Kleiner Reviewed-by: Alex Deucher Tested-by: Alex Deucher Signed-off-by: Dave Airlie commit b74ad5ae14def5e81ad0be3dddb96e485b861b1b Author: Chris Wilson Date: Thu Mar 17 22:33:33 2011 +0000 drm: Fix use-after-free in drm_gem_vm_close() As we may release the last reference, we need to store the device in a local variable in order to unlock afterwards. [ 60.140768] BUG: unable to handle kernel paging request at 6b6b6b9f [ 60.140973] IP: [] __mutex_unlock_slowpath+0x5a/0x111 [ 60.141014] *pdpt = 0000000024a54001 *pde = 0000000000000000 [ 60.141014] Oops: 0002 [#1] PREEMPT SMP [ 60.141014] last sysfs file: /sys/devices/LNXSYSTM:00/device:00/PNP0A08:00/PNP0C0A:00/power_supply/BAT0/voltage_now [ 60.141014] Modules linked in: uvcvideo ath9k pegasus ath9k_common ath9k_hw hid_egalax ath3k joydev asus_laptop sparse_keymap battery input_polldev [ 60.141014] [ 60.141014] Pid: 771, comm: meego-ux-daemon Not tainted 2.6.37.2-7.1 #1 EXOPC EXOPG06411/EXOPG06411 [ 60.141014] EIP: 0060:[] EFLAGS: 00010046 CPU: 0 [ 60.141014] EIP is at __mutex_unlock_slowpath+0x5a/0x111 [ 60.141014] EAX: 00000100 EBX: 6b6b6b9b ECX: e9b4a1b0 EDX: e4a4e580 [ 60.141014] ESI: db162558 EDI: 00000246 EBP: e480be50 ESP: e480be44 [ 60.141014] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 [ 60.141014] Process meego-ux-daemon (pid: 771, ti=e480a000 task=e9b4a1b0 task.ti=e480a000) [ 60.141014] Stack: [ 60.141014] e4a4e580 db162558 f5a2f838 e480be58 c1536dd0 e480be68 c125ab1b db162558 [ 60.141014] db1624e0 e480be78 c10ba071 db162558 f760241c e480be94 c10bb0bc 000155fe [ 60.141014] f760241c f5a2f838 f5a2f8c8 00000000 e480bea4 c1037c24 00000000 f5a2f838 [ 60.141014] Call Trace: [ 60.141014] [] ? mutex_unlock+0x8/0xa [ 60.141014] [] ? drm_gem_vm_close+0x39/0x3d [ 60.141014] [] ? remove_vma+0x2d/0x58 [ 60.141014] [] ? exit_mmap+0x126/0x13f [ 60.141014] [] ? mmput+0x37/0x9a [ 60.141014] [] ? exec_mmap+0x178/0x19c [ 60.141014] [] ? _raw_spin_unlock+0x1d/0x36 [ 60.141014] [] ? flush_old_exec+0x42/0x75 [ 60.141014] [] ? load_elf_binary+0x32a/0x922 [ 60.141014] [] ? search_binary_handler+0x200/0x2ea [ 60.141014] [] ? search_binary_handler+0x159/0x2ea [ 60.141014] [] ? load_elf_binary+0x0/0x922 [ 60.141014] [] ? do_execve+0x1ff/0x2e6 [ 60.141014] [] ? sys_execve+0x2d/0x55 [ 60.141014] [] ? ptregs_execve+0x12/0x18 [ 60.141014] [] ? sysenter_do_call+0x12/0x3c [ 60.141014] [] ? init_centaur+0x9c/0x1ba [ 60.141014] Code: c1 00 75 0f ba 38 01 00 00 b8 8c 3a 6c c1 e8 cc 2e b0 ff 9c 58 8d 74 26 00 89 c7 fa 90 8d 74 26 00 e8 d2 b4 b2 ff b8 00 01 00 00 66 0f c1 43 04 38 e0 74 07 f3 90 8a 43 04 eb f5 83 3d 64 ef [ 60.141014] EIP: [] __mutex_unlock_slowpath+0x5a/0x111 SS:ESP 0068:e480be44 [ 60.141014] CR2: 000000006b6b6b9f Reported-by: Rusty Lynch Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 62235dcd2ad4f46ea9e5d4f71c5ea3111341c6e8 Author: Vasily Khoruzhick Date: Thu Jan 6 21:52:52 2011 +0200 ARM: S3C2442: RX1950: Add support for LED blinking Add .gpio_set_blink callback to support HW blinking available on RX1950 Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit fed7fdbef48d513b1a470bc3d76923d156996448 Author: Vasily Khoruzhick Date: Thu Jan 6 21:52:51 2011 +0200 ARM: S3C2442: RX1950: Retain LEDs state in suspend s3c_adc_battery uses LEDs to indicate charging process, retain LEDs state in suspend, otherwise user have no information if PDA battery is charging after he put it to suspend. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 25d391cbe610009d2ea10d820f36621b7610c963 Author: Vasily Khoruzhick Date: Thu Jan 6 21:52:50 2011 +0200 ARM: S3C2410: H1940: Fix lcd_power_set function Current implementation of lcd_power_set is not reliable, sometimes it does not enable LCD at all. Mimic WinCE behavior to fix this issue. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit a8e99850d39cac11d03100aa9c40ebaea16e48c5 Author: Vasily Khoruzhick Date: Thu Jan 6 21:52:49 2011 +0200 ARM: S3C2410: H1940: Add battery support Add battery monitoring/charging support via pda_power and s3c_adc_battery drivers Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 50e2d10da82774e0733ab561c15c84cb92d9ab33 Author: Vasily Khoruzhick Date: Thu Jan 6 21:52:48 2011 +0200 ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managing We can use generic leds-gpio driver, as latch api was converted to gpiolib. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 4119242876d7d6ff539e1aa3d736a87a28fe7b67 Author: Vasily Khoruzhick Date: Thu Jan 6 21:52:47 2011 +0200 ARM: S3C2410: H1940: Make h1940-bluetooth.c compile again It was broken by removal of rfkill_set_led_trigger_name function, and now compiler complains about implicit declaration. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit bbb1c832ac52f61b926a4635dc1a708f03250e88 Author: Arnaud Patard (Rtp) Date: Thu Jan 6 21:52:46 2011 +0200 ARM: S3C2410: H1940: Add keys device Add buttons definition for H1940. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit e4394d553cec3cbf4d0c602fe39bc88bac43bd27 Merge: a952baa 335d7c5 Author: Ben Dooks Date: Sun Mar 20 22:14:04 2011 +0000 Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12 commit 0e24d34a5b95226cfc335817aefd9cf9744e5659 Merge: 1a0c833 de4d768 Author: David S. Miller Date: Sun Mar 20 14:35:09 2011 -0700 Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit 1a0c83307d8211463df27af7c70465099c4979d3 Merge: a769f49 961ed18 Author: David S. Miller Date: Sun Mar 20 13:42:25 2011 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit 6f82f4db80189281a8ac42f2e72396accb719b57 Author: Russell King Date: Sun Mar 20 09:50:05 2011 +0000 ARM: Update (and cut down) mach-types As many entries have never been submitted to mainline, there's no point them existing in this file. So remove the entries which aren't relevant for mainline. Signed-off-by: Russell King commit e8c500c2b64b6e237e67ecba7249e72363c47047 Merge: c53badd a24c5a0 Author: Pekka Enberg Date: Sun Mar 20 18:13:26 2011 +0200 Merge branch 'slub/lockless' into for-linus Conflicts: include/linux/slub_def.h commit c53badd0801728feedfcccae04239410b52b0d03 Merge: 521cb40 865d794 Author: Pekka Enberg Date: Sun Mar 20 18:12:03 2011 +0200 Merge branch 'slab/next' into for-linus commit a24c5a0ea902bcda348f086bd909cc2d6e305bf8 Author: Christoph Lameter Date: Tue Mar 15 12:45:21 2011 -0500 slub: Dont define useless label in the !CONFIG_CMPXCHG_LOCAL case The redo label needs #ifdeffery. Fixes the following problem introduced by commit 8a5ec0ba42c4 ("Lockless (and preemptless) fastpaths for slub"): mm/slub.c: In function 'slab_free': mm/slub.c:2124: warning: label 'redo' defined but not used Reported-by: Stephen Rothwell Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 115881d395959b75c8c3bb94913f2ce869b8aa7a Author: Stefan Richter Date: Tue Mar 15 00:08:41 2011 +0100 firewire: core: ignore link-active bit of new nodes, fix device recognition Like the older ieee1394 core driver, firewire-core skipped scanning of any new node whose PHY sent a self ID without "link active" bit. If a device had this bit off mistakenly, it meant that it was inaccessible to kernel drivers with the old IEEE 1394 driver stack but could still be accessed by userspace drivers through the raw1394 interface. But with firewire-core, userspace drivers don't get to see such buggy devices anymore. This is effectively a driver regression since this device bug is otherwise harmless. We now attempt to scan all devices, even repeaters that don't have a link or powered-down devices that have everything but their PHY shut down when plugged in. This results in futile repeated scanning attempts in case of such devices that really don't have an active link, but this doesn't hurt since recent workqueue infrastructure lets us run more concurrent scanning jobs than we can shake a stick at. This should fix accessibility of Focusrite Saffire PRO 26 I/O: http://sourceforge.net/mailarchive/forum.php?thread_name=20110314215622.5c751bb0%40stein&forum_name=ffado-user Signed-off-by: Stefan Richter commit 7a4e1e9c682cd87fe8a749b435b13afeef083c34 Author: Stefan Richter Date: Tue Mar 15 00:04:42 2011 +0100 firewire: sbp2: revert obsolete 'fix stall with "Unsolicited response"' Now that firewire-core sets the local node's SPLIT_TIMEOUT to 2 seconds per default, commit a481e97d3cdc40b9d58271675bd4f0abb79d4872 is no longer required. Signed-off-by: Stefan Richter commit dd5eeb99f47d18c05efffcd247c0aa07eaa9ffaa Author: Clemens Ladisch Date: Mon Mar 7 11:21:15 2011 +0100 firewire: core: increase default SPLIT_TIMEOUT value The SPLIT_TIMEOUT mechanism is intended to detect requests that somehow got lost. However, when the timeout value is too low, transactions that could have been completed successfully will be cancelled. Furthermore, there are chips whose firmwares ignore the configured split timeout and send late split response; known examples are the DM1x00 (BeBoB), TCD22x0 (DICE), and some OXUF936QSE firmwares. This patch changes the default timeout to two seconds, which happens to be the default on other OSes, too. Actual lost requests are extremely rare, so there should be no practical downside to increasing the split timeout even on devices that work correctly. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 961ed183a9fd080cf306c659b8736007e44065a5 Author: Vasiliy Kulikov Date: Sun Mar 20 15:42:52 2011 +0100 netfilter: ipt_CLUSTERIP: fix buffer overflow 'buffer' string is copied from userspace. It is not checked whether it is zero terminated. This may lead to overflow inside of simple_strtoul(). Changli Gao suggested to copy not more than user supplied 'size' bytes. It was introduced before the git epoch. Files "ipt_CLUSTERIP/*" are root writable only by default, however, on some setups permissions might be relaxed to e.g. network admin user. Signed-off-by: Vasiliy Kulikov Acked-by: Changli Gao Signed-off-by: Patrick McHardy commit db856674ac69e31946e56085239757cca3f7655f Author: Eric Dumazet Date: Sun Mar 20 15:40:06 2011 +0100 netfilter: xtables: fix reentrancy commit f3c5c1bfd4308 (make ip_tables reentrant) introduced a race in handling the stackptr restore, at the end of ipt_do_table() We should do it before the call to xt_info_rdunlock_bh(), or we allow cpu preemption and another cpu overwrites stackptr of original one. A second fix is to change the underflow test to check the origptr value instead of 0 to detect underflow, or else we allow a jump from different hooks. Signed-off-by: Eric Dumazet Cc: Jan Engelhardt Signed-off-by: Patrick McHardy commit 5c1aba467828bf0574ec5754c84884d573f590af Author: Jozsef Kadlecsik Date: Sun Mar 20 15:35:01 2011 +0100 netfilter: ipset: fix checking the type revision at create command The revision of the set type was not checked at the create command: if the userspace sent a valid set type but with not supported revision number, it'd create a loop. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 5e0c1eb7e6b61998c7ecd39b7f69a15773d894d4 Author: Jozsef Kadlecsik Date: Sun Mar 20 15:33:26 2011 +0100 netfilter: ipset: fix address ranges at hash:*port* types The hash:*port* types with IPv4 silently ignored when address ranges with non TCP/UDP were added/deleted from the set and used the first address from the range only. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 662cda8abb278f58237fa12b8ab3060ebefca4b8 Author: Seth Heasley Date: Sun Mar 20 14:50:53 2011 +0100 i2c-i801: SMBus patch for Intel DH89xxCC DeviceIDs Add the SMBus Controller DeviceIDs for the Intel DH89xxCC PCH. Signed-off-by: Seth Heasley Signed-off-by: Jean Delvare commit c185a9420bd1c645252249018e6887a968d3e1de Author: Jean Delvare Date: Sun Mar 20 14:50:53 2011 +0100 i2c: Drop i2c_adapter.id There is no user left of i2c_adapter.id, so we can get rid of it. Finally! :) Signed-off-by: Jean Delvare commit fe6fc25857d293546bd400432cdb77866c797c9b Author: Jean Delvare Date: Sun Mar 20 14:50:53 2011 +0100 i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter The last legitimate user of i2c_driver.attach_adapter and .detach_adapter is gone, so we can finally deprecate these callbacks. The last few drivers which still use these will have to be updated to make use of standard I2C device instantiation ways instead. Signed-off-by: Jean Delvare commit 9ea3e941d161f41f920462c50e9b651cc00eccc7 Author: Jean Delvare Date: Sun Mar 20 14:50:52 2011 +0100 i2c-dev: Use standard bus notification mechanism Use the standard driver core mechanism to keep track of i2c adapters present on the system: i2c_for_each_dev and a notifier. This will let us deprecate and ultimately remove the legacy attach_adapter and detach_adapter callbacks in i2c_driver. Signed-off-by: Jean Delvare commit 7ae31482a8376fb0df3a0c5ff0677a92820c06b7 Author: Jean Delvare Date: Sun Mar 20 14:50:52 2011 +0100 i2c: Export i2c_for_each_dev Introduce i2c_for_each_dev(), an i2c device iterator with proper locking for use by i2c-dev. This is needed so that we can get rid of the attach_adapter and detach_adapter legacy callback functions. Signed-off-by: Jean Delvare commit 0c31f8e5720e1191b4cf46a9b5374fe6b857c53c Author: Jean Delvare Date: Sun Mar 20 14:50:52 2011 +0100 i2c: Get rid of The last remaining ID in is no longer used anywhere, so we can finally get rid of it. Signed-off-by: Jean Delvare commit ed065e26b8721553736ce9e38023488c6747e93d Author: Jean Delvare Date: Sun Mar 20 14:50:52 2011 +0100 i2c: Minor fixes to upgrading-clients document * Typical legacy drivers implemented method .detach_client, not .detach_adapter. * Drop all references to __devexit, as i2c drivers shouldn't use it. Cc: Ben Dooks Signed-off-by: Jean Delvare commit d735b34db30b7891ff76b552d18ecb0ce04a2bc2 Author: Jean Delvare Date: Sun Mar 20 14:50:52 2011 +0100 i2c: make i2c_get_adapter prototype clearer Rename the parameter of i2c_get_adapter() to "nr", to make it clear we are passing an adapter number and not an adapter ID (which have gone away by now.) Signed-off-by: Jean Delvare commit 6ced9e6b3901af4ab6ac0a11231402c888286ea6 Author: Roman Fietze Date: Sun Mar 20 14:50:52 2011 +0100 i2c: Fix typo in instantiating-devices document The struct i2c_board_info member holding the name is "type", not "name". Signed-off-by: Roman Fietze Signed-off-by: Jean Delvare Cc: stable@kernel.org commit 950a5097855e2d0ac2c91a33f67eeac3be802bf5 Author: Wolfram Sang Date: Sun Mar 20 14:50:52 2011 +0100 i2c-boardinfo: Fix typo in comment Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit 80b5efbd43f0a21e9fc6db87823be32fcfe3e7ce Author: Will Deacon Date: Mon Feb 28 17:01:04 2011 +0100 ARM: 6771/1: vexpress: add support for multiple core tiles The current Versatile Express BSP defines the MACHINE_START macro in the core tile code. This patch moves this into the generic board code and introduces a method for determining the current tile at runtime, allowing the Kernel to have support for multiple tiles compiled in. Tile-specific functions are executed via a descriptor struct containing the correct implementations for the current tile. Signed-off-by: Will Deacon Signed-off-by: Russell King commit 196f020fbbb83d246960548e73a40fd08f3e7866 Merge: 6d7ed21 7d85d61 516295e 3de4ade Author: Russell King Date: Sun Mar 20 09:32:12 2011 +0000 Merge branches 'fixes', 'pgt-next' and 'versatile' into devel commit a769f4968396093d5cc1b1a86204cef579784b24 Author: David S. Miller Date: Sat Mar 19 23:06:33 2011 -0700 niu: Rename NIU parent platform device name to fix conflict. When the OF device driver bits were converted over to the platform device infrastructure in commit 74888760d40b3ac9054f9c5fa07b566c0676ba2d ("dt/net: Eliminate users of of_platform_{,un}register_driver") we inadvertantly created probing problems in the OF case. The NIU driver creates a dummy platform device to represent the board that contains one or more child NIU devices. Unfortunately we use the same name, "niu", as the OF device driver itself uses. The result is that we try to probe the dummy "niu" parent device we create, and since it has a NULL ofdevice pointer etc. everything explodes: [783019.128243] niu: niu.c:v1.1 (Apr 22, 2010) [783019.128810] Unable to handle kernel NULL pointer dereference [783019.128949] tsk->{mm,active_mm}->context = 000000000000039e [783019.129078] tsk->{mm,active_mm}->pgd = fffff803afc5a000 [783019.129206] \|/ ____ \|/ [783019.129213] "@'/ .. \`@" [783019.129220] /_| \__/ |_\ [783019.129226] \__U_/ [783019.129378] modprobe(2004): Oops [#1] [783019.129423] TSTATE: 0000000011001602 TPC: 0000000010052ff8 TNPC: 000000000061bbb4 Y: 00000000 Not tainted [783019.129542] TPC: [783019.129624] g0: 8080000000000000 g1: 0000000000000000 g2: 0000000010056000 g3: 0000000000000002 [783019.129733] g4: fffff803fc1da0c0 g5: fffff800441e2000 g6: fffff803fba84000 g7: 0000000000000000 [783019.129842] o0: fffff803fe7df010 o1: 0000000010055700 o2: 0000000000000000 o3: fffff803fbacaca0 [783019.129951] o4: 0000000000000080 o5: 0000000000777908 sp: fffff803fba866e1 ret_pc: 0000000010052ff4 [783019.130083] RPC: [783019.130165] l0: fffff803fe7df010 l1: fffff803fbacafc0 l2: fffff803fbacaca0 l3: ffffffffffffffed [783019.130273] l4: 0000000000000000 l5: 000000007fffffff l6: fffff803fba86f40 l7: 0000000000000001 [783019.130382] i0: fffff803fe7df000 i1: fffff803fc20aba0 i2: 0000000000000000 i3: 0000000000000001 [783019.130490] i4: 0000000000000000 i5: 0000000000000000 i6: fffff803fba867a1 i7: 000000000062038c [783019.130614] I7: Fix by simply renaming the parent device to "niu-board". Signed-off-by: David S. Miller commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d Merge: 5bab188 97eb3f2 Author: Linus Torvalds Date: Sat Mar 19 22:27:06 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits) Input: tsc2005 - remove 'disable' sysfs attribute Input: tsc2005 - add open/close Input: tsc2005 - handle read errors from SPI layer Input: tsc2005 - do not rearm timer in hardirq handler Input: tsc2005 - don't use work for 'pen up' handling Input: tsc2005 - do not use 0 in place of NULL Input: tsc2005 - use true/false for boolean variables Input: tsc2005 - hide selftest attribute if we can't reset Input: tsc2005 - rework driver initialization code Input: tsc2005 - set up bus type in input device Input: tsc2005 - set up parent device Input: tsc2005 - clear driver data after unbinding Input: tsc2005 - add module description Input: tsc2005 - remove driver banner message Input: tsc2005 - remove incorrect module alias Input: tsc2005 - convert to using dev_pm_ops Input: tsc2005 - use spi_get/set_drvdata() Input: introduce tsc2005 driver Input: xen-kbdfront - move to drivers/input/misc Input: xen-kbdfront - add grant reference for shared page ... commit 339dc50e59f4ea697e2b8cd6296328a8015a6c21 Author: Chris Metcalf Date: Sat Mar 19 11:47:53 2011 -0400 asm-generic: support clock_adjtime() in A syscall was added without being added to asm-generic, which makes tile (and presumably score and unicore32) break. Signed-off-by: Chris Metcalf Acked-by: Arnd Bergmann Cc: Guan Xuetao Cc: Chen Liqin Cc: Lennox Wu commit 5b4787719f8870104fada924ef65ee9fd5eb2514 Author: Chris Metcalf Date: Sat Mar 19 11:45:34 2011 -0400 arch/tile: fix futex sanitization definition/prototype mismatch Commit 8d7718aa082aaf30a0b4989e1f04858952f941bc changed "int" to "u32" in the prototypes but not the definition. I missed this when I saw the patch go by on LKML. We cast "u32 *" to "int *" since we are tying into the underlying atomics framework, and atomic_t uses int as its value type. Signed-off-by: Chris Metcalf Reviewed-by: Michel Lespinasse commit b26fa4e0275426450238a14158bc1db24bb696e6 Author: Eric Dumazet Date: Sat Mar 19 05:39:11 2011 +0000 r8169: fix a bug in rtl8169_init_phy() commit 54405cde7624 (r8169: support control of advertising.) introduced a bug in rtl8169_init_phy() Reported-by: Piotr Hosowicz Signed-off-by: Eric Dumazet Cc: Oliver Neukum Cc: Francois Romieu Tested-by: Anca Emanuel Tested-by: Piotr Hosowicz Signed-off-by: David S. Miller commit dadaa10b077133e5c03333131b82ecb13679af2b Author: Nicolas de Pesloüan Date: Sat Mar 19 13:36:18 2011 -0700 bonding: fix a typo in a comment Signed-off-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit d8aa5ec3382e6a545b8f25178d1e0992d4927f19 Author: Stefano Stabellini Date: Wed Mar 9 14:22:05 2011 +0000 xen: update mask_rw_pte after kernel page tables init changes After "x86-64, mm: Put early page table high" already existing kernel page table pages can be mapped using early_ioremap too so we need to update mask_rw_pte to make sure these pages are still mapped RO. The reason why we have to do that is explain by the commit message of fef5ba797991f9335bcfc295942b684f9bf613a1: "Xen requires that all pages containing pagetable entries to be mapped read-only. If pages used for the initial pagetable are already mapped then we can change the mapping to RO. However, if they are initially unmapped, we need to make sure that when they are later mapped, they are also mapped RO. ..SNIP.. the pagetable setup code early_ioremaps the pages to write their entries, so we must make sure that mappings created in the early_ioremap fixmap area are mapped RW. (Those mappings are removed before the pages are presented to Xen as pagetable pages.)" We accomplish all this in mask_rw_pte by mapping RO all the pages mapped using early_ioremap apart from the last one that has been allocated because it is not a page table page yet (it has not been hooked into the page tables yet). Signed-off-by: Stefano Stabellini Acked-by: Konrad Rzeszutek Wilk LKML-Reference: Signed-off-by: H. Peter Anvin commit 14988a4d350ce3b41ecad4f63c4f44c56f5ae34d Author: Stefano Stabellini Date: Fri Feb 18 11:32:40 2011 +0000 xen: set max_pfn_mapped to the last pfn mapped Do not set max_pfn_mapped to the end of the initial memory mappings, that also contain pages that don't belong in pfn space (like the mfn list). Set max_pfn_mapped to the last real pfn mapped in the initial memory mappings that is the pfn backing _end. Signed-off-by: Stefano Stabellini Acked-by: Konrad Rzeszutek Wilk LKML-Reference: Signed-off-by: H. Peter Anvin commit e5f15b45ddf3afa2bbbb10c7ea34fb32b6de0a0e Author: Yinghai Lu Date: Fri Feb 18 11:30:30 2011 +0000 x86: Cleanup highmap after brk is concluded Now cleanup_highmap actually is in two steps: one is early in head64.c and only clears above _end; a second one is in init_memory_mapping() and tries to clean from _brk_end to _end. It should check if those boundaries are PMD_SIZE aligned but currently does not. Also init_memory_mapping() is called several times for numa or memory hotplug, so we really should not handle initial kernel mappings there. This patch moves cleanup_highmap() down after _brk_end is settled so we can do everything in one step. Also we honor max_pfn_mapped in the implementation of cleanup_highmap. Signed-off-by: Yinghai Lu Signed-off-by: Stefano Stabellini LKML-Reference: Signed-off-by: H. Peter Anvin commit 16addf954d3954a72fd56abc02ffcba3c18529a1 Author: Randy Dunlap Date: Fri Mar 18 09:34:53 2011 -0700 sched: Fix yield_to kernel-doc Add missing function parameters for yield_to(): Warning(kernel/sched.c:5470): No description found for parameter 'p' Warning(kernel/sched.c:5470): No description found for parameter 'preempt' Signed-off-by: Randy Dunlap Cc: Peter Zijlstra LKML-Reference: <20110318093453.8f7489a4.randy.dunlap@oracle.com> Signed-off-by: Ingo Molnar commit fc66c5210ec2539e800e87d7b3a985323c7be96e Author: Stephane Eranian Date: Sat Mar 19 18:20:05 2011 +0100 perf, x86: Fix Intel fixed counters base initialization The following patch solves the problems introduced by Robert's commit 41bf498 and reported by Arun Sharma. This commit gets rid of the base + index notation for reading and writing PMU msrs. The problem is that for fixed counters, the new calculation for the base did not take into account the fixed counter indexes, thus all fixed counters were read/written from fixed counter 0. Although all fixed counters share the same config MSR, they each have their own counter register. Without: $ task -e unhalted_core_cycles -e instructions_retired -e baclears noploop 1 noploop for 1 seconds 242202299 unhalted_core_cycles (0.00% scaling, ena=1000790892, run=1000790892) 2389685946 instructions_retired (0.00% scaling, ena=1000790892, run=1000790892) 49473 baclears (0.00% scaling, ena=1000790892, run=1000790892) With: $ task -e unhalted_core_cycles -e instructions_retired -e baclears noploop 1 noploop for 1 seconds 2392703238 unhalted_core_cycles (0.00% scaling, ena=1000840809, run=1000840809) 2389793744 instructions_retired (0.00% scaling, ena=1000840809, run=1000840809) 47863 baclears (0.00% scaling, ena=1000840809, run=1000840809) Signed-off-by: Stephane Eranian Cc: peterz@infradead.org Cc: ming.m.lin@intel.com Cc: robert.richter@amd.com Cc: asharma@fb.com Cc: perfmon2-devel@lists.sf.net LKML-Reference: <20110319172005.GB4978@quad> Signed-off-by: Ingo Molnar commit 4345caba340f051e10847924fc078ae18ed6695c Author: Dan Carpenter Date: Sat Mar 19 13:53:31 2011 +0100 block: NULL dereference on error path in __blkdev_get() "disk" is always NULL when we goto out. There was a check for this before, but it was removed in 69e02c59a7d9 "block: Don't check events while open is in progress". Signed-off-by: Dan Carpenter Acked-by: Tejun Heo Signed-off-by: Jens Axboe commit 97eb3f24352ec6632c2127b35d8087d2a809a9b9 Merge: 439581e def179c Author: Dmitry Torokhov Date: Fri Mar 18 23:38:50 2011 -0700 Merge branch 'next' into for-linus commit 5bab188a316718a26346cdb25c4cc6b319f8f907 Merge: a8c91da 4d3cf1b Author: Linus Torvalds Date: Fri Mar 18 22:33:38 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: move NILFS_SUPER_MAGIC to linux/magic.h nilfs2: get rid of nilfs_sb_info structure nilfs2: use sb instance instead of nilfs_sb_info struct nilfs2: get rid of sc_sbi back pointer nilfs2: move log writer onto nilfs object nilfs2: move next generation counter into nilfs object nilfs2: move s_inode_lock and s_dirty_files into nilfs object nilfs2: move parameters on nilfs_sb_info into nilfs object nilfs2: move mount options to nilfs object nilfs2: record used amount of each checkpoint in checkpoint list nilfs2: optimize rec_len functions nilfs2: append blocksize info to warnings during loading super blocks nilfs2: add compat ioctl nilfs2: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION nilfs2: tighten restrictions on inode flags nilfs2: mark S_NOATIME on inodes only if NOATIME attribute is set nilfs2: use common file attribute macros nilfs2: add free entries count only if clear bit operation succeeded nilfs2: decrement inodes count only if raw inode was successfully deleted commit a8c91da549f625d0600d5bd7e1831066b55edf0d Merge: 26b95ca c07946a Author: Linus Torvalds Date: Fri Mar 18 22:32:40 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (53 commits) mmc: dw_mmc: support mmc power control with regulator mmc: dw_mmc: fix suspend/resume operation mmc: dw_mmc: add quirks for unreliable card detect, and capabilities mmc: tmio: fix address in kunmap_atomic() calls mmc: core: reset card voltage after power off mmc: core: export function mmc_do_release_host() mmc: sdio: remember new card RCA when redetecting card mmc: dw_mmc: Remove set-but-unused variable. mmc: sdhci-esdhc-imx: add card detect on custom GPIO for mx25/35 mmc: sdhci-esdhc: broken card detection is not a default quirk mmc: sdhci-esdhc-imx: add write protect on custom GPIO on mx25/35 mmc: msm_sdcc: remove needless cache flush after dma_unmap_sg() mmc: sh_mmcif: support aggressive clock gating mmc: check if mmc cards < 2GB do sector addressing mmc: core: comment on why sdio_reset is done at init time mmc: dw_mmc: support DDR mode mmc: via-sdmmc: Remove set-but-unused variable. mmc: cb710: Return err value in cb710_wait_while_busy() mmc: sdhci-pci: Remove set-but-unused variable. mmc: mxs-mmc: add mmc host driver for i.MX23/28 ... commit 26b95cac5fddb2916e2cef76495073f9c37a7b54 Merge: 2c1d247 e1620d5 Author: Linus Torvalds Date: Fri Mar 18 22:31:54 2011 -0700 Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: USB: Move runtime PM callbacks to usb_device_pm_ops commit 2c1d2470c0c0992fae2cc0e04921f9e02a670a00 Merge: 664322a ddb7d1e Author: Linus Torvalds Date: Fri Mar 18 22:31:05 2011 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: MN10300: Clear ASB2364 peripheral interrupt masks before enabling interrupts MN10300: Fix the ASB2364 gdbport UART register defs MN10300: Fix ASB2364 FPGA register defs MN10300: Select GENERIC_HARDIRQS_NO_DEPRECATED MN10300: Select HAVE_GENERIC_HARDIRQS rather than GENERIC_HARDIRQS MN10300: Convert ASB2364 FPGA irq_chip to new functions MN10300: Convert ipi irq_chip to new functions MN10300: Convert serial irq_chip to new functions MN10300: Convert cpu irq_chips to new functions MN10300: Remove unused mn10300_intc_* functions MN10300: Remove stale irq_chip.end - V2 MN10300: Use clockevents_calc_mult_shift() MN10300: Use clocksource_register_hz() MN10300: Remove stale code commit 664322a4475236bd9900f2853a9b981a4377493f Merge: 9975961 0c082bd Author: Linus Torvalds Date: Fri Mar 18 22:30:00 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (32 commits) Blackfin: ip0x: fix unused variable warning Blackfin: punt unused HDMA masks Blackfin: wire up new syscalls Blackfin/ipipe: restore pipeline bits in irqflags Blackfin/ipipe: fix deferred pipeline sync for the root stage Blackfin/ipipe: upgrade to I-pipe mainline Blackfin: cpufreq: fix typos Blackfin: enable GENERIC_HARDIRQS_NO_DEPRECATED Blackfin: SMP: convert to irq chip functions Blackfin: use accessor functions in show_interrupts() Blackfin: use proper wrapper functions for modifying irq status Blackfin: convert gpio irq_chip to new functions Blackfin: convert mac irq_chip to new functions Blackfin: convert error irq_chip to new functions Blackfin: convert internal irq_chip to new functions Blackfin: convert core irq_chip to new functions Blackfin: use proper wrappers for irq_desc Blackfin: optimize startup code Blackfin: SMP: work around anomaly 05000491 Blackfin: SMP: implement cpu_freq support ... commit 93d03203d5a165d7a757546245dd1543dfe0ff80 Author: Dan Carpenter Date: Fri Mar 18 21:53:03 2011 -0700 ftmac100: use resource_size() The calculation is off-by-one. It should be "end - start + 1". This patch fixes it to use resource_size() instead. Oddly, the code already uses resource size correctly a couple lines earlier when it calls request_mem_region() for this memory. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit b3f80f6d2b08772d7d00f34a062ff73c95f7c45c Author: David S. Miller Date: Fri Mar 18 21:50:29 2011 -0700 sparc: Add {open_by,name_to}_handle_at and clock_adjtime syscalls. Signed-off-by: David S. Miller commit 84abf6084704673ae80a2105bf63ece5eee3edd5 Merge: c871fe6 2f40ea9 Author: Colin Cross Date: Fri Mar 18 19:38:08 2011 -0700 Merge branch 'boards-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra-2.6 into for-next commit 4fa8eebb045a6d798011f3935a38dd29de30e6c9 Author: Ohad Ben-Cohen Date: Fri Mar 18 16:53:21 2011 -0700 hwspinlock: depend on OMAP4 Currently only OMAP4 supports hwspinlocks, so don't bother asking anyone else. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Tony Lindgren commit 77aded2f523c6540f71b1f549373dd8046329a6b Author: Balaji T K Date: Fri Mar 18 16:53:20 2011 -0700 ARM: OMAP2+: Fix warnings for GPMC interrupt Commit db97eb7dfe13f6c04f0a0e77c32e2691f563ab8b (omap: gpmc: enable irq mode in gpmc) enabled interrupts for GPMC (General Purpose Memory Controller). However, looks like this patch only works on omap3. Fix the issues to avoid warnings on omap4 during the boot. GPMC: number of chip select is 8, CS0 to CS7. One less IRQ allocated throws below warning at boot: [ 0.429290] Trying to install type control for IRQ409 [ 0.429290] Trying to set irq flags for IRQ409 Resolve following warning messages in boot when irq chip is not set: [ 0.429229] Trying to install interrupt handler for IRQ402 [ 0.429229] Trying to install interrupt handler for IRQ403 [ 0.429229] Trying to install interrupt handler for IRQ404 [ 0.429260] Trying to install interrupt handler for IRQ405 [ 0.429260] Trying to install interrupt handler for IRQ406 [ 0.429260] Trying to install interrupt handler for IRQ407 [ 0.429290] Trying to install interrupt handler for IRQ408 Resolve following warning in OMAP4: [ 0.429290] gpmc: irq-20 could not claim: err -22 Signed-off-by: Balaji T K [tony@atomide.com: combined patches into one, updated comments] Signed-off-by: Tony Lindgren commit 8b8e2ef328c3378c74fb4347f66df8e58feeaf46 Author: David Anders Date: Fri Mar 18 16:53:20 2011 -0700 OMAP4: PandaBoard: remove unused power regulators the pandaboard does not use the VUSIM or VAUX1 power regulators on the TWL6030 and are left floating. if the VUSIM and VAUX1 power regulators are initilized, noise on the unloaded regulators generates an overcurrent interrupt causing the system to power down. this patch removes the initialization of the unused power regulators of VUSIM and VAUX1. Signed-off-by: David Anders Acked-by: Andy Green Acked-by: Anand Gadiyar Tested-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 18a81019b851dae83f7df3e72064de706788ff25 Author: Aaro Koskinen Date: Fri Mar 18 16:53:20 2011 -0700 arm: mach-omap2: omap_l3_smx: fix irq handler setup The handler function may be called from the point it is registered. Since the handler inspects IRQ numbers, we must set them up before registration. Signed-off-by: Aaro Koskinen Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 36133869c4b5b70e6acf6ff7ce25df526a6d5cae Author: Aaro Koskinen Date: Fri Mar 18 16:53:19 2011 -0700 arm: mach-omap2: devices: fix omap3_l3_init() return value Fix the return value for the successful case. Signed-off-by: Aaro Koskinen Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 9889376ab91f89a5af7329ae34521dfc4b613ba9 Author: David S. Miller Date: Fri Mar 18 15:47:26 2011 -0700 sparc: Implement of_iomap(). Grab the pre-computed resource and map using of_ioremap(). Signed-off-by: David S. Miller commit 930952af15f8425115528447102ed97610e98949 Author: David S. Miller Date: Fri Mar 18 15:31:19 2011 -0700 sparc: Implement of_address_to_resource(). Similarly to irq_of_parse_and_map(), find the platform_device object and return the pre-computed resource. Signed-off-by: David S. Miller commit c3146df2b735912eddd1d7c080c9377d5df0ae94 Author: Rafael J. Wysocki Date: Sat Mar 12 22:16:51 2011 +0100 ACPI: Use syscore_ops instead of sysdev class and sysdev ACPI uses a sysdev class and a sysdev for executing irqrouter_resume() before turning on interrupts on the boot CPU. However, since irqrouter_resume() ignores its argument, the entire mechanism may be replaced with a struct syscore_ops object which is considerably simpler. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 4d3fbff26c8e91474e30e575c2b7476be11afd83 Author: Rafael J. Wysocki Date: Thu Mar 10 21:21:23 2011 +0100 ACPI: Remove the unused EC sysdev class The ACPI EC driver defines a sysdev class, but it doesn't use it, so it can be removed. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit b51bdad63046d1d5a4807630cc8c02845cf67893 Author: Mike Frysinger Date: Fri Mar 18 08:50:37 2011 +0000 headers: use __aligned_xx types for userspace Now that we finally have __aligned_xx exported to userspace, convert the headers that get exported over to the proper type. Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e Author: Herbert Xu Date: Fri Mar 18 05:27:28 2011 +0000 bridge: Reset IPCB when entering IP stack on NF_FORWARD Whenever we enter the IP stack proper from bridge netfilter we need to ensure that the skb is in a form the IP stack expects it to be in. The entry point on NF_FORWARD did not meet the requirements of the IP stack, therefore leading to potential crashes/panics. This patch fixes the problem. Signed-off-by: Herbert Xu Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit d870bfb9d366c5d466c0f5419a4ec95a3f71ea8a Author: Eric Dumazet Date: Fri Mar 18 00:27:27 2011 +0000 vlan: should take into account needed_headroom Commit c95b819ad7 (gre: Use needed_headroom) made gre use needed_headroom instead of hard_header_len This uncover a bug in vlan code. We should make sure vlan devices take into account their real_dev->needed_headroom or we risk a crash in ipgre_header(), because we dont have enough room to push IP header in skb. Reported-by: Diddi Oscarsson Signed-off-by: Eric Dumazet Cc: Patrick McHardy Cc: Herbert Xu Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 3a7da39d165e0c363c294feec119db1427032afd Author: Ben Hutchings Date: Thu Mar 17 07:34:32 2011 +0000 ethtool: Compat handling for struct ethtool_rxnfc This structure was accidentally defined such that its layout can differ between 32-bit and 64-bit processes. Add compat structure definitions and an ioctl wrapper function. Signed-off-by: Ben Hutchings Acked-by: Alexander Duyck Cc: stable@kernel.org [2.6.30+] Signed-off-by: David S. Miller commit 5e5069b41d5b82bcadc1dbf73f48476b428c102f Author: Roger Luethi Date: Thu Mar 17 06:37:21 2011 +0000 ethtool: __ethtool_set_sg: check for function pointer before using it __ethtool_set_sg does not check if dev->ethtool_ops->set_sg is defined which can result in a NULL pointer dereference when ethtool is used to change SG settings for drivers without SG support. Signed-off-by: Roger Luethi Reviewed-by: Ben Hutchings Signed-off-by: David S. Miller commit 67c5c6cb8129c595f21e88254a3fc6b3b841ae8e Author: Vasiliy Kulikov Date: Thu Mar 17 01:40:10 2011 +0000 econet: 4 byte infoleak to the network struct aunhdr has 4 padding bytes between 'pad' and 'handle' fields on x86_64. These bytes are not initialized in the variable 'ah' before sending 'ah' to the network. This leads to 4 bytes kernel stack infoleak. This bug was introduced before the git epoch. Signed-off-by: Vasiliy Kulikov Acked-by: Phil Blundell Signed-off-by: David S. Miller commit 4363c2fddb1399b728ef21ee8101c148a311ea45 Author: Alex Dubov Date: Wed Mar 16 17:57:13 2011 +0000 gianfar: Fall back to software tcp/udp checksum on older controllers As specified by errata eTSEC49 of MPC8548 and errata eTSEC12 of MPC83xx, older revisions of gianfar controllers will be unable to calculate a TCP/UDP packet checksum for some alignments of the appropriate FCB. This patch checks for FCB alignment on such controllers and falls back to software checksumming if the alignment is known to be bad. Signed-off-by: Alex Dubov Signed-off-by: David S. Miller commit 05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 Merge: dd87cc5 589c7a3 Author: Len Brown Date: Fri Mar 18 18:06:08 2011 -0400 Merge branch 'acpica' into release commit 1655068029a6e86682fe97a687db9db0aae5af81 Author: David S. Miller Date: Fri Mar 18 15:03:16 2011 -0700 sparc: Provide NO_IRQ definition. Signed-off-by: David S. Miller commit e1620d591a75a10b15cf61dbf8243a0b7e6731a2 Author: Rafael J. Wysocki Date: Fri Mar 18 19:55:36 2011 +0100 USB: Move runtime PM callbacks to usb_device_pm_ops USB defines usb_device_type pointing to usb_device_pm_ops that provides system-wide PM callbacks only and usb_bus_type pointing to usb_bus_pm_ops that provides runtime PM callbacks only. However, the USB runtime PM callbacks may be defined in usb_device_pm_ops which makes it possible to drop usb_bus_pm_ops and will allow us to consolidate the handling of subsystems by the PM core code. Signed-off-by: Rafael J. Wysocki Acked-by: Greg Kroah-Hartman commit 99759619b27662d1290901228d77a293e6e83200 Merge: b061c59 65d8def Author: Linus Torvalds Date: Fri Mar 18 10:56:44 2011 -0700 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: label: remove #include of ACPI header to avoid warnings PCI: label: Fix compilation error when CONFIG_ACPI is unset PCI: pre-allocate additional resources to devices only after successful allocation of essential resources. PCI: introduce reset_resource() PCI: data structure agnostic free list function PCI: refactor io size calculation code PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH PCI hotplug: acpiphp: set current_state to D0 in register_slot PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs PCI: add more checking to ICH region quirks PCI: aer-inject: Override PCIe AER Mask Registers PCI: fix tlan build when CONFIG_PCI is not enabled PCI: remove quirk for pre-production systems PCI: Avoid potential NULL pointer dereference in pci_scan_bridge PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs PCI: sysfs: Fix failure path for addition of "vpd" attribute commit b061c59c27e0385e53c961d9fbd18c1c078d9823 Merge: 99f4065 568a60e Author: Linus Torvalds Date: Fri Mar 18 10:56:02 2011 -0700 Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits) spi/dw_spi: move dw_spi.h into drivers/spi spi/dw_spi: Fix missing header gpio/langwell: Clear edge bit before handling gpio/langwell: Simplify demux loop gpio/langwell: Convert irq name space gpio/langwell: Fix broken irq_eoi change. gpio; Make Intel chipset gpio drivers depend on x86 gpio/cs5535-gpio: Fix section mismatch spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices spi/davinci: Support DMA transfers larger than 65535 words spi/davinci: Use correct length parameter to dma_map_single calls gpio: Use __devexit at necessary places gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio gpio/mcp23s08: support mcp23s17 variant of_mmc_spi: add card detect irq support spi/omap_mcspi: catch xfers of non-multiple SPI word size spi/omap_mcspi: Off-by-one error in finding the right divisor gpio/pca953x: Fix wrong pointer type spi/pl022: rid dangling labels spi: add support for SuperH SPI ... commit 99f4065bac7b8c3f829334b4218a5c2e68cbe440 Merge: f539abe e43f055 Author: Linus Torvalds Date: Fri Mar 18 10:55:11 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: use alloc_workqueue function dlm: increase default hash table sizes dlm: record full callback state commit f539abece1b7e36fae6add4f9ea29203d40badcb Merge: 3f6f7e6 24ff666 Author: Linus Torvalds Date: Fri Mar 18 10:51:11 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: fs: call security_d_instantiate in d_obtain_alias V2 lose 'mounting_here' argument in ->d_manage() don't pass 'mounting_here' flag to follow_down() change the locking order for namespace_sem fix deadlock in pivot_root() vfs: split off vfsmount-related parts of vfs_kern_mount() Some fixes for pstore kill simple_set_mnt() commit 3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304 Merge: 8f627a8 31be83a Author: Linus Torvalds Date: Fri Mar 18 10:50:52 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs: omfs: make readdir stop when filldir says so omfs: merge unlink() and rmdir(), close leak in rename() omfs: stop playing silly buggers with omfs_unlink() in ->rename() omfs: rename() needs to mark old_inode dirty after ctime update commit 8f627a8a881481598c2591c3acc122fb9be7bac4 Merge: fd57ed0 5d630e4 Author: Linus Torvalds Date: Fri Mar 18 10:50:27 2011 -0700 Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 * 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits) UBIFS: clean-up commentaries UBIFS: save 128KiB or more RAM UBIFS: allocate orphans scan buffer on demand UBIFS: allocate lpt dump buffer on demand UBIFS: allocate ltab checking buffer on demand UBIFS: allocate scanning buffer on demand UBIFS: allocate dump buffer on demand UBIFS: do not check data crc by default UBIFS: simplify UBIFS Kconfig menu UBIFS: print max. index node size UBIFS: handle allocation failures in UBIFS write path UBIFS: use max_write_size during recovery UBIFS: use max_write_size for write-buffers UBIFS: introduce write-buffer size field UBI: incorporate LEB offset information UBIFS: incorporate maximum write size UBI: provide LEB offset information UBI: incorporate maximum write size UBIFS: fix LEB number in printk UBIFS: restrict world-writable debugfs files ... commit fd57ed021990157ee5b3997c3f21c734093a9e23 Merge: ca749e2 28237e4 Author: Linus Torvalds Date: Fri Mar 18 10:50:02 2011 -0700 Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 * 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: make tests modes dynamic UBI: make self-checks dynamic UBI: make debugging messages dynamic UBI: remove UBI_IO_DEBUG macro UBI: kill debugging buffer UBI: allocate erase checking buffer on demand UBI: allocate write checking buffer on demand UBI: always re-read in case of read failures UBI: cleanup comments about corrupted PEBs UBI: add slab cache for ubi_scan_leb objects UBI: use raw mtd read function in debugging code UBI: try to reveal buggy MTD drivers UBI: add a commentary about allocating VID header buffer on stack UBI: cleanup LEB start calculations UBI: fix NOR erase preparation quirk commit ca749e2af01bb3e6b94d441696903dc26c357443 Author: Alan Cox Date: Fri Mar 18 13:56:14 2011 +0000 MAINTAINERS: Add serial Add an entry for serial maintainers. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d3e458d78167102cc961237cfceef6fffc80c0b3 Merge: f2e1fbb d351cf4 Author: Linus Torvalds Date: Fri Mar 18 10:46:37 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits) ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl ALSA: aloop - Fix possible IRQ lock inversion ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail() ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination ALSA: firewire - msleep needs delay.h ALSA: firewire-lib, firewire-speakers: handle packet queueing errors ALSA: firewire-lib: allocate DMA buffer separately ALSA: firewire-lib: use no-info SYT for packets without SYT sample ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver ALSA: hda - Remove an unused variable in patch_realtek.c ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs ALSA: hda - Move default input-src selection to init part ALSA: hda - Initialize special cases for input src in init phase ALSA: ctxfi - Clear input settings before initialization ALSA: ctxfi - Fix SPDIF status retrieval ALSA: ctxfi - Fix incorrect SPDIF status bit mask ALSA: ctxfi - Fix microphone boost codes/comments ALSA: atiixp - Fix wrong time-out checks during ac-link reset ALSA: intel8x0m: append 'm' to "r_intel8x0" ... commit f2e1fbb5f2177227f71c4fc0491e531dd7acd385 Merge: 508996b 4981d01 Author: Linus Torvalds Date: Fri Mar 18 10:45:21 2011 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Flush TLB if PGD entry is changed in i386 PAE mode x86, dumpstack: Correct stack dump info when frame pointer is available x86: Clean up csum-copy_64.S a bit x86: Fix common misspellings x86: Fix misspelling and align params x86: Use PentiumPro-optimized partial_csum() on VIA C7 commit 508996b6a0ef0c7aa7701995d137e71c56180752 Merge: 6192978 1c38979 58cbe24 Author: Linus Torvalds Date: Fri Mar 18 10:44:05 2011 -0700 Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Fix incorrect unlock in __setup_irq() cris: Use generic show_interrupts() genirq: show_interrupts: Check desc->name before printing it blindly cris: Use accessor functions to set IRQ_PER_CPU flag cris: Fix irq conversion fallout * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched, kernel-doc: Fix runqueue_is_locked() description commit 619297855aa16646246ea4b1f6e05f1b2455c808 Merge: e16b396 1ef1d1c Author: Linus Torvalds Date: Fri Mar 18 10:38:34 2011 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits) trace, filters: Initialize the match variable in process_ops() properly trace, documentation: Fix branch profiling location in debugfs oprofile, s390: Cleanups oprofile, s390: Remove hwsampler_files.c and merge it into init.c perf: Fix tear-down of inherited group events perf: Reorder & optimize perf_event_context to remove alignment padding on 64 bit builds perf: Handle stopped state with tracepoints perf: Fix the software events state check perf, powerpc: Handle events that raise an exception without overflowing perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints perf, x86: Clean up SandyBridge PEBS events perf lock: Fix sorting by wait_min perf tools: Version incorrect with some versions of grep perf evlist: New command to list the names of events present in a perf.data file perf script: Add support for H/W and S/W events perf script: Add support for dumping symbols perf script: Support custom field selection for output perf script: Move printing of 'common' data from print_event and rename perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse perf script: Change process_event prototype ... commit e16b396ce314b2bcdfe6c173fe075bf8e3432368 Merge: 7fd23a2 e6e8dd5 Author: Linus Torvalds Date: Fri Mar 18 10:37:40 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits) doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore Update cpuset info & webiste for cgroups dcdbas: force SMI to happen when expected arch/arm/Kconfig: remove one to many l's in the word. asm-generic/user.h: Fix spelling in comment drm: fix printk typo 'sracth' Remove one to many n's in a word Documentation/filesystems/romfs.txt: fixing link to genromfs drivers:scsi Change printk typo initate -> initiate serial, pch uart: Remove duplicate inclusion of linux/pci.h header fs/eventpoll.c: fix spelling mm: Fix out-of-date comments which refers non-existent functions drm: Fix printk typo 'failled' coh901318.c: Change initate to initiate. mbox-db5500.c Change initate to initiate. edac: correct i82975x error-info reported edac: correct i82975x mci initialisation edac: correct commented info fs: update comments to point correct document target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c ... Trivial conflict in fs/eventpoll.c (spelling vs addition) commit 7fd23a24717a327a66f3c32d11a20a2f169c824f Merge: 0a95d92 65b0619 Author: Linus Torvalds Date: Fri Mar 18 10:35:30 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits) HID: add support for Logitech Driving Force Pro wheel HID: hid-ortek: remove spurious reference HID: add support for Ortek PKB-1700 HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor' HID: hid-ntrig: init settle and mode check HID: merge hid-egalax into hid-multitouch HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing HID: ntrig remove if and drop an indent HID: ACRUX - activate the device immediately after binding HID: ntrig: apply NO_INIT_REPORTS quirk HID: hid-magicmouse: Correct touch orientation direction HID: ntrig don't dereference unclaimed hidinput HID: Do not create input devices for feature reports HID: bt hidp: send Output reports using SET_REPORT on the Control channel HID: hid-sony.c: Fix sending Output reports to the Sixaxis HID: add support for Keytouch IEC 60945 HID: Add HID Report Descriptor to sysfs HID: add IRTOUCH infrared USB to hid_have_special_driver HID: kernel oops in out_cleanup in function hidinput_connect HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE) ... commit 1a8d59e529d07f7888f9c6c86a9f59ea4ef077aa Author: David Howells Date: Fri Mar 18 16:54:32 2011 +0000 MN10300: Deprecate gdbstub Deprecate the MN10300 arch's gdbstub in favour of KGDB, which is more capable in some areas (such as SMP) and almost as capable in others (it's I/O is not as decoupled and it can't start as early). gdbstub will be removed in a later version when we're satisfied with KGDB's working. Signed-off-by: David Howells commit 52885b32a5f7326d9505ca45969a695bad2459c4 Author: David Howells Date: Fri Mar 18 16:54:32 2011 +0000 MN10300: Allow KGDB to use the MN10300 serial ports Allow KGDB to use the MN10300 serial ports through the polled I/O interface provided via the TTY/serial layer and the kgdboc driver. This allows the kernel to be started with something like: kgdboc=ttySM0,115200 added to the command line. Signed-off-by: David Howells commit 5141c46c6137f4866eb5f29e25ed0556bcc4c634 Author: David Howells Date: Fri Mar 18 16:54:32 2011 +0000 MN10300: Emulate single stepping in KGDB on MN10300 Emulate single stepping in KGDB on MN10300 by way of temporary breakpoint insertion. These breakpoints are never actually seen by KGDB, and will overlay KGDB's own breakpoints. The breakpoints are removed by switch_to() and reinstalled on switching back so that if preemption occurs, the preempting task doesn't hit them (though it will still hit KGDB's regular breakpoints). If KGDB is reentered for any reason, then the single step breakpoint is completely erased and must be set again by the debugger. We take advantage of the fact that KGDB will effectively halt all other CPUs whilst this CPU is single-stepping to avoid SMP problems. If the single-stepping task is preempted and killed without KGDB being reinvoked, then the breakpoint(s) will be cleared and KGDB will be jumped back into. Signed-off-by: David Howells commit 044264bbe34085b550e6429ce97ef310667be9dc Author: David Howells Date: Fri Mar 18 16:54:31 2011 +0000 MN10300: Generalise kernel debugger kernel halt, reboot or power off hook Generalise the kernel debugger hook for notification of halt, reboot or power off. This is used by gdbstub to tell the debugger it is exiting. This will be useful for KGDB too. Signed-off-by: David Howells commit d57f078b193981d1b7d24193f3118c6b806db0ff Author: David Howells Date: Fri Mar 18 16:54:31 2011 +0000 KGDB: Notify GDB of machine halt, reboot or power off Notify GDB of the machine halting, rebooting or powering off by sending it an exited command (remote protocol command 'W'). This is done by calling: void gdbstub_exit(int status) from the arch's machine_{halt,restart,power_off}() functions with an appropriate exit status to be reported to GDB. Signed-off-by: David Howells commit e460d64405c04581e42aa9cbae76815a2d4e9abe Author: David Howells Date: Fri Mar 18 16:54:31 2011 +0000 MN10300: Use KGDB commit 67ddb4052daac9d449caf2643ac365d42a04219a Author: David Howells Date: Fri Mar 18 16:54:30 2011 +0000 MN10300: Create generic kernel debugger hooks Create generic kernel debugger hooks in the MN10300 arch and make gdbstub use them. This is a preparation for KGDB support. Signed-off-by: David Howells commit 7f386ac3272e057fbf51e5b5712fad1a80e77125 Author: David Howells Date: Fri Mar 18 16:54:30 2011 +0000 MN10300: Create general kernel debugger cache flushing Create general kernel debugger cache flushing for MN10300 and get rid of the old stuff that gdbstub was using. Signed-off-by: David Howells commit 792576b1c5a4da16700f1003b1c3fc1e22cd9e07 Author: David Howells Date: Fri Mar 18 16:54:30 2011 +0000 MN10300: Introduce a general config option for kernel debugger hooks Introduce a general config option for kernel debugger hooks so that both gdbstub and kgdb can use it and add a header file for both debuggers to use. Signed-off-by: David Howells commit b75bb2365d50f73c09e42cf2de07f5805a3988ea Author: David Howells Date: Fri Mar 18 16:54:29 2011 +0000 MN10300: The icache invalidate functions should disable the icache first The icache invalidate functions should disable the icache on AM33 and wait for it to quiesce before attempting to invalidate it, and should then wait for it to quiesce again before reenabling it, but on AM34 they should invalidate directly. The same goes for the dcache invalidation, but this isn't used much. Whilst we're at it, this can be wrapped in assembler macros to remove duplicate code. The AM33 manual states that: An operation that invalidates the cache, switches the writing mode, or changes the way mode must be performed after disabling the cache, checking the busy bit, and confirming that the cache is not in operation. for the dcache [sec 2.8.3.2.1]. This is not stated so for the icache [sec 2.8.3.1.1] but the example code there suggests that it is. Whilst the AM34 manual states that the cache must be disabled for both the icache [sec 1.8.3.2.1] and the dcache [sec 1.8.3.2.1], the Panasonic hardware engineers say the manual is wrong and that disabling the caches for invalidation is wrong. Furthermore, they say that disabling the caches on the AM34 whilst running an SMP kernel can lead to incoherency between the various CPU caches and should thus be avoided. Signed-off-by: David Howells commit 9ee21723ccc30070f47c411826d4ed013cd050c2 Author: David Howells Date: Fri Mar 18 16:54:29 2011 +0000 MN10300: gdbstub: Restrict single-stepping to non-preemptable non-SMP configs Restrict single-stepping through the kernel using gdbstub to non-preemptable non-SMP configs as gdbstub has to do software single-stepping by means of temporary breakpoints. Hardware single-stepping is unavailable as Panasonic have not sufficiently documented the interface to it. Software single-stepping through preemptable or SMP kernels runs into problems as it makes it much more likely that the wrong thread will hit the temporary breakpoints. It seems impractical to work around the problem for the most part. It could be possible to make a UP preemptable kernel switch temporary breakpoints in and out in switch_to(). Signed-off-by: David Howells commit ddb7d1e975d224885397c002512ded987be3c3bc Author: David Howells Date: Fri Mar 18 16:52:54 2011 +0000 MN10300: Clear ASB2364 peripheral interrupt masks before enabling interrupts Clear the interrupt mask registers of ASB2364 peripherals before enabling interrupts so that any peripherals that weren't dealt with by the bootloader after a reboot (if there was one) won't cause an interrupt storm when interrupts are first enabled before the drivers are initialised. Also, attempt to reset the peripherals attached to the FPGA. Signed-off-by: David Howells commit 02b2944cd70c3166984699dd623612e2f8a3eebf Author: David Howells Date: Fri Mar 18 16:52:54 2011 +0000 MN10300: Fix the ASB2364 gdbport UART register defs Fix the ASB2364 gdbport UART register definitions. These registers are actually 2 bytes apart, not 4 (which the ASB2303 and ASB2305 are). Signed-off-by: David Howells commit 5f91a1affc4f94589e386f9a687d7c3ecb944df4 Author: David Howells Date: Fri Mar 18 16:52:53 2011 +0000 MN10300: Fix ASB2364 FPGA register defs Fix the definition of the ASB2364 FPGA IRQ detect registers. They accidentally got defined to be the same as the mask registers when the patches were being ported to the upstream kernel. Signed-off-by: David Howells commit df43b86b411dcc1e6ddbd9b7a44357c28d523bad Author: Thomas Gleixner Date: Fri Mar 18 16:52:53 2011 +0000 MN10300: Select GENERIC_HARDIRQS_NO_DEPRECATED All chips converted. Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 4692edbd4c5ab58c4e17f8cba136d93104254a15 Author: David Howells Date: Fri Mar 18 16:52:53 2011 +0000 MN10300: Select HAVE_GENERIC_HARDIRQS rather than GENERIC_HARDIRQS Select HAVE_GENERIC_HARDIRQS rather than GENERIC_HARDIRQS in MN10300's main Kconfig file to avoid this warning: warning: (MN10300) selects GENERIC_HARDIRQS which has unmet direct dependencies (HAVE_GENERIC_HARDIRQS) Signed-off-by: David Howells commit 1ddc4a38ca008b3a399ff7a6643076a50f0a2d11 Author: Thomas Gleixner Date: Fri Mar 18 16:52:52 2011 +0000 MN10300: Convert ASB2364 FPGA irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 3ba65467f046fb58ae6fd93793fbe21119a8d875 Author: Thomas Gleixner Date: Fri Mar 18 16:52:52 2011 +0000 MN10300: Convert ipi irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit b023ba598c86747ded27d549f0225cf384c2e132 Author: Thomas Gleixner Date: Fri Mar 18 16:52:52 2011 +0000 MN10300: Convert serial irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit 125bb1dbaded3f7d12ad39e5e26d5fa0aa9ca751 Author: Thomas Gleixner Date: Fri Mar 18 16:52:51 2011 +0000 MN10300: Convert cpu irq_chips to new functions Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit a494d3df1e482e3f5552268af5b4b122421b5ee6 Author: Thomas Gleixner Date: Fri Mar 18 16:52:51 2011 +0000 MN10300: Remove unused mn10300_intc_* functions No users. Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit e61645a0aa9d96b1df36a1879f9b052ca71a5f22 Author: Thomas Gleixner Date: Fri Mar 18 16:52:51 2011 +0000 MN10300: Remove stale irq_chip.end - V2 irq_chip.end is obsolete with the removal of __do_IRQ(). Signed-off-by: Thomas Gleixner Signed-off-by: David Howells commit dc7daf33626d1f4afc97505516f824caf440d52c Author: Thomas Gleixner Date: Fri Mar 18 16:52:50 2011 +0000 MN10300: Use clockevents_calc_mult_shift() Use clockevents_calc_mult_shift() instead of the homebrewn function in mn10300/kernel/time.c. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Cc: Koichi Yasutake Cc: Mark Salter Signed-off-by: David Howells commit 817890ba15df44181bc9c2bf7527cb066ebae06f Author: Thomas Gleixner Date: Fri Mar 18 16:52:50 2011 +0000 MN10300: Use clocksource_register_hz() clocksource_register_hz() calculates the shift/mult pair for the clocksource. Remove the mn10300 duplicate implementation. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Cc: Koichi Yasutake Cc: Mark Salter Signed-off-by: David Howells commit 73a173a4117419892bd436e85a00a53aa22ad118 Author: Thomas Gleixner Date: Fri Mar 18 16:42:06 2011 +0000 MN10300: Remove stale code mn10300 implements clocksource and clockevents and selects them unconditionally in Kconfig. Remove the stale code which seems to be a leftover of the conversion. Cleanup the configuration switches as well. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Cc: Koichi Yasutake Cc: Mark Salter Signed-off-by: David Howells commit 1eba843dd7678b9033a0d1ccff21c21b857de77b Author: Michael Heinz Date: Fri Feb 11 21:44:30 2011 +0000 IB/mad: Improve an error message so error code is included Signed-off-by: Michael Heinz Signed-off-by: Roland Dreier commit 568a60eda2e90a11bb3d7f8ef3f6800e9b60d4e5 Author: Grant Likely Date: Mon Feb 28 12:47:12 2011 -0700 spi/dw_spi: move dw_spi.h into drivers/spi include/linux/dw_spi.h only includes driver internal data. It doesn't expose a platform_data configuration structure or similar (at least nothing in-tree). This patch moves the header into drivers/spi so that the scope is limited to only the dw_spi_*.c driver files Signed-off-by: Grant Likely Cc: Feng Tang Cc: spi-devel-general@lists.sourceforge.net commit 748bfd9c1ded8419e7fdba4ca6f0c1dc1642df63 Author: Roland Dreier Date: Fri Mar 18 08:52:30 2011 -0700 RDMA/nes: Don't print success message at level KERN_ERR There's no reason to print "NetEffect RNIC driver successfully loaded" at level KERN_ERR (where it will uglify the console on a quiet boot). Change it to KERN_INFO. Signed-off-by: Roland Dreier commit 46165a3d00db7526fb43a3dfe5c01a4aa7e236af Author: Jiri Slaby Date: Fri Mar 18 10:41:17 2011 +0100 spi/dw_spi: Fix missing header Currently, build on PPC dies with: In file included from drivers/spi/dw_spi_mmio.c:16: include/linux/spi/dw_spi.h:147: error: field ‘tx_sgl’ has incomplete type include/linux/spi/dw_spi.h:149: error: field ‘rx_sgl’ has incomplete type Add linux/scatterlist.h include to dw_spi.h, because we need to know the contents of the structure. Signed-off-by: Jiri Slaby Signed-off-by: Grant Likely commit 977a6ef3c0cb622b572fb8e2e5088dbe09521375 Author: Xiaochen Wang Date: Fri Mar 18 16:29:25 2011 +0800 sound: read i_size with i_size_read() Convert direct read of inode->i_size to using i_size_read(). i_size_read is guaranteed to return a valid value and its caller does not need to use addtional locking. Signed-off-by: Xiaochen Wang Signed-off-by: Takashi Iwai commit 24ff6663ccfdaf088dfa7acae489cb11ed4f43c4 Author: Josef Bacik Date: Thu Nov 18 20:52:55 2010 -0500 fs: call security_d_instantiate in d_obtain_alias V2 While trying to track down some NFS problems with BTRFS, I kept noticing I was getting -EACCESS for no apparent reason. Eric Paris and printk() helped me figure out that it was SELinux that was giving me grief, with the following denial type=AVC msg=audit(1290013638.413:95): avc: denied { 0x800000 } for pid=1772 comm="nfsd" name="" dev=sda1 ino=256 scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:object_r:unlabeled_t:s0 tclass=file Turns out this is because in d_obtain_alias if we can't find an alias we create one and do all the normal instantiation stuff, but we don't do the security_d_instantiate. Usually we are protected from getting a hashed dentry that hasn't yet run security_d_instantiate() by the parent's i_mutex, but obviously this isn't an option there, so in order to deal with the case that a second thread comes in and finds our new dentry before we get to run security_d_instantiate(), we go ahead and call it if we find a dentry already. Eric assures me that this is ok as the code checks to see if the dentry has been initialized already so calling security_d_instantiate() against the same dentry multiple times is ok. With this patch I'm no longer getting errant -EACCESS values. Signed-off-by: Josef Bacik Signed-off-by: Al Viro commit 1aed3e4204dd787d53b3cd6363eb63bb4900c38e Author: Al Viro Date: Fri Mar 18 09:09:02 2011 -0400 lose 'mounting_here' argument in ->d_manage() it's always false... Signed-off-by: Al Viro commit 1ef1d1c2353967e2d61ecaddf76edfd058a778b4 Author: Ingo Molnar Date: Fri Mar 18 14:41:27 2011 +0100 trace, filters: Initialize the match variable in process_ops() properly Make sure the 'match' variable always has a value. Cc: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Ingo Molnar commit 0a95d92c0054e74fb79607ac2df958b7bf295706 Merge: 08351fc 8315320 Author: Linus Torvalds Date: Fri Mar 18 06:31:43 2011 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (62 commits) powerpc/85xx: Fix signedness bug in cache-sram powerpc/fsl: 85xx: document cache sram bindings powerpc/fsl: define binding for fsl mpic interrupt controllers powerpc/fsl_msi: Handle msi-available-ranges better drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak powerpc/85xx: Fix SPE float to integer conversion failure powerpc/85xx: Update sata controller compatible for p1022ds board ATA: Add FSL sata v2 controller support powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable powerpc/8xx: remove obsolete mgsuvd board powerpc/82xx: rename and update mgcoge board support powerpc/83xx: rename and update kmeter1 powerpc/85xx: Workaroudn e500 CPU erratum A005 powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e powerpc/pseries: Disable MSI using new interface if possible powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED. powerpc: core irq_data conversion. powerpc: sysdev/xilinx_intc irq_data conversion. powerpc: sysdev/uic irq_data conversion. ... Fix up conflicts in arch/powerpc/sysdev/fsl_msi.c (due to getting rid of of_platform_driver in arch/powerpc) commit 7cc90cc3ffe22a0d81b8d605b20a82ec7911012d Author: Al Viro Date: Fri Mar 18 09:04:20 2011 -0400 don't pass 'mounting_here' flag to follow_down() it's always false now Signed-off-by: Al Viro commit b12cea9198fa99ffd3de1776c323bc7464d26b44 Author: Al Viro Date: Fri Mar 18 08:55:38 2011 -0400 change the locking order for namespace_sem Have it nested inside ->i_mutex. Instead of using follow_down() under namespace_sem, followed by grabbing i_mutex and checking that mountpoint to be is not dead, do the following: grab i_mutex check that it's not dead grab namespace_sem see if anything is mounted there if not, we've won otherwise drop locks put_path on what we had replace with what's mounted retry everything with new mountpoint to be New helper (lock_mount()) does that. do_add_mount(), do_move_mount(), do_loopback() and pivot_root() switched to it; in case of the last two that eliminates a race we used to have - original code didn't do follow_down(). Signed-off-by: Al Viro commit 27cb1572e3e6bb1f8cf6bb3d74c914a87b131792 Author: Al Viro Date: Fri Mar 18 08:29:36 2011 -0400 fix deadlock in pivot_root() Don't hold vfsmount_lock over the loop traversing ->mnt_parent; do check_mnt(new.mnt) under namespace_sem instead; combined with namespace_sem held over all that code it'll guarantee the stability of ->mnt_parent chain all the way to the root. Doing check_mnt() outside of namespace_sem in case of pivot_root() is wrong anyway. Signed-off-by: Al Viro commit b1a56b331aec59be04f25ac99694d855d591c539 Author: Mark Brown Date: Wed Mar 16 18:18:53 2011 +0000 ASoC: Remove bogus check for register validity in debugfs write Since not all registers need to be cached and the cache is entirely optional anyway we shouldn't be checking that a register is in the cached range. If the register is invalid then the actual I/O code can determine that and report an error. Similarly, the step size can and should be enforced by the lower level code if it's important. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 2a3887f7015b547ad8195391d1f6c2136062be32 Merge: a110f4e e58a894 Author: Mark Brown Date: Fri Mar 18 10:51:13 2011 +0000 Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.39 commit 4981d01eada5354d81c8929d5b2836829ba3df7b Author: Shaohua Li Date: Wed Mar 16 11:37:29 2011 +0800 x86: Flush TLB if PGD entry is changed in i386 PAE mode According to intel CPU manual, every time PGD entry is changed in i386 PAE mode, we need do a full TLB flush. Current code follows this and there is comment for this too in the code. But current code misses the multi-threaded case. A changed page table might be used by several CPUs, every such CPU should flush TLB. Usually this isn't a problem, because we prepopulate all PGD entries at process fork. But when the process does munmap and follows new mmap, this issue will be triggered. When it happens, some CPUs keep doing page faults: http://marc.info/?l=linux-kernel&m=129915020508238&w=2 Reported-by: Yasunori Goto Tested-by: Yasunori Goto Reviewed-by: Rik van Riel Signed-off-by: Shaohua Li Cc: Mallick Asit K Cc: Linus Torvalds Cc: Andrew Morton Cc: linux-mm Cc: stable LKML-Reference: <1300246649.2337.95.camel@sli10-conroe> Signed-off-by: Ingo Molnar commit e8e999cf3cc733482e390b02ff25a64cecdc0b64 Author: Namhyung Kim Date: Fri Mar 18 11:40:06 2011 +0900 x86, dumpstack: Correct stack dump info when frame pointer is available Current stack dump code scans entire stack and check each entry contains a pointer to kernel code. If CONFIG_FRAME_POINTER=y it could mark whether the pointer is valid or not based on value of the frame pointer. Invalid entries could be preceded by '?' sign. However this was not going to happen because scan start point was always higher than the frame pointer so that they could not meet. Commit 9c0729dc8062 ("x86: Eliminate bp argument from the stack tracing routines") delayed bp acquisition point, so the bp was read in lower frame, thus all of the entries were marked invalid. This patch fixes this by reverting above commit while retaining stack_frame() helper as suggested by Frederic Weisbecker. End result looks like below: before: [ 3.508329] Call Trace: [ 3.508551] [] ? panic+0x91/0x199 [ 3.508662] [] ? printk+0x68/0x6a [ 3.508770] [] ? mount_block_root+0x257/0x26e [ 3.508876] [] ? mount_root+0x56/0x5a [ 3.508975] [] ? prepare_namespace+0x170/0x1a9 [ 3.509216] [] ? kernel_init+0x1d2/0x1e2 [ 3.509335] [] ? kernel_thread_helper+0x4/0x10 [ 3.509442] [] ? restore_args+0x0/0x30 [ 3.509542] [] ? kernel_init+0x0/0x1e2 [ 3.509641] [] ? kernel_thread_helper+0x0/0x10 after: [ 3.522991] Call Trace: [ 3.523351] [] panic+0x91/0x199 [ 3.523468] [] ? printk+0x68/0x6a [ 3.523576] [] mount_block_root+0x257/0x26e [ 3.523681] [] mount_root+0x56/0x5a [ 3.523780] [] prepare_namespace+0x170/0x1a9 [ 3.523885] [] kernel_init+0x1d2/0x1e2 [ 3.523987] [] kernel_thread_helper+0x4/0x10 [ 3.524228] [] ? restore_args+0x0/0x30 [ 3.524345] [] ? kernel_init+0x0/0x1e2 [ 3.524445] [] ? kernel_thread_helper+0x0/0x10 -v5: * fix build breakage with oprofile -v4: * use 0 instead of regs->bp * separate out printk changes -v3: * apply comment from Frederic * add a couple of printk fixes Signed-off-by: Namhyung Kim Acked-by: Peter Zijlstra Acked-by: Frederic Weisbecker Cc: Soren Sandmann Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Robert Richter LKML-Reference: <1300416006-3163-1-git-send-email-namhyung@gmail.com> Signed-off-by: Ingo Molnar commit 2c76397bddd3abcd36aca1941f47570dbc249542 Author: Ingo Molnar Date: Fri Mar 18 10:42:11 2011 +0100 x86: Clean up csum-copy_64.S a bit The many stray whitespaces and other uncleanlinesses made this code almost unreadable to me - so fix those. No changes to the code. Signed-off-by: Ingo Molnar commit 0d2eb44f631d9d0a826efa3156f157477fdaecf4 Author: Lucas De Marchi Date: Thu Mar 17 16:24:16 2011 -0300 x86: Fix common misspellings They were generated by 'codespell' and then manually reviewed. Signed-off-by: Lucas De Marchi Cc: trivial@kernel.org LKML-Reference: <1300389856-1099-3-git-send-email-lucas.demarchi@profusion.mobi> Signed-off-by: Ingo Molnar commit a6c3270b04340c5e0d47af5bdb10f30d33333739 Author: Lucas De Marchi Date: Thu Mar 17 16:24:15 2011 -0300 x86: Fix misspelling and align params Fix 'upto' misspelling and align parameters. Signed-off-by: Lucas De Marchi Cc: trivial@kernel.org LKML-Reference: <1300389856-1099-2-git-send-email-lucas.demarchi@profusion.mobi> Signed-off-by: Ingo Molnar commit 8dd8997d2c56c9f248294805e129e1fc69444380 Merge: 1eda75c 016aa2e Author: Ingo Molnar Date: Fri Mar 18 10:38:53 2011 +0100 Merge branch 'linus' into x86/urgent Merge reason: Merge upstream commits to avoid conflicts in upcoming patches. Signed-off-by: Ingo Molnar commit 0c082bd15828135d609a2f593b583de9eacece0f Author: Mike Frysinger Date: Fri Mar 18 05:15:52 2011 -0400 Blackfin: ip0x: fix unused variable warning The previous commit that changed this code to the common GPIO layers forgot to delete the local and now unused "i" variable. Signed-off-by: Mike Frysinger commit 58ee0d3bb115da727ccffeaebce21274e03b5d2e Author: Mike Frysinger Date: Fri Mar 18 04:17:40 2011 -0400 Blackfin: punt unused HDMA masks No code uses these, and the short define names are polluting the global namespace where they collide with things like common irq files. So just punt the damned things. If in the future we need HDMA support, we can make a standalone header for these things. Signed-off-by: Mike Frysinger commit a8d0142fb7e31a11919ef2d45d6f43e0f225f568 Author: Mike Frysinger Date: Fri Mar 18 04:05:23 2011 -0400 Blackfin: wire up new syscalls Hook up name_to_handle_at, open_by_handle_at, and clock_adjtime. Signed-off-by: Mike Frysinger commit 1353d050facf5efd8dc05ba6c4d7852fcb423b15 Author: Philippe Gerum Date: Thu Mar 17 02:16:16 2011 -0400 Blackfin/ipipe: restore pipeline bits in irqflags This patch fixes the Blackfin irqflags to make them I-pipe aware anew, after the introduction of the hard_local_irq_*() API. Signed-off-by: Philippe Gerum Signed-off-by: Mike Frysinger commit 9169b51f8ce6cd11cd19913b54466ec11e6a12f9 Author: Philippe Gerum Date: Thu Mar 17 02:15:24 2011 -0400 Blackfin/ipipe: fix deferred pipeline sync for the root stage This patch makes sure to sync the pipeline for the root stage only from the outer interrupt level, when resuming kernel code after an interrupt. This fixes a bug causing EVT15 to be spuriously popped off upon nested interrupts, which in turn would cause the preempted kernel code to resume without supervisor privileges. Signed-off-by: Philippe Gerum Signed-off-by: Mike Frysinger commit 5b5da4c4b843e0d84244472b72fe1e7500f5681f Author: Philippe Gerum Date: Thu Mar 17 02:12:48 2011 -0400 Blackfin/ipipe: upgrade to I-pipe mainline This patch introduces Blackfin-specific bits to support the current tip of the interrupt pipeline development, mainly: - 2/3-level interrupt maps (sparse IRQs) - generic virq handling - sysinfo v2 format for ipipe_get_sysinfo() Signed-off-by: Philippe Gerum Signed-off-by: Mike Frysinger commit 8944b5a258d73abd1f86bb360c27bb8c3bed5daa Author: Michael Hennerich Date: Mon Feb 28 21:23:36 2011 +0000 Blackfin: cpufreq: fix typos No functional changes here. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 1eb5efa0e442710f35ed41ba09510e777b5cc409 Author: Thomas Gleixner Date: Sun Feb 6 18:23:41 2011 +0000 Blackfin: enable GENERIC_HARDIRQS_NO_DEPRECATED All chips converted. Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit 91796c235dcefefde38732e1a969afc5c3d63ae6 Author: Mike Frysinger Date: Fri Mar 18 03:03:23 2011 -0400 Blackfin: SMP: convert to irq chip functions Signed-off-by: Mike Frysinger commit 9f51a874ced2106947e391d85abdf1f22c94f018 Author: Thomas Gleixner Date: Mon Feb 7 12:01:59 2011 +0100 Blackfin: use accessor functions in show_interrupts() Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit bc2f6bd8027a88da69102a8aed65dcbd1e895119 Author: Thomas Gleixner Date: Sun Feb 6 18:23:38 2011 +0000 Blackfin: use proper wrapper functions for modifying irq status Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit e9502850b9a861f4e6adc379e35bba019bfa987f Author: Thomas Gleixner Date: Sun Feb 6 18:23:36 2011 +0000 Blackfin: convert gpio irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit 172d2d1d8414f6d8d4ae97557e102463b064aff0 Author: Thomas Gleixner Date: Sun Feb 6 18:23:34 2011 +0000 Blackfin: convert mac irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit dabf64bcc58cc182f389a9ca602f2c5cb9ba8aef Author: Thomas Gleixner Date: Sun Feb 6 18:23:31 2011 +0000 Blackfin: convert error irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit ff43a67f67b47fc7e4e108ab1966072dc36b65c0 Author: Thomas Gleixner Date: Sun Feb 6 18:23:29 2011 +0000 Blackfin: convert internal irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit 4f19ea4978cd0803e7a70558f9f3a2f5d7c51640 Author: Thomas Gleixner Date: Sun Feb 6 18:23:27 2011 +0000 Blackfin: convert core irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit b10bbbbce77ed45a3f5cb7e2bd1d3d5dbee20666 Author: Thomas Gleixner Date: Sun Feb 6 18:23:25 2011 +0000 Blackfin: use proper wrappers for irq_desc Fixup the open coded access to irq_desc and use the proper wrappers. Signed-off-by: Thomas Gleixner Signed-off-by: Mike Frysinger commit 511cdcc50031eacd88cc70351da54beebff515e2 Author: Mike Frysinger Date: Thu Feb 3 02:16:44 2011 +0000 Blackfin: optimize startup code Take advantage of more Blackfin-specific insns, and only initialize registers required by the ABI. Signed-off-by: Mike Frysinger commit c6345ab1a3d17f4b6c80ac79d7fb0f006b32fdaa Author: Sonic Zhang Date: Thu Aug 5 07:49:26 2010 +0000 Blackfin: SMP: work around anomaly 05000491 In order to safely work around anomaly 05000491, we have to execute IFLUSH from L1 instruction sram. The trouble with multi-core systems is that all L1 sram is visible only to the active core. So we can't just place the functions into L1 and call it directly. We need to setup a jump table and place the entry point in external memory. This will call the right func based on the active core. In the process, convert from the manual relocation of a small bit of code into Core B's L1 to the more general framework we already have in place for loading arbitrary pieces of code into L1. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 6f546bc3ac9eedbf770bf3bcbc45ce2ea32c94ad Author: Graf Yang Date: Thu Jan 28 10:46:55 2010 +0000 Blackfin: SMP: implement cpu_freq support Re-use some of the existing cpu hotplugging code in the process. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 820b127dae869cbbd2133f066e8b8f32a90d46e5 Author: Mike Frysinger Date: Wed Feb 2 22:31:42 2011 -0500 Blackfin: split optimization settings more We need to place icache flush funcs into L1 inst sram to work around a hardware anomaly. But this currently breaks SMP support as the L1 inst sram is per-core and cannot be called directly. So in preparation for making that work, split the two options. Further, split out the SMP depend so that we can allow some for SMP. Signed-off-by: Mike Frysinger commit 567ebfc99d7546913408b560ad443a5315bf8a53 Author: Sonic Zhang Date: Fri Jun 25 05:55:16 2010 +0000 Blackfin: SMP: disable preempt with smp_processor_id to send messages The smp_processor_id() API requires that preempt be disabled when calling it, so make sure it is when we go to send messages to other processors. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit ab61d2ac5c9d7c9232b8455c8d889216ca9d4814 Author: steven miao Date: Tue Sep 7 10:08:36 2010 +0000 Blackfin: SMP: delay enabling caches until CPU is initialized Defer bfin_setup_caches(cpu) to avoid unexpected faults due to the cpu state not yet being fully initialized. Signed-off-by: steven miao Signed-off-by: Mike Frysinger commit 5f362c91d09370cf8a3c5fbe349218377ad64e4a Author: Mike Frysinger Date: Wed Feb 2 01:55:01 2011 +0000 Blackfin: SMP: use standard cache functions Signed-off-by: Mike Frysinger commit ef9d8c251ac84e2c471768bb57298b177f8d6ab5 Author: steven miao Date: Mon Jan 31 10:10:54 2011 +0000 Blackfin: SMP: PERCPU section should be PAGE aligned Common code checks the alignment of some of the variables and calls BUG() if they aren't page aligned. Signed-off-by: steven miao Signed-off-by: Mike Frysinger commit d6b435be4b3277b341ad1a77392d2e58b3d7b36d Author: Mike Frysinger Date: Sun Jan 30 07:26:26 2011 +0000 Blackfin: ADI boards: enable pseudo debug insns support We use these insns when testing, so enable them by default for all of our development boards. Signed-off-by: Mike Frysinger commit cdb92f6794fb28c8f6c3bf85024bff8b438a7333 Author: Sonic Zhang Date: Fri Jan 28 10:58:59 2011 +0000 Blackfin: kgdb: drop dead KGDB_THR_PROC_SWAP for SMP systems Common code no longer defines this, so stop using it. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit adfe6a4882ec8324d7f5be8cca8d8e59b8a8dfa0 Author: Andreas Schallenberg Date: Tue Jan 18 19:43:27 2011 +0000 Blackfin: dnp5370: drop MMC card detect support The board doesn't actually have a pin hooked up to do card detection, so punt the code for it. Signed-off-by: Andreas Schallenberg Signed-off-by: Mike Frysinger commit b5fc12df9039a9e6a2c5ae1fc0cee244b6aca8e2 Author: Mike Frysinger Date: Tue Jan 11 16:33:15 2011 +0000 Blackfin: add bfin_write_{or,and} helpers Signed-off-by: Mike Frysinger commit 4c131c8c23eeb90d0fe93bd490ffd63ff0f97d10 Author: Aaron Wu Date: Wed Dec 22 06:21:03 2010 +0000 Blackfin: bf548-ezkit: add CAN1 support Signed-off-by: Aaron Wu Signed-off-by: Mike Frysinger commit 55835175a03392d2e4d9bff9d482312d118f304e Author: steven miao Date: Fri Oct 22 08:48:41 2010 +0000 Blackfin: bf54x: add kconfig for UART2/3 DMA channel assignments The BF54x lacks dedicated DMA channels for the UART peripherals and need to be muxed between others. So add a kconfig option so people can select which channels the UARTs will use so they can pick between SPORTs and the less commonly used EPPI/PIXC peripherals. Signed-off-by: steven miao Signed-off-by: Mike Frysinger commit 6ce0466d631d40662e2ab9ec5a05019482bd1074 Author: Sonic Zhang Date: Tue Apr 6 09:11:59 2010 +0000 Blackfin: SMP: avoid section mismatch warnings Since coreb_trampoline_start() calls coreb_start(), they need to be in the same section. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit d351cf4603edb2a5bfa9a48d06c425511c63f2a3 Merge: 433e832 4a122c1 Author: Takashi Iwai Date: Fri Mar 18 07:39:08 2011 +0100 Merge branch 'topic/misc' into for-linus commit 4a122c10fbfe9020df469f0f669da129c5757671 Author: Dan Rosenberg Date: Thu Mar 17 18:32:24 2011 -0400 ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl The user-supplied index into the adapters array needs to be checked, or an out-of-bounds kernel pointer could be accessed and used, leading to potentially exploitable memory corruption. Signed-off-by: Dan Rosenberg Cc: Signed-off-by: Takashi Iwai commit 98d21df431ad55281e1abf780f8d51e3391900b2 Author: Takashi Iwai Date: Fri Mar 18 07:31:53 2011 +0100 ALSA: aloop - Fix possible IRQ lock inversion loopback_pos_update() can be called in the timer callback, thus the lock held should be irq-safe. Otherwise you'll get AB/BA deadlock together with substream->self_group.lock. Reported-and-tested-by: Knut Petersen Cc: Signed-off-by: Takashi Iwai commit 84bead6c38b0374e6e7db06b3097f0e700b8f148 Author: Thomas Gleixner Date: Thu Mar 17 19:32:58 2011 +0000 gpio/langwell: Clear edge bit before handling I don't have the specs for this beast, but it looks a lot like the PXA GPIO block. Though I bet it's the same IP and the driver should have reused the PXA code. Acknowleding the edge detect status after handling one or more gpio interrupts looks wrong. We might lose an edge which came in while we handled the previous one. Signed-off-by: Thomas Gleixner Acked-by: Alek Du Signed-off-by: Grant Likely commit b295d6e593e02168fdafc5db11464b6d51cf239d Author: Murthy, Raghuveer Date: Mon Mar 14 07:52:25 2011 -0500 OMAP4: PandaBoard: Adding DVI support Adding DVI support to OMAP4 PandaBoard. PandaBoard uses TFP410 DVI Framer chip http://focus.ti.com/lit/ds/symlink/tfp410.pdf The TFP410 gets its power enable and display data over GPIO lines muxed in from OMAP4430. PandaBoard supports other LCD displays through expansion connectors, following board rework. This will disable the DVI interface. However, the existing mux settings remain the same PandaBoard additionally supports display over HDMI interface. It is mutually exclusive to display over DVI. Hence the mux settings need to be configured seperately, as and when HDMI is enabled Also, I2C3 bus used for reading EDID data from DVI Monitors is registered here. Since the design is similar to BeagleBoard, the code for the same is taken from the kernel.org commit e3333f48dd5cb21 (omap: Adding beagle i2c eeprom driver to read EDID) Reviewed-by: Manjunath G Kondaiah Reviewed-by: Anand Gadiyar Reviewed-by: Nishanth Menon Reviewed-by: Sumit Semwal Signed-off-by: Raghuveer Murthy [tomi.valkeinen@ti.com: fixed conflicts with HDMI] Signed-off-by: Tomi Valkeinen commit 2de110868f455b74e91111801ce63a3c9d06f091 Author: Murthy, Raghuveer Date: Mon Mar 14 07:28:58 2011 -0500 OMAP: DSS2: Implement OMAP4 DSS fclk support Add dss.dpll4_m4_ck (DSS FCLK) initialization for OMAP4. This is used to compute the pixel clock for DPI interface and also to reconfigure the DSS FCLK to the desired rate, corresponding to the rate computed for pixel clock. Adding these cpu_is_44xx() checks are meant to be temporary, until a cleaner implementation to manage these checks are added. Currently this is needed to get DVI display running on OMAP4 PandaBoard Signed-off-by: Raghuveer Murthy [tomi.valkeinen@ti.com: minor changes due to conflicts] Signed-off-by: Tomi Valkeinen commit 0acf659f1469725fb6e39d53af970f36c5f69a41 Author: Tomi Valkeinen Date: Mon Mar 14 07:28:57 2011 -0500 OMAP: DSS2: Clean up for dpll4_m4_ck handling OMAP2 does not have dpll4_m4_ck source clock for dss functional clock, but later OMAPs do. Currently we check for cpu type in multiple places to find out if dpll4_m4_ck is available. This patch cleans up dss.c by using the fact that dss.dpll4_m4_ck pointer is NULL on OMAP2. This allows us to remove many of the cpu checks. Signed-off-by: Tomi Valkeinen commit 08351fc6a75731226e1112fc7254542bd3a2912e Merge: 0df0914 0dccb04 Author: Linus Torvalds Date: Thu Mar 17 19:34:12 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (27 commits) arch/tile: support newer binutils assembler shift semantics arch/tile: fix deadlock bugs in rwlock implementation drivers/edac: provide support for tile architecture tile on-chip network driver: sync up with latest fixes arch/tile: support 4KB page size as well as 64KB arch/tile: add some more VMSPLIT options and use consistent naming arch/tile: fix some comments and whitespace arch/tile: export some additional module symbols arch/tile: enhance existing finv_buffer_remote() routine arch/tile: fix two bugs in the backtracer code arch/tile: use extended assembly to inline __mb_incoherent() arch/tile: use a cleaner technique to enable interrupt for cpu_idle() arch/tile: sync up with and changes arch/tile: fix reversed test of strict_strtol() return value arch/tile: avoid a simulator warning during bootup arch/tile: export to userspace arch/tile: warn and retry if an IPI is not accepted by the target cpu arch/tile: stop disabling INTCTRL_1 interrupts during hypervisor downcalls arch/tile: fix __ndelay etc to work better arch/tile: bug fix: exec'ed task thought it was still single-stepping ... Fix up trivial conflict in arch/tile/kernel/vmlinux.lds.S (percpu alignment vs section naming convention fix) commit 0df0914d414a504b975f3cc66ace0c16ef55b7f3 Merge: 6899608 05f6894 Author: Linus Torvalds Date: Thu Mar 17 19:28:15 2011 -0700 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits) omap: zoom: host should not pull up wl1271's irq line arm: plat-omap: iommu: fix request_mem_region() error path OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430 omap4: mux: Remove duplicate mux modes omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected omap4: board-omap4panda: Initialise the serial pads omap3: board-3430sdp: Initialise the serial pads omap4: board-4430sdp: Initialise the serial pads omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init omap2+: mux: Remove the use of IDLE flag omap2+: Add separate list for dynamic pads to mux perf: add OMAP support for the new power events OMAP4: Add IVA OPP enteries. OMAP4: Update Voltage Rail Values for MPU, IVA and CORE OMAP4: Enable 800 MHz and 1 GHz MPU-OPP OMAP3+: OPP: Replace voltage values with Macros OMAP3: wdtimer: Fix CORE idle transition Watchdog: omap_wdt: add fine grain runtime-pm ... Fix up various conflicts in - arch/arm/mach-omap2/board-omap3evm.c - arch/arm/mach-omap2/clock3xxx_data.c - arch/arm/mach-omap2/usb-musb.c - arch/arm/plat-omap/include/plat/usb.h - drivers/usb/musb/musb_core.h commit 6899608533410557e6698cb9d4ff6df553916e98 Merge: 411f5c7 92c260f Author: Linus Torvalds Date: Thu Mar 17 19:13:18 2011 -0700 Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits) msm: scm: Check for interruption immediately msm: scm: Fix improper register assignment msm: scm: Mark inline asm as volatile msm: iommu: Enable HTW L2 redirection on MSM8960 msm: iommu: Don't read from write-only registers msm: iommu: Remove dependency on IDR msm: iommu: Use ASID tagging instead of VMID tagging msm: iommu: Rework clock logic and add IOMMU bus clock control msm: iommu: Clock control for the IOMMU driver msm: mdp: Set the correct pack pattern for XRGB/ARGB msm_fb: Fix framebuffer console msm: mdp: Add support for RGBX 8888 image format. video: msmfb: Put the partial update magic value into the fix_screen struct. msm: clock: Migrate to clkdev msm: clock: Remove references to clk_ops_pcom msm: headsmp.S: Fix section mismatch msm: Use explicit GPLv2 licenses msm: iommu: Enable IOMMU support for MSM8960 msm: iommu: Generalize platform data for multiple targets msm: iommu: Create a Kconfig item for the IOMMU driver ... commit 9d412a43c3b26e1e549319e5eec26f0829f9f74d Author: Al Viro Date: Thu Mar 17 22:08:28 2011 -0400 vfs: split off vfsmount-related parts of vfs_kern_mount() new function: mount_fs(). Does all work done by vfs_kern_mount() except the allocation and filling of vfsmount; returns root dentry or ERR_PTR(). vfs_kern_mount() switched to using it and taken to fs/namespace.c, along with its wrappers. alloc_vfsmnt()/free_vfsmnt() made static. functions in namespace.c slightly reordered. Signed-off-by: Al Viro commit fbe0aa1f3d16fac5b641c0c1697371dcbe45b569 Author: Tony Luck Date: Thu Mar 17 16:29:15 2011 -0700 Some fixes for pstore 1) Change from ->get_sb() to ->mount() 2) Use mount_single() instead of mount_nodev() 3) Pulled in ramfs_get_inode() & trimmed to what I need for pstore 4) Drop the ugly pstore_writefile() Just save data using kmalloc() and provide a pstore_file_read() that uses simple_read_from_buffer(). Signed-off-by: Al Viro commit 411f5c7a502769ccc0377c5ba36cb0b283847ba8 Merge: 6d7ed21 9ced9f0 Author: Linus Torvalds Date: Thu Mar 17 19:08:06 2011 -0700 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits) davinci: DM644x EVM: register MUSB device earlier davinci: add spi devices on tnetv107x evm davinci: add ssp config for tnetv107x evm board davinci: add tnetv107x ssp platform device spi: add ti-ssp spi master driver mfd: add driver for sequencer serial port ARM: EXYNOS4: Implement Clock gating for System MMU ARM: EXYNOS4: Enhancement of System MMU driver ARM: EXYNOS4: Add support for gpio interrupts ARM: S5P: Add function to register gpio interrupt bank data ARM: S5P: Cleanup S5P gpio interrupt code ARM: EXYNOS4: Add missing GPYx banks ARM: S3C64XX: Fix section mismatch from cpufreq init ARM: EXYNOS4: Add keypad device to the SMDKV310 ARM: EXYNOS4: Update clocks for keypad ARM: EXYNOS4: Update keypad base address ARM: EXYNOS4: Add keypad device helpers ARM: EXYNOS4: Add support for SATA on ARMLEX4210 plat-nomadik: make GPIO interrupts work with cpuidle ApSleep mach-u300: define a dummy filter function for coh901318 ... Fix up various conflicts in - arch/arm/mach-exynos4/cpufreq.c - arch/arm/mach-mxs/gpio.c - drivers/net/Kconfig - drivers/tty/serial/Kconfig - drivers/tty/serial/Makefile - drivers/usb/gadget/fsl_mxc_udc.c - drivers/video/Kconfig commit 6d7ed21d17e640b120b902a314143e5ef4917a70 Merge: ec0afc9 bafc820 9c9585e bfddc1c Author: Linus Torvalds Date: Thu Mar 17 18:48:35 2011 -0700 Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm * 'defcfg' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6647/1: add Versatile Express defconfig ARM: 6644/1: mach-ux500: update the U8500 defconfig * 'drivers' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6764/1: pl011: factor out FIFO to TTY code ARM: 6763/1: pl011: add optional RX DMA to PL011 v2 ARM: 6758/1: amba: support pm ops ARM: amba: make amba_driver id_table const ARM: amba: make internal ID table handling const ARM: amba: make probe() functions take const id tables ARM: 6662/1: amba: make amba_bustype non-static ARM: mmci: add dmaengine-based DMA support ARM: mmci: no need for separate host->data_xfered ARM: mmci: avoid unnecessary switch to data available PIO interrupts ARM: mmci: no need to call flush_dcache_page() with sg_miter API ARM: mmci: avoid reporting too many completed bytes on fifo overrun ALSA: AACI: make fifo variables more explanitory ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period ALSA: AACI: use snd_pcm_lib_period_bytes() ALSA: AACI: clean up AACI announcement printk ALSA: AACI: fix channel mask selection ALSA: AACI: fix number of channels for record ALSA: AACI: fix multiple IRQ claiming * 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm: VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var() VIDEO: cyberpro: remove useless function extreg pointers VIDEO: cyberpro: update handling of device structures VIDEO: cyberpro: add support for video capture I2C VIDEO: cyberpro: make 'reg_b0_lock' always present VIDEO: cyberpro: add I2C support VIDEO: cyberpro: select lowest multipler/divisor for PLL commit ec0afc9311adcfb10b90e547c23250f63939f990 Merge: 804f185 776e58e Author: Linus Torvalds Date: Thu Mar 17 18:40:35 2011 -0700 Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (55 commits) KVM: unbreak userspace that does not sets tss address KVM: MMU: cleanup pte write path KVM: MMU: introduce a common function to get no-dirty-logged slot KVM: fix rcu usage in init_rmode_* functions KVM: fix kvmclock regression due to missing clock update KVM: emulator: Fix permission checking in io permission bitmap KVM: emulator: Fix io permission checking for 64bit guest KVM: SVM: Load %gs earlier if CONFIG_X86_32_LAZY_GS=n KVM: x86: Remove useless regs_page pointer from kvm_lapic KVM: improve comment on rcu use in irqfd_deassign KVM: MMU: remove unused macros KVM: MMU: cleanup page alloc and free KVM: MMU: do not record gfn in kvm_mmu_pte_write KVM: MMU: move mmu pages calculated out of mmu lock KVM: MMU: set spte accessed bit properly KVM: MMU: fix kvm_mmu_slot_remove_write_access dropping intermediate W bits KVM: Start lock documentation KVM: better readability of efer_reserved_bits KVM: Clear async page fault hash after switching to real mode KVM: VMX: Initialize vm86 TSS only once. ... commit 804f18536984939622ddca60ab6b25743e0ec68d Merge: 5a39837 b3e96c0 Author: Linus Torvalds Date: Thu Mar 17 18:37:42 2011 -0700 Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: use freeze/restore/thaw PM events for suspend/resume/chkpt xen: xenbus PM events support commit 474a00ee1306eb7e82329fdc28b6471a99facba1 Author: Al Viro Date: Thu Mar 17 21:31:32 2011 -0400 kill simple_set_mnt() not needed anymore, since all users (->get_sb() instances) are gone. Signed-off-by: Al Viro commit 5a39837f76b7ded29afdf6ed2c2d5e56107179b7 Merge: 514af9f 3b7bcdf 44626e4 Author: Linus Torvalds Date: Thu Mar 17 18:27:49 2011 -0700 Merge branches 'stable/irq.fairness' and 'stable/irq.ween_of_nr_irqs' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/irq.fairness' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: events: Remove redundant clear of l2i at end of round-robin loop xen: events: Make round-robin scan fairer by snapshotting each l2 word once only xen: events: Clean up round-robin evtchn scan. xen: events: Make last processed event channel a per-cpu variable. xen: events: Process event channels notifications in round-robin order. * 'stable/irq.ween_of_nr_irqs' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: events: Fix compile error if CONFIG_SMP is not defined. xen: events: correct locking in xen_irq_from_pirq xen: events: propagate irq allocation failure instead of panicking xen: events: do not workaround too-small nr_irqs xen: events: remove use of nr_irqs as upper bound on number of pirqs xen: events: dynamically allocate irq info structures xen: events: maintain a list of Xen interrupts xen: events: push setup of irq<->{evtchn,ipi,virq,pirq} maps into irq_info init functions xen: events: turn irq_info constructors into initialiser functions xen: events: use per-cpu variable for cpu_evtchn_mask xen: events: refactor GSI pirq bindings functions xen: events: rename restore_cpu_pirqs -> restore_pirqs xen: events: remove unused public functions xen: events: fix xen_map_pirq_gsi error return xen: events: simplify comment xen: events: separate two unrelated halves of if condition Fix up trivial conflicts in drivers/xen/events.c commit 514af9f7904ab65a6763b4b0bf51f1c7081026cb Merge: c55d267 bbd5a76 ca47cea Author: Linus Torvalds Date: Thu Mar 17 18:16:36 2011 -0700 Merge branches 'stable/hvc-console', 'stable/gntalloc.v6' and 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/hvc-console' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line. * 'stable/gntalloc.v6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: gntdev: fix build warning xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override xen-gntdev: Add cast to pointer xen-gntdev: Fix incorrect use of zero handle xen: change xen/[gntdev/gntalloc] to default m xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings xen-gntdev: Avoid double-mapping memory xen-gntdev: Avoid unmapping ranges twice xen-gntdev: Use map->vma for checking map validity xen-gntdev: Fix unmap notify on PV domains xen-gntdev: Fix memory leak when mmap fails xen/gntalloc,gntdev: Add unmap notify ioctl xen-gntalloc: Userspace grant allocation driver xen-gntdev: Support mapping in HVM domains xen-gntdev: Add reference counting to maps xen-gntdev: Use find_vma rather than iterating our vma list manually xen-gntdev: Change page limit to be global instead of per-open * 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (24 commits) xen-gntdev: Use ballooned pages for grant mappings xen-balloon: Add interface to retrieve ballooned pages xen-balloon: Move core balloon functionality out of module xen/balloon: Remove pr_info's and don't alter retry_count xen/balloon: Protect against CPU exhaust by event/x process xen/balloon: Migration from mod_timer() to schedule_delayed_work() xen/balloon: Removal of driver_pages commit c55d267de274d308927b60c3e740c1a826832317 Merge: 61ef46f bc898c9 Author: Linus Torvalds Date: Thu Mar 17 17:54:40 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits) [SCSI] scsi_dh_rdac: Add MD36xxf into device list [SCSI] scsi_debug: add consecutive medium errors [SCSI] libsas: fix ata list corruption issue [SCSI] hpsa: export resettable host attribute [SCSI] hpsa: move device attributes to avoid forward declarations [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26) [SCSI] sd: Logical Block Provisioning update [SCSI] Include protection operation in SCSI command trace [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try) [SCSI] target: Fix volume size misreporting for volumes > 2TB [SCSI] bnx2fc: Broadcom FCoE offload driver [SCSI] fcoe: fix broken fcoe interface reset [SCSI] fcoe: precedence bug in fcoe_filter_frames() [SCSI] libfcoe: Remove stale fcoe-netdev entries [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out" [SCSI] libfc: Fixing a memory leak when destroying an interface [SCSI] megaraid_sas: Version and Changelog update ... Fix up trivial conflicts due to whitespace differences in drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c} commit 61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb Merge: 77aa56b bdce259 Author: Linus Torvalds Date: Thu Mar 17 17:42:14 2011 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] pcc-cpufreq: remove duplicate statements [CPUFREQ] Remove the pm_message_t argument from driver suspend [CPUFREQ] Remove unneeded locks [CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files [CPUFREQ] Remove deprecated sysfs file sampling_rate_max [CPUFREQ] powernow-k8: The table index is not worth displaying [CPUFREQ] calculate delay after dbs_check_cpu [CPUFREQ] Add documentation for sampling_down_factor [CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons commit 77aa56ba09b7416764aec2e3f7b41e023cf30602 Merge: 1791983 0c755de Author: Linus Torvalds Date: Thu Mar 17 17:41:19 2011 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: ext3: Always set dx_node's fake_dirent explicitly. ext3: Fix an overflow in ext3_trim_fs. jbd: Remove one to many n's in a word. ext3: skip orphan cleanup on rocompat fs ext2: Fix link count corruption under heavy link+rename load ext3: speed up group trim with the right free block count. ext3: Adjust trim start with first_data_block. quota: return -ENOMEM when memory allocation fails commit 179198373cf374f0ef793f1023c1cdd83b53674d Merge: 374e552 8e26de2 Author: Linus Torvalds Date: Thu Mar 17 17:40:00 2011 -0700 Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (54 commits) RPC: killing RPC tasks races fixed xprt: remove redundant check SUNRPC: Convert struct rpc_xprt to use atomic_t counters SUNRPC: Ensure we always run the tk_callback before tk_action sunrpc: fix printk format warning xprt: remove redundant null check nfs: BKL is no longer needed, so remove the include NFS: Fix a warning in fs/nfs/idmap.c Cleanup: Factor out some cut-and-paste code. cleanup: save 60 lines/100 bytes by combining two mostly duplicate functions. NFS: account direct-io into task io accounting gss:krb5 only include enctype numbers in gm_upcall_enctypes RPCRDMA: Fix FRMR registration/invalidate handling. RPCRDMA: Fix to XDR page base interpretation in marshalling logic. NFSv4: Send unmapped uid/gids to the server when using auth_sys NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattr NFSv4: cleanup idmapper functions to take an nfs_server argument NFSv4: Send unmapped uid/gids to the server if the idmapper fails NFSv4: If the server sends us a numeric uid/gid then accept it NFSv4.1: reject zero layout with zeroed stripe unit ... commit 374e55251cacfb68d331bb8a574b2de8160aacc2 Merge: 978ca16 6f644e5 Author: Linus Torvalds Date: Thu Mar 17 17:29:38 2011 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: UDF: Fix compiler warning udf: Convert UDF to new truncate calling sequence commit 978ca164bd9f30bd51f71dad86d8c3797f7add76 Merge: 02e4c62 d34a6ec Author: Linus Torvalds Date: Thu Mar 17 17:21:32 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (38 commits) amd64_edac: Fix decode_syndrome types amd64_edac: Fix DCT argument type amd64_edac: Fix ranges signedness amd64_edac: Drop local variable amd64_edac: Fix PCI config addressing types amd64_edac: Fix DRAM base macros amd64_edac: Fix node id signedness amd64_edac: Drop redundant declarations amd64_edac: Enable driver on F15h amd64_edac: Adjust ECC symbol size to F15h amd64_edac: Simplify scrubrate setting PCI: Rename CPU PCI id define amd64_edac: Improve DRAM address mapping amd64_edac: Sanitize ->read_dram_ctl_register amd64_edac: Adjust sys_addr to chip select conversion routine to F15h amd64_edac: Beef up early exit reporting amd64_edac: Revamp online spare handling amd64_edac: Fix channel interleave removal amd64_edac: Correct node interleaving removal amd64_edac: Add support for interleaved region swapping ... Fix up trivial conflict in include/linux/pci_ids.h due to AMD_15H_NB_MISC being renamed as AMD_15H_NB_F3 next to the new AMD_15H_NB_LINK entry. commit 02e4c627d862427653fc088ce299746ea7d85600 Merge: 4b0e976 ead9a63 Author: Linus Torvalds Date: Thu Mar 17 17:10:19 2011 -0700 Merge branch 'for-linus/2639/i2c-1' of git://git.fluff.org/bjdooks/linux * 'for-linus/2639/i2c-1' of git://git.fluff.org/bjdooks/linux: i2c-mpc: Add support for 64bit system i2c: add driver for Freescale i.MX28 i2c: tegra: Add i2c support commit 4b0e976c663e808822adf51274f948e8a4986f06 Merge: 19520fc 112e754 Author: Linus Torvalds Date: Thu Mar 17 17:09:29 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: booke_wdt: clean up status messages watchdog: cleanup spaces before tabs watchdog: convert to DEFINE_PCI_DEVICE_TABLE watchdog: Xen watchdog driver watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms. watchdog: jz4740_wdt - fix magic character checking watchdog: add JZ4740 watchdog driver watchdog: it87_wdt: Add support for IT8721F watchdog watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled watchdog: hpwdt: Fix a couple of typos commit 1bdd6384c2b43cac9be8d6f2c298bcf39f50cd07 Author: Sean Hefty Date: Thu Mar 17 23:35:39 2011 +0000 RDMA/addr: Fix return of uninitialized ret value Commit b23dd4fe42b4 ("ipv4: Make output route lookup return rtable directly") resulted in leaving ret uninitialized, where it may later be returned. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 19520fc1ee36164808e6f084bd95e8178e2db231 Merge: c8def55 d668a8b Author: Linus Torvalds Date: Thu Mar 17 16:59:38 2011 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits) hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes hwmon/f71882fg: Add support for f71808e hwmon/f71882fg: Add support for f71869f and f71869e hwmon/f71882fg: Add support for f71889ed hwmon/f71882fg: Break out test for auto pwm's controlled by digital readings hwmon/f71882fg: Separate temp beep sysfs attr from the other temp sysfs attr hwmon/f71882fg: Remove bogus temp2_type for certain models hwmon/f71882fg: Make number of temps configurable hwmon/f71882fg: Make creation of in sysfs attributes more generic hwmon/f71882fg: Only allow negative auto point temps if fan_neg_temp is enabled hwmon/f71882fg: Fix temp1 sensor type reporting hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F hwmon: (w83627ehf) Add fan debounce support for NCT6775F and NCT6776F hwmon: (w83627ehf) Update Kconfig for W83677HG-B, NCT6775F and NCT6776F hwmon: (w83627ehf) Store rpm instead of raw fan speed data hwmon: (w83627ehf) Use 16 bit fan count registers if supported hwmon: (w83627ehf) Add support for Nuvoton NCT6775F and NCT6776F hwmon: (w83627ehf) Permit enabling SmartFan IV mode if configured at startup hwmon: (w83627ehf) Convert register arrays to 16 bit, and convert access to pointers hwmon: (w83627ehf) Remove references to datasheets which no longer exist ... commit c8def554d031664e984323f6a5d667f070717776 Author: Milton Miller Date: Tue Mar 15 13:27:17 2011 -0600 smp_call_function_interrupt: use typedef and %pf Use the newly added smp_call_func_t in smp_call_function_interrupt for the func variable, and make the comment above the WARN more assertive and explicit. Also, func is a function pointer and does not need an offset, so use %pf not %pS. Signed-off-by: Milton Miller Signed-off-by: Linus Torvalds commit 723aae25d5cdb09962901d36d526b44d4be1051c Author: Milton Miller Date: Tue Mar 15 13:27:17 2011 -0600 smp_call_function_many: handle concurrent clearing of mask Mike Galbraith reported finding a lockup ("perma-spin bug") where the cpumask passed to smp_call_function_many was cleared by other cpu(s) while a cpu was preparing its call_data block, resulting in no cpu to clear the last ref and unlock the block. Having cpus clear their bit asynchronously could be useful on a mask of cpus that might have a translation context, or cpus that need a push to complete an rcu window. Instead of adding a BUG_ON and requiring yet another cpumask copy, just detect the race and handle it. Note: arch_send_call_function_ipi_mask must still handle an empty cpumask because the data block is globally visible before the that arch callback is made. And (obviously) there are no guarantees to which cpus are notified if the mask is changed during the call; only cpus that were online and had their mask bit set during the whole call are guaranteed to be called. Reported-by: Mike Galbraith Reported-by: Jan Beulich Acked-by: Jan Beulich Cc: stable@kernel.org Signed-off-by: Milton Miller Signed-off-by: Linus Torvalds commit 45a5791920ae643eafc02e2eedef1a58e341b736 Author: Milton Miller Date: Tue Mar 15 13:27:16 2011 -0600 call_function_many: add missing ordering Paul McKenney's review pointed out two problems with the barriers in the 2.6.38 update to the smp call function many code. First, a barrier that would force the func and info members of data to be visible before their consumption in the interrupt handler was missing. This can be solved by adding a smp_wmb between setting the func and info members and setting setting the cpumask; this will pair with the existing and required smp_rmb ordering the cpumask read before the read of refs. This placement avoids the need a second smp_rmb in the interrupt handler which would be executed on each of the N cpus executing the call request. (I was thinking this barrier was present but was not). Second, the previous write to refs (establishing the zero that we the interrupt handler was testing from all cpus) was performed by a third party cpu. This would invoke transitivity which, as a recient or concurrent addition to memory-barriers.txt now explicitly states, would require a full smp_mb(). However, we know the cpumask will only be set by one cpu (the data owner) and any preivous iteration of the mask would have cleared by the reading cpu. By redundantly writing refs to 0 on the owning cpu before the smp_wmb, the write to refs will follow the same path as the writes that set the cpumask, which in turn allows us to keep the barrier in the interrupt handler a smp_rmb instead of promoting it to a smp_mb (which will be be executed by N cpus for each of the possible M elements on the list). I moved and expanded the comment about our (ab)use of the rcu list primitives for the concurrent walk earlier into this function. I considered moving the first two paragraphs to the queue list head and lock, but felt it would have been too disconected from the code. Cc: Paul McKinney Cc: stable@kernel.org (2.6.32 and later) Signed-off-by: Milton Miller Signed-off-by: Linus Torvalds commit e6cd1e07a185d5f9b0aa75e020df02d3c1c44940 Author: Milton Miller Date: Tue Mar 15 13:27:16 2011 -0600 call_function_many: fix list delete vs add race Peter pointed out there was nothing preventing the list_del_rcu in smp_call_function_interrupt from running before the list_add_rcu in smp_call_function_many. Fix this by not setting refs until we have gotten the lock for the list. Take advantage of the wmb in list_add_rcu to save an explicit additional one. I tried to force this race with a udelay before the lock & list_add and by mixing all 64 online cpus with just 3 random cpus in the mask, but was unsuccessful. Still, inspection shows a valid race, and the fix is a extension of the existing protection window in the current code. Cc: stable@kernel.org (v2.6.32 and later) Reported-by: Peter Zijlstra Signed-off-by: Milton Miller Signed-off-by: Linus Torvalds commit ef2b4b95a63a1d23958dcb99eb2c6898eddc87d0 Author: Andrea Arcangeli Date: Fri Mar 18 00:16:35 2011 +0100 mm: PageBuddy and mapcount robustness Change the _mapcount value indicating PageBuddy from -2 to -128 for more robusteness against page_mapcount() undeflows. Use reset_page_mapcount instead of __ClearPageBuddy in bad_page to ignore the previous retval of PageBuddy(). Signed-off-by: Andrea Arcangeli Reported-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 732063b92bb727b27e61580ce278dddefe31c6ad Author: Thomas Gleixner Date: Thu Mar 17 19:32:55 2011 +0000 gpio/langwell: Simplify demux loop Use __ffs() to find the pending interrupt source instead of looping 32 times. Signed-off-by: Thomas Gleixner Cc: Feng Tang Cc: Alek Du Cc: Alan Cox Signed-off-by: Grant Likely commit 674db90690a5988bdaa3bb2a54619c0de50d31e9 Author: Thomas Gleixner Date: Thu Mar 17 19:32:52 2011 +0000 gpio/langwell: Convert irq name space Convert to the new irq function names. Signed-off-by: Thomas Gleixner Cc: Feng Tang Cc: Alek Du Cc: Alan Cox Signed-off-by: Grant Likely commit 20e2aa916f6b56e6b1d9e34f4c6e8183d27cb81f Author: Thomas Gleixner Date: Thu Mar 17 19:32:49 2011 +0000 gpio/langwell: Fix broken irq_eoi change. commit 0766d20fd (langwell_gpio: modify EOI handling following change of kernel irq subsystem) changes - desc->chip->eoi(irq); + + if (desc->chip->irq_eoi) + desc->chip->irq_eoi(irq_get_irq_data(irq)); + else + dev_warn(pg->chip.dev, "missing EOI handler for irq %d\n", irq); With the following explanation: "Latest kernel has many changes in IRQ subsystem and its interfaces, like adding irq_eoi" for struct irq_chip, this patch will make it support both the new and old interface." This is completely bogus. #1) The changelog does not match the patch at all #2) This driver relies on the assumption that it sits behind an eoi capable interrupt line. If the implementation of the underlying chip changes from eoi to irq_eoi then this driver has to follow that change and not add a total bogosity. #3) Just mechanically changing eoi to irq_eoi without checking the background of that change is sloppy at best. Remove the sillyness and retrieve the interrupt data from irq_desc directly. No need to go through a sparse irq lookup. Reported-by: Stephen Rothwell Signed-off-by: Thomas Gleixner Cc: Feng Tang Cc: Alek Du Cc: Alan Cox Cc: Andrew Morton Signed-off-by: Grant Likely commit 61ab3fe57e45f365caf73d567926040bdb475217 Author: Thomas Gleixner Date: Thu Mar 17 19:32:46 2011 +0000 gpio; Make Intel chipset gpio drivers depend on x86 Nothing outside of x86 can use that code. Reported-by: Stephen Rothwell Signed-off-by: Thomas Gleixner Signed-off-by: Grant Likely commit 2dd22997679a88874c131f6e6ffb963e6d43b3a6 Merge: 36885ff 7b7adc4 Author: Grant Likely Date: Thu Mar 17 13:46:58 2011 -0600 Merge remote-tracking branch 'origin' into spi/next Pull in Linus' tree to pick up changes required for the langwell gpio fixes commit c07946a3350244d7c3d9bc1032325e04dd11575b Author: Jaehoon Chung Date: Fri Feb 25 11:08:14 2011 +0900 mmc: dw_mmc: support mmc power control with regulator This patch adds support for power regulators. Signed-off-by: Jaehoon Chung Signed-off-by: kyungmin Park Acked-by: Will Newton Signed-off-by: Chris Ball commit e61cf1184d72e574460492fd6c6b6d8a3ace2089 Author: Jaehoon Chung Date: Thu Mar 17 20:32:33 2011 +0900 mmc: dw_mmc: fix suspend/resume operation This patch is related to re-init processing on suspend/resume. When card is resuming, some register is reset. If card is removable, maybe controller should be rescan for card. But if assume card is non-removable, need to restore the old value at registers. We store the value of FIFOTH at probe time and then restore it in dw_mci_resume(). Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park Acked-by: Will Newton Signed-off-by: Chris Ball commit fc3d7720541d4b70cbae25ac121d7e6343125090 Author: Jaehoon Chung Date: Fri Feb 25 11:08:15 2011 +0900 mmc: dw_mmc: add quirks for unreliable card detect, and capabilities This patch adds quirks and capabilities to platdata. Some cards don't use the CDn pin; in that case, we assume the card's inserted. Some boards need other capabilities. So, we add capabilities in the board's platdata. Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park Acked-by: Will Newton Signed-off-by: Chris Ball commit 860cfe796c793bfad1e666de9600852f2d653c57 Author: Guennadi Liakhovetski Date: Fri Mar 11 08:30:14 2011 +0100 mmc: tmio: fix address in kunmap_atomic() calls Currently kunmap_atomic() doesn't take into account the offset, used with kmap_atomic(). On platforms, where kunmap_atomic() is not a NOP, this will lead to problems, when offset != 0. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Chris Ball commit b33d46c398fd071dccd0815f33620924684860cd Author: Ulf Hansson Date: Sat Mar 5 14:36:24 2011 +0100 mmc: core: reset card voltage after power off At power off, reset OCR mask to be the highest possible voltage supported for the current mmc host. This solves the re-initialization during the power up sequence. The voltage may have been decreased due to the card accepts a lower voltage than the voltage used during the initialization sequence. We need to reset the voltage to by the host highest possible value since according to specification the initialization must always be done at high voltage. Reviewed-by: Jonas Aberg Signed-off-by: Ulf Hansson Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit ab1efd271704416c9e6e9cb4e5f58e7e4c4260e6 Author: Ulf Hansson Date: Wed Mar 9 09:11:02 2011 +0100 mmc: core: export function mmc_do_release_host() When using mmc_try_claim_host the corresponding release function is mmc_do_release_host, which then also must be exported. Reviewed-by: Jonas Aberg Reviewed-by: Sebastian Rasmussen Signed-off-by: Ulf Hansson Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit 0aab3995485b8a994bf29a995a008c9ea4a28054 Author: Stefan Nilsson XK Date: Tue Mar 1 14:41:04 2011 +0100 mmc: sdio: remember new card RCA when redetecting card During redetection of a SDIO card, a request for a new card RCA was submitted to the card, but was then overwritten by the old RCA. This caused the card to be deselected instead of selected when using the incorrect RCA. This bug's been present since the "oldcard" handling was introduced in 2.6.32. Signed-off-by: Stefan Nilsson XK Reviewed-by: Ulf Hansson Reviewed-by: Pawel Wieczorkiewicz Signed-off-by: Linus Walleij Cc: Signed-off-by: Chris Ball commit ba6a902d9d89b976bf64a435ec97a490cd160dec Author: Chris Ball Date: Mon Feb 28 16:45:10 2011 -0500 mmc: dw_mmc: Remove set-but-unused variable. count is only ever used by assigning to old_len if count == 0, and then old_len isn't ever used at all. So, both are redundant. Fixes: drivers/mmc/host/dw_mmc.c: In function ‘dw_mci_read_data_pio’: drivers/mmc/host/dw_mmc.c:1034:32: warning: variable ‘old_len’ set but not used [-Wunused-but-set-variable] Signed-off-by: Chris Ball Acked-by: Will Newton commit 7e29c3060369c2cd003b8069972b8535944310e4 Author: Wolfram Sang Date: Sat Feb 26 14:44:41 2011 +0100 mmc: sdhci-esdhc-imx: add card detect on custom GPIO for mx25/35 Signed-off-by: Wolfram Sang Tested-by: Marc Reilly Tested-by: Eric Benard Signed-off-by: Chris Ball commit 3bb2a9f6a7c0887a7f79b59c5b9bff349a03247e Author: Wolfram Sang Date: Sat Feb 26 14:44:40 2011 +0100 mmc: sdhci-esdhc: broken card detection is not a default quirk It can be worked around using a GPIO which will be done for i.MX later. Signed-off-by: Wolfram Sang Acked-by: Anton Vorontsov Tested-by: Marc Reilly Tested-by: Eric Benard Signed-off-by: Chris Ball commit 0c6d49ce53bc18c0ac637fb137f1e01ee9082201 Author: Wolfram Sang Date: Sat Feb 26 14:44:39 2011 +0100 mmc: sdhci-esdhc-imx: add write protect on custom GPIO on mx25/35 Signed-off-by: Wolfram Sang Tested-by: Marc Reilly Tested-by: Eric Benard Signed-off-by: Chris Ball commit dffc55adfa2676a02a838d56a0cc4edd3809510c Author: Linus Walleij Date: Wed Feb 16 23:28:53 2011 +0100 mmc: msm_sdcc: remove needless cache flush after dma_unmap_sg() dma_unmap_sg() already flushes the cache, I don't get what this code is doing here. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit 36885ff0e6563687e6152da6d311abbf83c0198f Author: Nikanth Karthikesan Date: Tue Mar 15 10:59:23 2011 +0530 gpio/cs5535-gpio: Fix section mismatch Fix section mismatch by annotating using variable name suffix. Signed-off-by: Nikanth Karthikesan Signed-off-by: Grant Likely commit 4be34b9d69c97211ff4eb00d79078f3c1593804d Author: Jesper Juhl Date: Sat Jan 22 22:40:20 2011 +0100 SUNRPC: Remove resource leak in svc_rdma_send_error() We leak the memory allocated to 'ctxt' when we return after 'ib_dma_mapping_error()' returns !=0. Signed-off-by: Jesper Juhl Signed-off-by: J. Bruce Fields commit 0dccb0489f9a5a13a33e828ab965aa49685d12f8 Author: Chris Metcalf Date: Thu Mar 17 14:32:06 2011 -0400 arch/tile: support newer binutils assembler shift semantics This change supports building the kernel with newer binutils where a shift of greater than the word size is no longer interpreted silently as modulo the word size, but instead generates a warning. Signed-off-by: Chris Metcalf commit 22a94d44bd6876a90630338229da6c0436d46593 Author: Josef Bacik Date: Wed Mar 16 16:47:17 2011 -0400 Btrfs: add checks to verify dir items are correct We need to make sure the dir items we get are valid dir items. So any time we try and read one check it with verify_dir_item, which will do various sanity checks to make sure it looks sane. Thanks, Signed-off-by: Josef Bacik commit 41415730a1050499fbd63b3f7dd59b3a4c3bb91a Author: Josef Bacik Date: Wed Mar 16 13:59:32 2011 -0400 Btrfs: check return value of btrfs_search_slot properly Doing an audit of where we use btrfs_search_slot only showed one place where we don't check the return value of btrfs_search_slot properly. Just fix mark_extent_written to see if btrfs_search_slot failed and act accordingly. Thanks, Signed-off-by: Josef Bacik commit a826d6dcb32d811b4c81df57a5ef1367516586b0 Author: Josef Bacik Date: Wed Mar 16 13:42:43 2011 -0400 Btrfs: check items for correctness as we search Currently if we have corrupted items things will blow up in spectacular ways. So as we read in blocks and they are leaves, check the entire leaf to make sure all of the items are correct and point to valid parts in the leaf for the item data the are responsible for. If the item is corrupt we will kick back EIO and not read any of the copies since they are likely to not be correct either. This will catch generic corruptions, it will be up to the individual callers of btrfs_search_slot to make sure their items are right. Thanks, Signed-off-by: Josef Bacik commit 850265335f792f5d39ab24e5fb7160bac28d77e5 Author: Josef Bacik Date: Tue Mar 15 14:52:12 2011 -0400 Btrfs: return error if the range we want to map is bogus Currently if we have corrupt metadata map_extent_buffer will complain about it, but not return an error so the caller has no idea a problem was hit. Fix this. Thanks, Signed-off-by: Josef Bacik commit 695a0d0da09e75c4475bbb303def159023ef72ca Author: Josef Bacik Date: Fri Mar 4 15:46:53 2011 -0500 Btrfs: add a comment explaining what btrfs_cont_expand does Everytime I have to deal with btrfs_cont_expand I stare at it for 20 minutes trying to remember what exactly it does and why the hell we need it. So add a comment to save future-Josef some time. Thanks, Signed-off-by: Josef Bacik commit 930f028abe39dfd0849b53131d19c4b67aacbe67 Author: Josef Bacik Date: Fri Mar 4 14:41:41 2011 -0500 Btrfs: use mark_inode_dirty when expanding the file Mark_inode_dirty will call btrfs_dirty_inode which will take care of updating the inode. This makes setsize a little cleaner since we don't have to start a transaction and update the inode in there, we can just call mark_inode_dirty. Thanks, Signed-off-by: Josef Bacik commit f0cd846e9221811d87047f1428cf5226e7236efe Author: Josef Bacik Date: Fri Mar 4 14:37:08 2011 -0500 Btrfs: only add orphan items when truncating We don't need an orphan item when expanding files, we just need them for truncating them, so only add the orphan item in btrfs_truncate instead of in btrfs_setsize. Thanks, Signed-off-by: Josef Bacik commit ded5db9de78f963979e1605f859de67626f54693 Author: Josef Bacik Date: Fri Mar 4 14:09:46 2011 -0500 Btrfs: make sure to remove the orphan item from the in-memory list This fixes a problem where if truncate fails the inode will still be on the in memory orphan list. This is will make us complain when the inode gets destroyed because it's still on the orphan list. So if we fail just remove us from the in memory list and carry on. Signed-off-by: Josef Bacik commit 66b4ffd110f9b48b8d8c1319ee446b53b8d073bf Author: Josef Bacik Date: Mon Jan 31 16:22:42 2011 -0500 Btrfs: handle errors in btrfs_orphan_cleanup If we cannot truncate an inode for some reason we will never delete the orphan item associated with that inode, which means that we will loop forever in btrfs_orphan_cleanup. Instead of doing this just return error so we fail to mount. It sucks, but hey it's better than hanging. Thanks, Signed-off-by: Josef Bacik commit 3893e33b0bebee2f67d96b6c15259dc884523c20 Author: Josef Bacik Date: Mon Jan 31 16:03:11 2011 -0500 Btrfs: cleanup error handling in the truncate path Now that we can handle having errors in the truncate path lets make sure we return errors instead of doing BUG_ON() and such. Thanks, Signed-off-by: Josef Bacik commit a41ad394a03b802497958d7c98a9dcf607266645 Author: Josef Bacik Date: Mon Jan 31 15:30:16 2011 -0500 Btrfs: convert to the new truncate sequence ->truncate() is going away, instead all of the work needs to be done in ->setattr(). So this converts us over to do this. It's fairly straightforward, just get rid of our .truncate inode operation and call btrfs_truncate() directly from btrfs_setsize. This works out better for us since truncate can technically return ENOSPC, and before we had no way of letting anybody know. Thanks, Signed-off-by: Josef Bacik commit dc89e9824464e91fa0b06267864ceabe3186fd8b Author: Josef Bacik Date: Fri Jan 28 17:05:48 2011 -0500 Btrfs: use a slab for the free space entries Since we alloc/free free space entries a whole lot, lets use a slab to keep track of them. This makes some of my tests slightly faster. Thanks, Signed-off-by: Josef Bacik commit 57a45ced94fe48a701361d64230fc16eefa189dd Author: Josef Bacik Date: Tue Jan 25 16:30:38 2011 -0500 Btrfs: change reserved_extents to an atomic_t We track delayed allocation per inodes via 2 counters, one is outstanding_extents and reserved_extents. Outstanding_extents is already an atomic_t, but reserved_extents is not and is protected by a spinlock. So convert this to an atomic_t and instead of using a spinlock, use atomic_cmpxchg when releasing delalloc bytes. This makes our inode 72 bytes smaller, and reduces locking overhead (albiet it was minimal to begin with). Thanks, Signed-off-by: Josef Bacik commit 4a64001f0047956e283f7ada9843dfc3f3b5d8c8 Author: Josef Bacik Date: Tue Jan 25 15:10:08 2011 -0500 Btrfs: fix how we deal with the pages array in the write path Really we don't need to memset the pages array at all, since we know how many pages we're going to use in the array and pass that around. So don't memset, just trust we're not idiots and we pass num_pages around properly. Signed-off-by: Josef Bacik commit d0215f3e5ebb5803cd6ec067b10c5e00a3ad7cfc Author: Josef Bacik Date: Tue Jan 25 14:57:24 2011 -0500 Btrfs: simplify our write path Our aio_write function is huge and kind of hard to follow at times. So this patch fixes this by breaking out the buffered and direct write paths out into seperate functions so it's a little clearer what's going on. I've also fixed some wrong typing that we had and added the ability to handle getting an error back from btrfs_set_extent_delalloc. Tested this with xfstests and everything came out fine. Thanks, Signed-off-by: Josef Bacik commit 9f570b8d48b6677b5557d86fb3ca148215e295f2 Author: Josef Bacik Date: Tue Jan 25 12:42:37 2011 -0500 Btrfs: fix formatting in file.c Sorry, but these were bugging me. Just cleanup some of the formatting in file.c. Signed-off-by: Josef Bacik commit 325d1605542960903c88409b199734a3d8fc6612 Merge: 3c5ead5 521cb40 Author: Chris Metcalf Date: Thu Mar 17 14:14:12 2011 -0400 Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus commit 7b7adc4a016a1decb806eb71ecab98721fa7f146 Merge: 31598e8 289d6b0 Author: Linus Torvalds Date: Thu Mar 17 10:11:25 2011 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: (40 commits) unicore32: rewrite arch-specific tlb.h to use asm-generic version unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs unicore32: replace unicore32-specific iomap functions with generic lib implementation unicore32 machine related: add frame buffer driver for pkunity-v3 soc unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc unicore32 io: redefine __REG(x) and re-use readl/writel funcs unicore32 i8042 upgrade and bugfix: adjust resource request region type unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call unicore32 i8042: adjust io funcs of i8042-unicore32io.h unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE unicore32: modify function names and parameters for irq_chips unicore32: remove unused lines in arch/unicore32/include/asm/irq.h unicore32 time.c: change calculate method for clock_event_device unicore32: ADD MAINTAINER for unicore32 architecture unicore32 machine related files: ps2 driver unicore32 machine related files: pci bus handling unicore32 machine related files: hardware registers unicore32 machine related files: core files unicore32 additional architecture files: boot process unicore32 additional architecture files: low-level lib: misc ... Acked-by: Arnd Bergmann commit 31598e8713ef501c8f6aad2e2ec8a9457e8877c1 Merge: 241eb95 6966727 Author: Linus Torvalds Date: Thu Mar 17 10:10:49 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] kexec: Disable ftrace during kexec [S390] support XZ compressed kernel [S390] css_bus_type: make it static [S390] css_driver: remove duplicate members [S390] css: remove subchannel private [S390] css: move chsc_private to drv_data [S390] css: move io_private to drv_data [S390] cio: move cdev pointer to io_subchannel_private [S390] cio: move options to io_sch_private [S390] cio: move asms to generic header [S390] cio: move orb definitions to separate header [S390] Write protect module text and RO data [S390] dasd: get rid of compile warning [S390] remove superfluous check from do_IRQ [S390] remove redundant stack check option commit 5a02ab7c3c4580f94d13c683721039855b67cda6 Author: Mi Jinlong Date: Fri Mar 11 12:13:55 2011 +0800 nfsd: wrong index used in inner loop We must not use dummy for index. After the first index, READ32(dummy) will change dummy!!!! Signed-off-by: Mi Jinlong [bfields@redhat.com: Trond points out READ_BUF alone is sufficient.] Cc: stable@kernel.org Signed-off-by: J. Bruce Fields commit cf507b6f8ebae89c0e7bbd00abc6d8887c9035b1 Merge: 9ae78bc 3ec07aa Author: J. Bruce Fields Date: Thu Mar 17 13:07:20 2011 -0400 Merge create_session decoding fix into for-2.6.39 This needs a further fixup! commit 241eb95600be194f6b59b85c0bf41194694ebdf1 Merge: fd34b0d 3d44ae4 Author: Linus Torvalds Date: Thu Mar 17 09:57:10 2011 -0700 Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (34 commits) sh: Convert to generic show_interrupts. sh: Wire up new fhandle and clock_adjtime syscalls. sh: modify platform_device for sh_eth driver sh: add GETHER's platform_device in board-sh7757lcr sh: update sh7757lcr_defconfig sh: add platform_device of tmio_mmc and sh_mmcif to sh7757lcr sh: dmaengine support for SH7757 sh: add mmc clock in clock-sh7757 sh: add spi_board_info in sh7757lcr sh: add platform_device for SPI sh: add USB_ARCH_HAS_EHCI and OHCI for SH7757 sh: Rename cpuidle states to fit general conventions serial: sh-sci: fix deadlock when resuming from S3 sleep sh: Enable CONFIG_GCOV_PROFILE_ALL for sh sh: Fix up async PCIe probing on SMP. serial: sh-sci: Kill off the special earlyprintk device. serial: sh-sci: Use dev_name() for region reservations. serial: sh-sci: Fix up earlyprintk port mapping. serial: sh-sci: Limit early console to one device. serial: sh-sci: Fix up break timer scheduling race. ... commit fd34b0dee4d237ce9332cc62b03adebfe4fa9f9d Merge: 40c7f21 c9ac136 Author: Linus Torvalds Date: Thu Mar 17 09:56:43 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: fbdev: sh_mobile_lcdc: Add YUV framebuffer support viafb: split pll configs up viafb: remove duplicated clock storage viafb: always return the best possible clock viafb: remove duplicated clock information fbdev: sh_mobile_lcdcfb: add backlight support viafb: factor lcd scaling parameters out viafb: strip some structures viafb: remove unused data_mode and device_type viafb: kill lcd_panel_id video via: make local variables static video via: fix iomem access video/via: drop deprecated (and unused) i2c_adapter.id commit 9ae78bcc000168251f893b1bf92a848308187695 Author: J. Bruce Fields Date: Thu Mar 17 12:52:33 2011 -0400 nfsd4: fix comment and remove unused nfsd4_file fields A couple fields here were left over from a previous version of a patch, and are no longer used. Signed-off-by: J. Bruce Fields commit 8e26de238fd794c8ea56a5c98bf67c40cfeb051d Author: Stanislav Kinsbursky Date: Thu Mar 17 18:54:23 2011 +0300 RPC: killing RPC tasks races fixed RPC task RPC_TASK_QUEUED bit is set must be checked before trying to wake up task rpc_killall_tasks() because task->tk_waitqueue can not be set (equal to NULL). Also, as Trond Myklebust mentioned, such approach (instead of checking tk_waitqueue to NULL) allows us to "optimise away the call to rpc_wake_up_queued_task() altogether for those tasks that aren't queued". Here is an example of dereferencing of tk_waitqueue equal to NULL: CPU 0 CPU 1 CPU 2 -------------------- --------------------- -------------------------- nfs4_run_open_task rpc_run_task rpc_execute rpc_set_active rpc_make_runnable (waiting) rpc_async_schedule nfs4_open_prepare nfs_wait_on_sequence nfs_umount_begin rpc_killall_tasks rpc_wake_up_task rpc_wake_up_queued_task spin_lock(tk_waitqueue == NULL) BUG() rpc_sleep_on spin_lock(&q->lock) __rpc_sleep_on task->tk_waitqueue = q Signed-off-by: Stanislav Kinsbursky Cc: stable@kernel.org Signed-off-by: Trond Myklebust commit ba3c578de274a5438bafbce03f9225936698051c Author: j223yang@asset.uwaterloo.ca Date: Wed Mar 16 11:16:22 2011 -0400 xprt: remove redundant check remove redundant check. Signed-off-by: Jinqiu Yang Signed-off-by: Trond Myklebust commit a8de240a9074b72b156d9e6d53f00076e6cd5f03 Author: Trond Myklebust Date: Tue Mar 15 19:56:30 2011 -0400 SUNRPC: Convert struct rpc_xprt to use atomic_t counters Signed-off-by: Trond Myklebust commit e020c6800c9621a77223bf2c1ff68180e41e8ebf Author: Trond Myklebust Date: Tue Mar 15 19:56:30 2011 -0400 SUNRPC: Ensure we always run the tk_callback before tk_action This fixes a race in which the task->tk_callback() puts the rpc_task to sleep, setting a new callback. Under certain circumstances, the current code may end up executing the task->tk_action before it gets round to the callback. Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit 42fea15d6dc410e62dac6a764142045280624a5b Author: Geert Uytterhoeven Date: Thu Mar 17 14:47:56 2011 +0100 spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices The recently increased type checking in platform_get_drvdata() reveals a few offenders: drivers/rtc/rtc-ds1390.c:161: warning: passing argument 1 of ‘platform_get_drvdata’ from incompatible pointer type drivers/rtc/rtc-ds3234.c:161: warning: passing argument 1 of ‘platform_get_drvdata’ from incompatible pointer type drivers/rtc/rtc-m41t94.c:139: warning: passing argument 1 of ‘platform_get_drvdata’ from incompatible pointer type Use spi_get_drvdata() instead of platform_get_drvdata(). Signed-off-by: Geert Uytterhoeven Signed-off-by: Grant Likely commit 40c7f2112ce18fa5eb6dc209c50dd0f046790191 Merge: b04d0a9 c87a8d8 Author: Linus Torvalds Date: Thu Mar 17 09:11:39 2011 -0700 Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (177 commits) drm/radeon: fixup refcounts in radeon dumb create ioctl. drm: radeon: *_cs_packet_parse_vline() cleanup radeon: merge list_del()/list_add_tail() to list_move_tail() drm: Retry i2c transfer of EDID block after failure drm/radeon/kms: fix typo in atom overscan setup drm: Hold the mode mutex whilst probing for sysfs status drm/nouveau: fix __nouveau_fence_wait performance drm/nv40: attempt to reserve just enough vram for all 32 channels drm/nv50: check for vm traps on every gr irq drm/nv50: decode vm faults some more drm/nouveau: add nouveau_enum_find() util function drm/nouveau: properly handle pushbuffer check failures drm/nvc0: remove vm hack forcing large/small pages to not share a PDE drm/i915: disable opregion lid detection for now. drm/i915: Only wait on a pending flip if we intend to write to the buffer drm/i915/dp: Sanity check eDP existence drm: add cap bit to denote if dumb ioctl is available or not. drm/core: add ioctl to query device/driver capabilities drm/radeon/kms: allow max clock of 340 Mhz on hdmi 1.3+ drm/radeon/kms: add cayman pci ids ... commit 776e58ea3d3735f85678155398241d2513afa67a Author: Gleb Natapov Date: Sun Mar 13 12:34:27 2011 +0200 KVM: unbreak userspace that does not sets tss address Commit 6440e5967bc broke old userspaces that do not set tss address before entering vcpu. Unbreak it by setting tss address to a safe value on the first vcpu entry. New userspaces should set tss address, so print warning in case it doesn't. Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 0f53b5b1c0baae4f949ac0721a55b7a2158dda01 Author: Xiao Guangrong Date: Wed Mar 9 15:43:51 2011 +0800 KVM: MMU: cleanup pte write path This patch does: - call vcpu->arch.mmu.update_pte directly - use gfn_to_pfn_atomic in update_pte path The suggestion is from Avi. Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 5d163b1c9d6e5562dcdfd6cd471f237f1502bb35 Author: Xiao Guangrong Date: Wed Mar 9 15:43:00 2011 +0800 KVM: MMU: introduce a common function to get no-dirty-logged slot Cleanup the code of pte_prefetch_gfn_to_memslot and mapping_level_dirty_bitmap Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 40dcaa9f69fa303ddcb5ea65baf4efefed3aec4b Author: Xiao Guangrong Date: Wed Mar 9 15:41:04 2011 +0800 KVM: fix rcu usage in init_rmode_* functions fix: [ 3494.671786] stack backtrace: [ 3494.671789] Pid: 10527, comm: qemu-system-x86 Not tainted 2.6.38-rc6+ #23 [ 3494.671790] Call Trace: [ 3494.671796] [] ? lockdep_rcu_dereference+0x9d/0xa5 [ 3494.671826] [] ? kvm_memslots+0x6b/0x73 [kvm] [ 3494.671834] [] ? gfn_to_memslot+0x16/0x4f [kvm] [ 3494.671843] [] ? gfn_to_hva+0x16/0x27 [kvm] [ 3494.671851] [] ? kvm_write_guest_page+0x31/0x83 [kvm] [ 3494.671861] [] ? kvm_clear_guest_page+0x1a/0x1c [kvm] [ 3494.671867] [] ? vmx_set_tss_addr+0x83/0x122 [kvm_intel] and: [ 8328.789599] stack backtrace: [ 8328.789601] Pid: 18736, comm: qemu-system-x86 Not tainted 2.6.38-rc6+ #23 [ 8328.789603] Call Trace: [ 8328.789609] [] ? lockdep_rcu_dereference+0x9d/0xa5 [ 8328.789621] [] ? kvm_memslots+0x6b/0x73 [kvm] [ 8328.789628] [] ? gfn_to_memslot+0x16/0x4f [kvm] [ 8328.789635] [] ? gfn_to_hva+0x16/0x27 [kvm] [ 8328.789643] [] ? kvm_write_guest_page+0x31/0x83 [kvm] [ 8328.789699] [] ? kvm_clear_guest_page+0x1a/0x1c [kvm] [ 8328.789713] [] ? vmx_create_vcpu+0x316/0x3c8 [kvm_intel] Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 1aa8ceef0312a6aae7dd863a120a55f1637b361d Author: Nikola Ciprich Date: Wed Mar 9 23:36:51 2011 +0100 KVM: fix kvmclock regression due to missing clock update commit 387b9f97750444728962b236987fbe8ee8cc4f8c moved kvm_request_guest_time_update(vcpu), breaking 32bit SMP guests using kvm-clock. Fix this by moving (new) clock update function to proper place. Signed-off-by: Nikola Ciprich Acked-by: Zachary Amsden Signed-off-by: Avi Kivity commit 399a40c92d744feebf89b1f07208407c26e0aaf5 Author: Gleb Natapov Date: Mon Mar 7 14:55:07 2011 +0200 KVM: emulator: Fix permission checking in io permission bitmap Currently if io port + len crosses 8bit boundary in io permission bitmap the check may allow IO that otherwise should not be allowed. The patch fixes that. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit 5601d05b8c340ee2643febc146099325eff187eb Author: Gleb Natapov Date: Mon Mar 7 14:55:06 2011 +0200 KVM: emulator: Fix io permission checking for 64bit guest Current implementation truncates upper 32bit of TR base address during IO permission bitmap check. The patch fixes this. Reported-and-tested-by: Francis Moreau Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit 831ca6093ca486060721f5c3c74f97b10f3172b9 Author: Avi Kivity Date: Tue Mar 8 16:09:51 2011 +0200 KVM: SVM: Load %gs earlier if CONFIG_X86_32_LAZY_GS=n With CONFIG_CC_STACKPROTECTOR, we need a valid %gs at all times, so disable lazy reload and do an eager reload immediately after the vmexit. Reported-by: IVAN ANGELOV Acked-By: Joerg Roedel Signed-off-by: Avi Kivity commit afc20184b7d24693a934f652e135598a497c9448 Author: Takuya Yoshikawa Date: Sat Mar 5 12:40:20 2011 +0900 KVM: x86: Remove useless regs_page pointer from kvm_lapic Access to this page is mostly done through the regs member which holds the address to this page. The exceptions are in vmx_vcpu_reset() and kvm_free_lapic() and these both can easily be converted to using regs. Signed-off-by: Takuya Yoshikawa Signed-off-by: Avi Kivity commit c8ce057eafd49da6a7afe7791bd84163f65f6132 Author: Michael S. Tsirkin Date: Sun Mar 6 13:03:26 2011 +0200 KVM: improve comment on rcu use in irqfd_deassign The RCU use in kvm_irqfd_deassign is tricky: we have rcu_assign_pointer but no synchronize_rcu: synchronize_rcu is done by kvm_irq_routing_update which we share a spinlock with. Fix up a comment in an attempt to make this clearer. Signed-off-by: Michael S. Tsirkin Signed-off-by: Avi Kivity commit 676646ee4b0931a1ef54389786983a43eb913a6f Author: Xiao Guangrong Date: Fri Mar 4 19:01:39 2011 +0800 KVM: MMU: remove unused macros These macros are not used, so removed Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 842f22ed9b3c545e7c53adbdea0d82efdcd1aa7f Author: Xiao Guangrong Date: Fri Mar 4 19:01:10 2011 +0800 KVM: MMU: cleanup page alloc and free Using __get_free_page instead of alloc_page and page_address, using free_page instead of __free_page and virt_to_page Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 49b26e26e4b7b94753b39f7edb0c34f3d1c4c167 Author: Xiao Guangrong Date: Fri Mar 4 19:00:00 2011 +0800 KVM: MMU: do not record gfn in kvm_mmu_pte_write No need to record the gfn to verifier the pte has the same mode as current vcpu, it's because we only speculatively update the pte only if the pte and vcpu have the same mode Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 48c0e4e9067eb085e7b300628c9640df071aac55 Author: Xiao Guangrong Date: Fri Mar 4 18:59:21 2011 +0800 KVM: MMU: move mmu pages calculated out of mmu lock kvm_mmu_calculate_mmu_pages need to walk all memslots and it's protected by kvm->slots_lock, so move it out of mmu spinlock Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 1b7fd45c32fcc170246bf10ba8d33871840319b8 Author: Xiao Guangrong Date: Fri Mar 4 18:58:02 2011 +0800 KVM: MMU: set spte accessed bit properly Set spte accessed bit only if guest_initiated == 1 that means the really accessed Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit da8dc75f0c4663a568a0ed4e744c6d55d428d8b6 Author: Xiao Guangrong Date: Fri Mar 4 18:56:41 2011 +0800 KVM: MMU: fix kvm_mmu_slot_remove_write_access dropping intermediate W bits Only remove write access in the last sptes. Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 38a778aa1899b9c6cf3e300a02782c9b78c547ab Author: Jan Kiszka Date: Wed Feb 9 15:11:28 2011 +0100 KVM: Start lock documentation The goal of this document shall be - overview of all locks used in KVM core - provide details on the scope of each lock - explain the lock type, specifically of a raw spin locks - provide a lock ordering guide Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 1260edbe7de85ccc58f60040f46034831069bfa2 Author: Lai Jiangshan Date: Mon Feb 21 11:51:35 2011 +0800 KVM: better readability of efer_reserved_bits use EFER_SCE, EFER_LME and EFER_LMA instead of magic numbers. Signed-off-by: Lai Jiangshan Signed-off-by: Avi Kivity commit d170c4190630bcbeb5db266e79ad7a174902e5de Author: Lai Jiangshan Date: Mon Feb 21 11:21:30 2011 +0800 KVM: Clear async page fault hash after switching to real mode The hash array of async gfns may still contain some left gfns after kvm_clear_async_pf_completion_queue() called, need to clear them. Signed-off-by: Lai Jiangshan Acked-by: Gleb Natapov Signed-off-by: Avi Kivity commit 93ea5388ead5d7b87f54b8de53e35231acec8bbe Author: Gleb Natapov Date: Mon Feb 21 12:07:59 2011 +0200 KVM: VMX: Initialize vm86 TSS only once. Currently vm86 task is initialized on each real mode entry and vcpu reset. Initialization is done by zeroing TSS and updating relevant fields. But since all vcpus are using the same TSS there is a race where one vcpu may use TSS while other vcpu is initializing it, so the vcpu that uses TSS will see wrong TSS content and will behave incorrectly. Fix that by initializing TSS only once. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit a8ba6c2622036101d0c6a195f97546bcb1a056ab Author: Gleb Natapov Date: Mon Feb 21 12:07:58 2011 +0200 KVM: VMX: update live TR selector if it changes in real mode When rmode.vm86 is active TR descriptor is updated with vm86 task values, but selector is left intact. vmx_set_segment() makes sure that if TR register is written into while vm86 is active the new values are saved for use after vm86 is deactivated, but since selector is not updated on vm86 activation/deactivation new value is lost. Fix this by writing new selector into vmcs immediately. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit a3b5ba49a8c58d9a578e016523b047467a41e047 Author: Lai Jiangshan Date: Fri Feb 11 14:29:40 2011 +0800 KVM: VMX: add the __noclone attribute to vmx_vcpu_run The changelog of 104f226 said "adds the __noclone attribute", but it was missing in its patch. I think it is still needed. Signed-off-by: Lai Jiangshan Acked-by: Andi Kleen Signed-off-by: Marcelo Tosatti commit 038f8c110eace38d7598e271835ae96ad04a3a26 Author: Jan Kiszka Date: Fri Feb 4 10:49:11 2011 +0100 KVM: x86: Convert tsc_write_lock to raw_spinlock Code under this lock requires non-preemptibility. Ensure this also over -rt by converting it to raw spinlock. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 7049467b5383432e178cc4124e53aebd83638916 Author: Gleb Natapov Date: Wed Feb 9 12:09:46 2011 +0200 KVM: remove isr_ack logic from PIC isr_ack logic was added by e48258009d to avoid unnecessary IPIs. Back then it made sense, but now the code checks that vcpu is ready to accept interrupt before sending IPI, so this logic is no longer needed. The patch removes it. Fixes a regression with Debian/Hurd. Signed-off-by: Gleb Natapov Reported-and-tested-by: Jonathan Nieder Signed-off-by: Avi Kivity commit 23f3e99132aa5c5f887648c50597d8f2b5800417 Author: Joseph Cihula Date: Tue Feb 8 11:45:56 2011 -0800 KVM: VMX: fix detection of BIOS disabling VMX This patch fixes the logic used to detect whether BIOS has disabled VMX, for the case where VMX is enabled only under SMX, but tboot is not active. Signed-off-by: Joseph Cihula Signed-off-by: Avi Kivity commit e935b8372cf8c63dc618a9f2b24ab360a225f1cd Author: Jan Kiszka Date: Tue Feb 8 12:55:33 2011 +0100 KVM: Convert kvm_lock to raw_spinlock Code under this lock requires non-preemptibility. Ensure this also over -rt by converting it to raw spinlock. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit bd3d1ec3d26b61120bb4f60b18ee99aa81839e6b Author: Avi Kivity Date: Thu Feb 3 15:29:52 2011 +0200 KVM: SVM: check for progress after IRET interception When we enable an NMI window, we ask for an IRET intercept, since the IRET re-enables NMIs. However, the IRET intercept happens before the instruction executes, while the NMI window architecturally opens afterwards. To compensate for this mismatch, we only open the NMI window in the following exit, assuming that the IRET has by then executed; however, this assumption is not always correct; we may exit due to a host interrupt or page fault, without having executed the instruction. Fix by checking for forward progress by recording and comparing the IRET's rip. This is somewhat of a hack, since an unchaging rip does not mean that no forward progress has been made, but is the simplest fix for now. Signed-off-by: Avi Kivity commit f86368493ec038218e8663cc1b6e5393cd8e008a Author: Avi Kivity Date: Thu Feb 3 15:07:07 2011 +0200 KVM: Fix race between nmi injection and enabling nmi window The interrupt injection logic looks something like if an nmi is pending, and nmi injection allowed inject nmi if an nmi is pending request exit on nmi window the problem is that "nmi is pending" can be set asynchronously by the PIT; if it happens to fire between the two if statements, we will request an nmi window even though nmi injection is allowed. On SVM, this has disasterous results, since it causes eflags.TF to be set in random guest code. The fix is simple; make nmi_pending synchronous using the standard vcpu->requests mechanism; this ensures the code above is completely synchronous wrt nmi_pending. Signed-off-by: Avi Kivity commit 217ece6129f2d3b4fdd18d9e79be9e43d8d14a42 Author: Rik van Riel Date: Tue Feb 1 09:53:28 2011 -0500 KVM: use yield_to instead of sleep in kvm_vcpu_on_spin Instead of sleeping in kvm_vcpu_on_spin, which can cause gigantic slowdowns of certain workloads, we instead use yield_to to get another VCPU in the same KVM guest to run sooner. This seems to give a 10-15% speedup in certain workloads. Signed-off-by: Rik van Riel Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 34bb10b79de7df118de832f6832efb630e646577 Author: Rik van Riel Date: Tue Feb 1 09:52:41 2011 -0500 KVM: keep track of which task is running a KVM vcpu Keep track of which task is running a KVM vcpu. This helps us figure out later what task to wake up if we want to boost a vcpu that got preempted. Unfortunately there are no guarantees that the same task always keeps the same vcpu, so we can only track the task across a single "run" of the vcpu. Signed-off-by: Rik van Riel Signed-off-by: Avi Kivity commit 77c100c83e84316ced2507c5799f79c2c80bc6b9 Author: Rik van Riel Date: Tue Feb 1 09:51:46 2011 -0500 export pid symbols needed for kvm_vcpu_on_spin Export the symbols required for a race-free kvm_vcpu_on_spin. Signed-off-by: Rik van Riel Signed-off-by: Avi Kivity commit 4005996e428b0d3df10cd0eba389a14b9f5403e4 Author: Avi Kivity Date: Tue Feb 1 16:32:04 2011 +0200 KVM: Drop ad-hoc vendor specific instruction restriction Use the new support in the emulator, and drop the ad-hoc code in x86.c. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit d867162c6d1028d16358f4d2383d1833a849c74d Author: Avi Kivity Date: Tue Feb 1 16:32:03 2011 +0200 KVM: x86 emulator: vendor specific instructions Mark some instructions as vendor specific, and allow the caller to request emulation only of vendor specific instructions. This is useful in some circumstances (responding to a #UD fault). Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 3e90943907ff84cf0379a57c01c296a9b33c903e Author: Avi Kivity Date: Tue Feb 1 16:32:02 2011 +0200 KVM: Drop bogus x86_decode_insn() error check x86_decode_insn() doesn't return X86EMUL_* values, so the check for X86EMUL_PROPOGATE_FAULT will always fail. There is a proper check later on, so there is no need for a replacement for this code. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 0bb8865979629a9dfc6761f8f4d47926d539daa0 Author: Jan Kiszka Date: Tue Feb 1 13:27:15 2011 +0100 KVM: x86: Drop obsolete warning about INIT on runnable VCPU This warning was once used for debugging QEMU user space. Though uncommon, it is actually possible to send an INIT request to a running VCPU. So better drop this warning before someone misuses it to flood kernel logs this way. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 12f9a48f7bf5bfe6620b03028a865f26a10e1fce Author: Glauber Costa Date: Tue Feb 1 14:16:40 2011 -0500 KVM: x86: release kvmclock page on reset When a vcpu is reset, kvmclock page keeps being written to this days. This is wrong and inconsistent: a cpu reset should take it to its initial state. Signed-off-by: Glauber Costa CC: Jan Kiszka Signed-off-by: Marcelo Tosatti commit f58c9df78c0360f0eb3852b9cc3a61e689bc2dd1 Author: Huang Ying Date: Sun Jan 30 11:15:49 2011 +0800 mm: remove is_hwpoison_address Unused. Signed-off-by: Huang Ying Signed-off-by: Marcelo Tosatti commit fafc3dbaac6447ab8f78d2f7f32a521b24fc6b36 Author: Huang Ying Date: Sun Jan 30 11:15:49 2011 +0800 KVM: Replace is_hwpoison_address with __get_user_pages is_hwpoison_address only checks whether the page table entry is hwpoisoned, regardless the memory page mapped. While __get_user_pages will check both. QEMU will clear the poisoned page table entry (via unmap/map) to make it possible to allocate a new memory page for the virtual address across guest rebooting. But it is also possible that the underlying memory page is kept poisoned even after the corresponding page table entry is cleared, that is, a new memory page can not be allocated. __get_user_pages can catch these situations. Signed-off-by: Huang Ying Signed-off-by: Marcelo Tosatti commit 69ebb83e13e514222b0ae4f8bd813a17679ed876 Author: Huang Ying Date: Sun Jan 30 11:15:48 2011 +0800 mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally Make __get_user_pages return -EHWPOISON for HWPOISON page only if FOLL_HWPOISON is specified. With this patch, the interested callers can distinguish HWPOISON pages from general FAULT pages, while other callers will still get -EFAULT for all these pages, so the user space interface need not to be changed. This feature is needed by KVM, where UCR MCE should be relayed to guest for HWPOISON page, while instruction emulation and MMIO will be tried for general FAULT page. The idea comes from Andrew Morton. Signed-off-by: Huang Ying Cc: Andrew Morton Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 0014bd990e69063b0fb78940b35439d7980ce3ee Author: Huang Ying Date: Sun Jan 30 11:15:47 2011 +0800 mm: export __get_user_pages In most cases, get_user_pages and get_user_pages_fast should be used to pin user pages in memory. But sometimes, some special flags except FOLL_GET, FOLL_WRITE and FOLL_FORCE are needed, for example in following patch, KVM needs FOLL_HWPOISON. To support these users, __get_user_pages is exported directly. There are some symbol name conflicts in infiniband driver, fixed them too. Signed-off-by: Huang Ying CC: Andrew Morton CC: Michel Lespinasse CC: Roland Dreier CC: Ralph Campbell Signed-off-by: Marcelo Tosatti commit 91c9c3eda4f3066980d13a6907ef84f3a99364bd Author: john cooper Date: Fri Jan 21 00:21:00 2011 -0500 KVM: x86: handle guest access to BBL_CR_CTL3 MSR A correction to Intel cpu model CPUID data (patch queued) caused winxp to BSOD when booted with a Penryn model. This was traced to the CPUID "model" field correction from 6 -> 23 (as is proper for a Penryn class of cpu). Only in this case does the problem surface. The cause for this failure is winxp accessing the BBL_CR_CTL3 MSR which is unsupported by current kvm, appears to be a legacy MSR not fully characterized yet existing in current silicon, and is apparently carried forward in MSR space to accommodate vintage code as here. It is not yet conclusive whether this MSR implements any of its legacy functionality or is just an ornamental dud for compatibility. While I found no silicon version specific documentation link to this MSR, a general description exists in Intel's developer's reference which agrees with the functional behavior of other bootloader/kernel code I've examined accessing BBL_CR_CTL3. Regrettably winxp appears to be setting bit #19 called out as "reserved" in the above document. So to minimally accommodate this MSR, kvm msr get will provide the equivalent mock data and kvm msr write will simply toss the guest passed data without interpretation. While this treatment of BBL_CR_CTL3 addresses the immediate problem, the approach may be modified pending clarification from Intel. Signed-off-by: john cooper Signed-off-by: Marcelo Tosatti commit 3cba41307a2b1344ab8c1b9f55202d1e9d7bf81b Author: Xiao Guangrong Date: Wed Jan 12 15:41:22 2011 +0800 KVM: make make_all_cpus_request() lockless Now, we have 'vcpu->mode' to judge whether need to send ipi to other cpus, this way is very exact, so checking request bit is needless, then we can drop the spinlock let it's collateral Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 6b7e2d0991489559a1df4500d77f7b76c4607ed0 Author: Xiao Guangrong Date: Wed Jan 12 15:40:31 2011 +0800 KVM: Add "exiting guest mode" state Currently we keep track of only two states: guest mode and host mode. This patch adds an "exiting guest mode" state that tells us that an IPI will happen soon, so unless we need to wait for the IPI, we can avoid it completely. Also 1: No need atomically to read/write ->mode in vcpu's thread 2: reorganize struct kvm_vcpu to make ->mode and ->requests in the same cache line explicitly Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit d48ead8b0b48862a87138d04efb7580a1a25beb5 Author: Heiko Carstens Date: Mon Jan 17 21:21:08 2011 +0100 KVM: fix build warning within __kvm_set_memory_region() on s390 Get rid of this warning: CC arch/s390/kvm/../../../virt/kvm/kvm_main.o arch/s390/kvm/../../../virt/kvm/kvm_main.c:596:12: warning: 'kvm_create_dirty_bitmap' defined but not used The only caller of the function is within a !CONFIG_S390 section, so add the same ifdef around kvm_create_dirty_bitmap() as well. Signed-off-by: Heiko Carstens Signed-off-by: Marcelo Tosatti commit 9ca523183166343fde060e2198237bb345b8a77d Author: Jan Kiszka Date: Sat Jan 15 10:00:53 2011 +0100 KVM: x86: Remove user space triggerable MCE error message This case is a pure user space error we do not need to record. Moreover, it can be misused to flood the kernel log. Remove it. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 63f42e023ea270fde65fa27f0ca766e13faa5608 Author: Xiao Guangrong Date: Wed Jan 12 15:39:18 2011 +0800 KVM: fix rcu usage warning in kvm_arch_vcpu_ioctl_set_sregs() Fix: [ 1001.499596] =================================================== [ 1001.499599] [ INFO: suspicious rcu_dereference_check() usage. ] [ 1001.499601] --------------------------------------------------- [ 1001.499604] include/linux/kvm_host.h:301 invoked rcu_dereference_check() without protection! ...... [ 1001.499636] Pid: 6035, comm: qemu-system-x86 Not tainted 2.6.37-rc6+ #62 [ 1001.499638] Call Trace: [ 1001.499644] [] lockdep_rcu_dereference+0x9d/0xa5 [ 1001.499653] [] gfn_to_memslot+0x8d/0xc8 [kvm] [ 1001.499661] [] gfn_to_hva+0x16/0x3f [kvm] [ 1001.499669] [] kvm_read_guest_page+0x1e/0x5e [kvm] [ 1001.499681] [] kvm_read_guest_page_mmu+0x53/0x5e [kvm] [ 1001.499699] [] load_pdptrs+0x3f/0x9c [kvm] [ 1001.499705] [] ? vmx_set_cr0+0x507/0x517 [kvm_intel] [ 1001.499717] [] kvm_arch_vcpu_ioctl_set_sregs+0x1f3/0x3c0 [kvm] [ 1001.499727] [] kvm_vcpu_ioctl+0x6a5/0xbc5 [kvm] Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 40712faeb84dacfcb3925a88231daa08b3624d34 Author: Avi Kivity Date: Thu Jan 6 18:09:12 2011 +0200 KVM: VMX: Avoid atomic operation in vmx_vcpu_run Instead of exchanging the guest and host rcx, have separate storage for each. This allows us to avoid using the xchg instruction, which is is a little slower than normal operations. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 1c696d0e1b7c10e1e8b34cb6c797329e3c33f262 Author: Avi Kivity Date: Thu Jan 6 18:09:11 2011 +0200 KVM: VMX: Simplify saving guest rcx in vmx_vcpu_run Change push top-of-stack pop guest-rcx pop dummy to pop guest-rcx which is the same thing, only simpler. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 00c25bce02fde63eaa1227532cff9ac7b71de79e Author: Rik van Riel Date: Tue Jan 4 09:51:33 2011 -0500 KVM: VMX: increase ple_gap default to 128 On some CPUs, a ple_gap of 41 is simply insufficient to ever trigger PLE exits, even with the minimalistic PLE test from kvm-unit-tests. http://git.kernel.org/?p=virt/kvm/kvm-unit-tests.git;a=commitdiff;h=eda71b28fa122203e316483b35f37aaacd42f545 For example, the Xeon X5670 CPU needs a ple_gap of at least 48 in order to get pause loop exits: # modprobe kvm_intel ple_gap=47 # taskset 1 /usr/local/bin/qemu-system-x86_64 \ -device testdev,chardev=log -chardev stdio,id=log \ -kernel x86/vmexit.flat -append ple-round-robin -smp 2 VNC server running on `::1:5900' enabling apic enabling apic ple-round-robin 58298446 # rmmod kvm_intel # modprobe kvm_intel ple_gap=48 # taskset 1 /usr/local/bin/qemu-system-x86_64 \ -device testdev,chardev=log -chardev stdio,id=log \ -kernel x86/vmexit.flat -append ple-round-robin -smp 2 VNC server running on `::1:5900' enabling apic enabling apic ple-round-robin 36616 Increase the ple_gap to 128 to be on the safe side. Signed-off-by: Rik van Riel Acked-by: Zhai, Edwin Signed-off-by: Avi Kivity commit 3781c01c1574a2cd58fd5ba2bf58c710edff3da5 Author: Joerg Roedel Date: Fri Jan 14 16:45:02 2011 +0100 KVM: SVM: Add support for perf-kvm This patch adds the necessary code to run perf-kvm on AMD machines. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit a9179499350d30446d8983d272a9157963604b0f Author: Avi Kivity Date: Mon Jan 3 14:28:52 2011 +0200 KVM: VMX: Avoid leaking fake realmode state to userspace When emulating real mode, we fake some state: - tr.base points to a fake vm86 tss - segment registers are made to conform to vm86 restrictions change vmx_get_segment() not to expose this fake state to userspace; instead, return the original state. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit d0ba64f9b4b3e41e7b91681fe04a334bc8bfc8f5 Author: Avi Kivity Date: Mon Jan 3 14:28:51 2011 +0200 KVM: VMX: Save and restore tr selector across mode switches When emulating real mode we play with tr hidden state, but leave tr.selector alone. That works well, except for save/restore, since loading TR writes it to the hidden state in vmx->rmode. Fix by also saving and restoring the tr selector; this makes things more consistent and allows migration to work during the early boot stages of Windows XP. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit bc9c1933d9db227d991736382ddca21ed520c0ea Author: Peter Tyser Date: Wed Dec 29 13:51:25 2010 -0600 KVM: PPC: Fix SPRG get/set for Book3S and BookE Previously SPRGs 4-7 were improperly read and written in kvm_arch_vcpu_ioctl_get_regs() and kvm_arch_vcpu_ioctl_set_regs(); Signed-off-by: Alexander Graf Signed-off-by: Peter Tyser Signed-off-by: Marcelo Tosatti commit 775077a0634a4a2149c85a63ec319b1e426d0564 Author: Sedat Dilek Date: Mon Jan 3 00:01:29 2011 +0100 KVM guest: Fix section mismatch derived from kvm_guest_cpu_online() WARNING: arch/x86/built-in.o(.text+0x1bb74): Section mismatch in reference from the function kvm_guest_cpu_online() to the function .cpuinit.text:kvm_guest_cpu_init() The function kvm_guest_cpu_online() references the function __cpuinit kvm_guest_cpu_init(). This is often because kvm_guest_cpu_online lacks a __cpuinit annotation or the annotation of kvm_guest_cpu_init is wrong. This patch fixes the warning. Tested with linux-next (next-20101231) Signed-off-by: Sedat Dilek Acked-by: Rik van Riel Signed-off-by: Marcelo Tosatti commit 8234b22e1c3287307c53655b16478cf8f5071555 Author: Avi Kivity Date: Mon Dec 27 12:08:45 2010 +0200 KVM: MMU: Don't flush shadow when enabling dirty tracking Instead, drop large mappings, which were the reason we dropped shadow. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 0c755de03e69619c768867d89e6d827d3afa13d9 Merge: e8a80c6 d743314 Author: Jan Kara Date: Thu Mar 17 16:44:22 2011 +0100 Merge branch 'for_next' into for_linus commit 8184f93eced1e304721c2a55c00d87d5a14f8907 Author: Justin TerAvest Date: Thu Mar 17 16:12:36 2011 +0100 cfq-iosched: Don't update group weights when on service tree Version 3 is updated to apply to for-2.6.39/core. For version 2, I took Vivek's advice and made sure we update the group weight from cfq_group_service_tree_add(). If a weight was updated while a group is on the service tree, the calculation for the total weight of the service tree can be adjusted improperly, which either leads to bad service tree weights, or potentially crashes (if total_weight becomes 0). This patch defers updates to the weight until a group is off the service tree. Signed-off-by: Justin TerAvest Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit 1c389795c15d349c2c7b23baf927e16e86ca3ae8 Author: Dan Carpenter Date: Thu Mar 17 14:43:07 2011 +0300 genirq: Fix incorrect unlock in __setup_irq() goto out_thread is called before we take the lock. It causes a gcc warning: "kernel/irq/manage.c:858: warning: ‘flags’ may be used uninitialized in this function" [ tglx: Moved unlock before free_cpumask_var() ] Signed-off-by: Dan Carpenter LKML-Reference: <20110317114307.GJ2008@bicker> Signed-off-by: Thomas Gleixner commit 15825a5cd4adb199fd76737e8bc846154e315218 Author: Thomas Gleixner Date: Thu Mar 17 13:39:19 2011 +0100 cris: Use generic show_interrupts() Signed-off-by: Thomas Gleixner Cc: Jesper Nilsson commit ee0401ec11bb7b83b7fa9476d0aaeabd59216062 Author: Thomas Gleixner Date: Thu Mar 17 13:36:57 2011 +0100 genirq: show_interrupts: Check desc->name before printing it blindly desc->name is not required and not used by all architectures. Signed-off-by: Thomas Gleixner commit 6d05c80dd2115d69599368b150c3df0cf5a54c51 Author: Thomas Gleixner Date: Thu Mar 17 13:35:28 2011 +0100 cris: Use accessor functions to set IRQ_PER_CPU flag Signed-off-by: Thomas Gleixner commit 368e2119c37312f8bb2ab4d1346c46f9611805e4 Author: Thomas Gleixner Date: Thu Mar 17 13:29:26 2011 +0100 cris: Fix irq conversion fallout arch/cris/arch-v10/kernel/irq.c: In function 'init_IRQ': arch/cris/arch-v10/kernel/irq.c:202:3: error: implicit declaration of function 'set_irq_desc_and_handler' Should have been set_irq_chip_and_handler() Fix it and convert to the new function names while at it. Reported-by: Peter Zijlstra Signed-off-by: Thomas Gleixner commit a88bab9aeebe3118703e1532343d82688c12578e Merge: 00759c0 303fc01 Author: Michal Marek Date: Thu Mar 17 15:15:18 2011 +0100 Merge branch 'genksyms-enum' into kbuild/kbuild commit 303fc01fb12d95cf9ab88c496df6651c887cef3c Author: Michal Marek Date: Tue Feb 15 16:04:35 2011 +0100 genksyms: Regenerate lexer and parser Regenerated the parser after "genksyms: Track changes to enum constants". Signed-off-by: Michal Marek Acked-by: Sam Ravnborg commit e37ddb82500393cb417c3ab0fe0726d9a8652372 Author: Michal Marek Date: Thu Feb 3 23:57:09 2011 +0100 genksyms: Track changes to enum constants Enum constants can be used as array sizes; if the enum itself does not appear in the symbol expansion, a change in the enum constant will go unnoticed. Example patch that changes the ABI but does not change the checksum with current genksyms: | enum e { | E1, | E2, |+ E3, | E_MAX | }; | | struct s { | int a[E_MAX]; | } | | int f(struct s *s) { ... } | EXPORT_SYMBOL(f) Therefore, remember the value of each enum constant and expand each occurence to . The value is not actually computed, but instead an expression in the form (last explicitly assigned value) + N is used. This avoids having to parse and semantically understand whole of C. Note: The changes won't take effect until the lexer and parser are rebuilt by the next patch. Signed-off-by: Michal Marek Acked-by: Sam Ravnborg commit 01762c4ec5f6f62c550304b9c70e824293cefdd0 Author: Michal Marek Date: Tue Feb 15 15:11:36 2011 +0100 genksyms: simplify usage of find_symbol() Allow searching for symbols of an exact type. The lexer does this and a subsequent patch will add one more usage. Signed-off-by: Michal Marek Acked-by: Sam Ravnborg commit 68eb8563a1adf27fae18dde4c95fb796c17563df Author: Michal Marek Date: Wed Feb 2 23:52:13 2011 +0100 genksyms: Add helpers for building string lists Signed-off-by: Michal Marek Acked-by: Sam Ravnborg commit 7ec8eda154cbdcabb5305d90fb0952973dcaa560 Author: Michal Marek Date: Tue Jan 18 16:28:06 2011 +0100 genksyms: Simplify printing of symbol types Instead of special-casing SYM_NORMAL, do not map any name to it. Also explicitly set the single-letter name of the symbol type, which will be needed by a further patch. The only user-visible change is one debug printf. Signed-off-by: Michal Marek Acked-by: Sam Ravnborg commit 95f1d639ade8fdf9572ac8a926f62b29dd66eaba Author: Michal Marek Date: Thu Jan 20 16:19:58 2011 +0100 genksyms: Simplify lexer The V2_TOKENS state is active all the time. Signed-off-by: Michal Marek Acked-by: Sam Ravnborg commit 9c281f13b68da49764cbc8d7d610c2f229a0f9a0 Author: Michal Marek Date: Thu Jan 20 15:23:08 2011 +0100 genksyms: Do not paste the bison header file to lex.c The header is already #included, no need to include it a second time. lex.c_shipped was regenerated using flex-2.5.35. Signed-off-by: Michal Marek Acked-by: Sam Ravnborg commit f0ff1357ce391265edbf844792da7da9a694f4bd Author: Stephen Rothwell Date: Thu Mar 17 15:02:51 2011 +0100 drbd: need include for bitops functions declarations Signed-off-by: Stephen Rothwell Signed-off-by: Jens Axboe commit d34a6ecd45c1362d388af8d83ed329c609d1712b Author: Borislav Petkov Date: Wed Feb 23 17:41:50 2011 +0100 amd64_edac: Fix decode_syndrome types Those should all be unsigned. Signed-off-by: Borislav Petkov commit 8c6717510f8002ea31b309c84b7d7a7f7c15197b Author: Borislav Petkov Date: Wed Feb 23 17:25:12 2011 +0100 amd64_edac: Fix DCT argument type Fix amd64_debug_display_dimm_sizes() arguments order per convention (pvt is always first). Also, the now second arg denotes the DCT so adjust its type. Signed-off-by: Borislav Petkov commit e761359a25c26b59c2c1ddcc180a441bb442a5ba Author: Borislav Petkov Date: Mon Feb 21 19:49:01 2011 +0100 amd64_edac: Fix ranges signedness The dram ranges make sense only as an unsigned type. Signed-off-by: Borislav Petkov commit 972ea17ab9116cca513a45526c93651d769fefc6 Author: Borislav Petkov Date: Mon Feb 21 19:43:02 2011 +0100 amd64_edac: Drop local variable Use the macro directly instead Signed-off-by: Borislav Petkov commit 71d2a32e8e8411e160705aad88d26fb993a1faba Author: Borislav Petkov Date: Mon Feb 21 19:37:24 2011 +0100 amd64_edac: Fix PCI config addressing types Adjust argument types to the PCI config API's types. Signed-off-by: Borislav Petkov commit 151fa71c581d1295f3f44f4882ceb17ca014dc8d Author: Borislav Petkov Date: Mon Feb 21 19:33:10 2011 +0100 amd64_edac: Fix DRAM base macros Return unsigned u8 values only. Signed-off-by: Borislav Petkov commit b487c33e55eb7e18cd98094f7159c6d9e8b6bedd Author: Borislav Petkov Date: Mon Feb 21 18:55:00 2011 +0100 amd64_edac: Fix node id signedness A node id can never be negative since we use it as an index into the DRAM ranges array. This also makes one of the BUG_ON conditions redundant. Signed-off-by: Borislav Petkov commit d88977a9c433deb7e558e0af51092449ef2ad2dd Author: Borislav Petkov Date: Mon Feb 21 18:05:57 2011 +0100 amd64_edac: Drop redundant declarations Those were moved to the mce_amd.h header. Signed-off-by: Borislav Petkov commit df71a053241548b728d3bf45b0c11ed092a20319 Author: Borislav Petkov Date: Wed Jan 19 18:15:10 2011 +0100 amd64_edac: Enable driver on F15h Add the PCI device ids required for driver registration. Remove pvt->ctl_name and use the family descriptor directly, instead. Then, bump driver version and fixup its format. Finally, enable DRAM ECC decoding on F15h. Signed-off-by: Borislav Petkov commit a3b7db09a6d5a6b8d237766b0b320447bb609bc5 Author: Borislav Petkov Date: Wed Jan 19 20:35:12 2011 +0100 amd64_edac: Adjust ECC symbol size to F15h F15h has the same ECC symbol size options as F10h revD and later so adjust checks to that. Simplify code a bit. Signed-off-by: Borislav Petkov commit 87b3e0e6e43b7e92575b79ed05ab86d221323642 Author: Borislav Petkov Date: Wed Jan 19 20:02:38 2011 +0100 amd64_edac: Simplify scrubrate setting Drop per-instance variable and compute min scrubrate dynamically. Signed-off-by: Borislav Petkov commit cb293250c71fa85de3ef378d7383ddecf248c32d Author: Borislav Petkov Date: Wed Jan 19 18:22:11 2011 +0100 PCI: Rename CPU PCI id define With increasing number of PCI function ids, add the PCI function id in the define name instead of its symbolic name in the BKDG for more clarity. Acked-by: Ingo Molnar Acked-by: Jesse Barnes Signed-off-by: Borislav Petkov commit 41d8bfaba70311c2fa0666554ef160ea8ffc9daf Author: Borislav Petkov Date: Tue Jan 18 19:16:08 2011 +0100 amd64_edac: Improve DRAM address mapping Drop static tables which map the bits in F2x80 to a chip select size in favor of functions doing the mapping with some bit fiddling. Also, add F15 support. Signed-off-by: Borislav Petkov commit 5a5d237169152d4d7e4b6105eab15831829fb8e7 Author: Borislav Petkov Date: Mon Jan 17 17:52:57 2011 +0100 amd64_edac: Sanitize ->read_dram_ctl_register This function is relevant for F10h and higher, and it has only one callsite so drop its function pointer from the low_ops struct. Signed-off-by: Borislav Petkov commit b15f0fcab1ab85c773c9fa235c76e6ce90b7462e Author: Borislav Petkov Date: Mon Jan 17 15:59:58 2011 +0100 amd64_edac: Adjust sys_addr to chip select conversion routine to F15h F15h sys_addr to chip select mapping is almost identical to F10h's so reuse that. Rename functions on that path accordingly. Signed-off-by: Borislav Petkov commit 355fba600549cfcfab227f928eab3ccae444ec8e Author: Borislav Petkov Date: Mon Jan 17 13:03:26 2011 +0100 amd64_edac: Beef up early exit reporting Add paranoid checks for the sys address before going off and decoding it. Signed-off-by: Borislav Petkov commit 614ec9d8532cc6b2f6b471c399daffdfd1c32d03 Author: Borislav Petkov Date: Thu Jan 13 18:02:22 2011 +0100 amd64_edac: Revamp online spare handling Replace per-DCT macros with smarter ones, drop hack and look for the spare rank on all chip selects on a channel. Signed-off-by: Borislav Petkov commit 5d4b58e84a382309dfa4dbe19220cd1f78ffc71f Author: Borislav Petkov Date: Thu Jan 13 16:01:13 2011 +0100 amd64_edac: Fix channel interleave removal Remove the channel interleave select bit properly. See F2x110[DctSelIntLvAddr] for details. Signed-off-by: Borislav Petkov commit e2f79dbdfbf4326fcec50a3c2568476df24b16b6 Author: Borislav Petkov Date: Thu Jan 13 14:57:34 2011 +0100 amd64_edac: Correct node interleaving removal When node interleaving is enabled, a subset of the addr[14:12] bits has to be removed in order to get the normalized DCT address of the DRAM channel. The actual number of bits to remove is determined by F1x[1, 0][7C:40][IntlvEn]. Do this correctly. Signed-off-by: Borislav Petkov commit 95b0ef55cd8a8278b64c7ba98c29cda5f4e4b617 Author: Borislav Petkov Date: Tue Jan 11 22:08:07 2011 +0100 amd64_edac: Add support for interleaved region swapping On revC3 and revE Fam10h machines and later, non-interleaved graphics framebuffer memory under the 16G mark can be swapped with a region located at the bottom of memory so that the GPU can use the interleaved region and thus two channels. Add support for that. Signed-off-by: Borislav Petkov commit 700466249f9bb787165da64d2615cee456d88751 Author: Borislav Petkov Date: Mon Jan 10 14:37:27 2011 +0100 amd64_edac: Unify get_error_address The address bits from MC4_STATUS differ only between K8 and the rest so no need for a per-family method. No functional change. Signed-off-by: Borislav Petkov commit f192c7b16c98839c1945733f1013f75daec5f380 Author: Borislav Petkov Date: Mon Jan 10 14:24:32 2011 +0100 amd64_edac: Simplify decoding path Use the struct mce directly instead of copying from it into a custom struct err_regs. No functionality change. Signed-off-by: Borislav Petkov commit 7d20d14da1bf24199add02cf4293871c277a4bda Author: Borislav Petkov Date: Fri Jan 7 17:58:04 2011 +0100 amd64_edac: Adjust channel counting to F15h The only difference is that F10h used to sport ganged DCTs and F15h doesn't so adjust the F10h routine and reuse it. Signed-off-by: Borislav Petkov commit 5980bb9cd88a3fa44cc5beab599f08fbc928b832 Author: Borislav Petkov Date: Fri Jan 7 16:26:49 2011 +0100 amd64_edac: Cleanup old defines cruft Remove unused defines, drop family names from define names. Signed-off-by: Borislav Petkov commit bcd781f46a5f892ef2ae5843839849aa579fe096 Author: Borislav Petkov Date: Fri Jan 7 16:17:46 2011 +0100 amd64_edac: Cleanup NBSH cruft Remove reporting of errors with UC bit set - this is done by the MCE decoding code anyway and this driver deals with DRAM ECC errors only. UC (NB uncorrectable error) doesn't necessarily mean it is a DRAM error. Remove unused macros while at it. Signed-off-by: Borislav Petkov commit a97fa68ec403e2761a37b28651de8fd9da8c5e1f Author: Borislav Petkov Date: Thu Dec 23 14:07:18 2010 +0100 amd64_edac: Cleanup NBCFG handling The fact whether we are chipkill capable or not does not have any bearing when computing the channel index on a ganged DCT configuration so remove that. Also, simplify debug statements. Finally, remove old error injection leftovers, while at it. Signed-off-by: Borislav Petkov commit c9f4f26eae096c39547139666e8af607c2447f94 Author: Borislav Petkov Date: Wed Dec 22 19:48:20 2010 +0100 amd64_edac: Cleanup NBCTL code Remove family names from macro names, drop single bit defines and comment their meaning instead. No functional change. Signed-off-by: Borislav Petkov commit 78da121e1560805a0e6e11952de30b416accef62 Author: Borislav Petkov Date: Wed Dec 22 19:31:45 2010 +0100 amd64_edac: Cleanup DCT Select Low/High code Shorten macro names, remove family name from macros, fix macro arguments, shorten debug strings. No functionality change. Signed-off-by: Borislav Petkov commit cb32850744b8b574966637ae98d55692717eced4 Author: Borislav Petkov Date: Wed Dec 22 14:28:24 2010 +0100 amd64_edac: Cleanup Dram Configuration registers handling * Restrict DCT ganged mode check since only Fam10h supports it * Adjust DRAM type detection for BD since it only supports DDR3 * Remove second and thus unneeded DCLR read in k8_early_channel_count() - we do that in read_mc_regs() * Cleanup comments and remove family names from register macros * Remove unused defines There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov commit 525a1b20a6830317db17b62df322b45d92ecd550 Author: Borislav Petkov Date: Tue Dec 21 15:53:27 2010 +0100 amd64_edac: Cleanup DBAM handling Do not read DBAM regs twice and simplify code around them. There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov commit f678b8ccce69dcf9c597e3029ee35421ba62a215 Author: Borislav Petkov Date: Mon Dec 13 19:21:07 2010 +0100 amd64_edac: Replace huge bitmasks with a macro Replace hard to read hex constants with a continuous masks macro. Signed-off-by: Borislav Petkov commit c8e518d5673d6b694ab843ee586438cdff0b3809 Author: Borislav Petkov Date: Fri Dec 10 19:49:19 2010 +0100 amd64_edac: Sanitize f10_get_base_addr_offset This function maps the system address to the normalized DCT address. Document what the code does for more clarity and wrap insane bitmasks in a more understandable macro which generates them. Also, reduce number of arguments passed to the function. Finally, rename this function to what it actually does. No functional change. Signed-off-by: Borislav Petkov commit 229a7a11ac1afa84db2eac91b3fc38a0f5464696 Author: Borislav Petkov Date: Thu Dec 9 18:57:54 2010 +0100 amd64_edac: Sanitize channel extraction Cleanup and simplify f10_determine_channel(); make it more readable. Also drop f10_map_intlv_en_to_shift() in favor of simply counting the bits in F1x124[DramIntlvEn] which is equivalent. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov commit 11c75eadaf75fe6320325aa13dc135f26ad724b8 Author: Borislav Petkov Date: Mon Nov 29 19:49:02 2010 +0100 amd64_edac: Cleanup chipselect handling Add a struct representing the DRAM chip select base/limit register pairs. Concentrate all CS handling in a single function. Also, add CS looping macros for cleaner, more readable code. While at it, adjust code to F15h. Finally, do smaller macro names cleanups (remove family names from register macros) and debug messages clarification. No functional change. Signed-off-by: Borislav Petkov commit bc21fa578742924aa129a493657f797c13d34ad2 Author: Borislav Petkov Date: Thu Nov 11 17:29:13 2010 +0100 amd64_edac: Cleanup DHAR handling Adjust to F15h, simplify code, fixup macros. Signed-off-by: Borislav Petkov commit 7f19bf755ced6fa16dbf118c0eff60586760496b Author: Borislav Petkov Date: Thu Oct 21 18:52:53 2010 +0200 amd64_edac: Remove DRAM base/limit subfields caching Add a struct representing the DRAM base/limit range pairs and remove all cached subfields. Replace them with accessor functions, which actually saves us some space: text data bss dec hex filename 14712 1577 336 16625 40f1 drivers/edac/amd64_edac_mod.o.after 14831 1609 336 16776 4188 drivers/edac/amd64_edac_mod.o.before Also, it simplifies the code a lot allowing to merge the K8 and F10h routines. No functional change. Signed-off-by: Borislav Petkov commit b2b0c605436e343a9a24f00e7fc8fb89a8316e20 Author: Borislav Petkov Date: Fri Oct 8 18:32:29 2010 +0200 amd64_edac: Add support for F15h DCT PCI config accesses F15h "multiplexes" between the configuration space of the two DRAM controllers by toggling D18F1x10C[DctCfgSel] while F10h has a different set of registers for DCT0, and DCT1 in extended PCI config space. Add DCT configuration space accessors per family thus wrapping all the different access prerequisites. Clean up code while at it, shorten names. Signed-off-by: Borislav Petkov commit b6a280bb96e0981a527d26cfb0fad203cb9bd808 Author: Borislav Petkov Date: Thu Jan 13 19:03:28 2011 +0100 EDAC: Shut up sysfs registration debug code Raise the debug level of these routines so that their output get issued out only when the highest debug level is selected. Otherwise, don't pollute driver debug output. Signed-off-by: Borislav Petkov commit 65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4 Merge: b4a65f4 0ff1731 4875ac1 7b2a64c 61c29f5 0ae4381 5623a24 Author: Jiri Kosina Date: Thu Mar 17 14:31:46 2011 +0100 Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', 'upstream' and 'upstream-fixes' into for-linus commit 22942c00a6ad6e9e93b53811a6de72c821c15d22 Author: matt mooney Date: Fri Jan 14 06:12:50 2011 -0800 video: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit bfbec92075a296eaaddd53b3327ccc259b377299 Author: matt mooney Date: Fri Jan 14 06:12:49 2011 -0800 scsi: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 76aea3e9fe1e6b74e8f7c75324fde940701346d4 Author: matt mooney Date: Fri Jan 14 06:12:48 2011 -0800 rtc: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 4ebdd58f46d305c2ab382b6193d4ed0cd201b0dc Author: matt mooney Date: Fri Jan 14 06:12:47 2011 -0800 rapidio: change to new flag variable switches/ depends on RAPIDIO_DEBUG so the subdir-ccflags-y variant seems to be appropriate here. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 26a082dc5334ee003167bb9feeee681c150e5b11 Author: matt mooney Date: Fri Jan 14 06:12:46 2011 -0800 pps: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 5a8b7cdc7424d63467cff1d20461acf48ffcb72f Author: matt mooney Date: Fri Jan 14 06:12:45 2011 -0800 net: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Acked-by: Sjur Braendeland Acked-by: David S. Miller Acked-by: John W. Linville Signed-off-by: Michal Marek commit 8ac727c1e65ba98fc2d82bb28288312cc3b7473b Author: matt mooney Date: Fri Jan 14 06:12:44 2011 -0800 misc: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit d100d406044b76475c7baec72ab6770306ea1a8d Author: matt mooney Date: Fri Jan 14 06:12:43 2011 -0800 message: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 41d9c644fc4dd5fa399682c0f8d0d1f79b77a199 Author: matt mooney Date: Fri Jan 14 06:12:42 2011 -0800 memstick: change to new flag variable The EXTRA_CFLAGS assignment in memstick/Makefile was not accomplishing anything because this flag only has effect on sources at the same level as the makefile (i.e., per directory). Since both core/ and host/ rely on MEMSTICK_DEBUG, the subdir-ccflags-y variant seems to be the appropriate choice. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit f656c25b71b986b98dce2f8d268524f792b7e43f Author: matt mooney Date: Fri Jan 14 06:12:41 2011 -0800 isdn: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Acked-by: David S. Miller Signed-off-by: Michal Marek commit 76e150392402c154036db94fcc295469fce48c66 Author: matt mooney Date: Fri Jan 14 06:12:40 2011 -0800 ieee802154: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Acked-by: Dmitry Eremin-Solenikov Signed-off-by: Michal Marek commit 732f36d82fc4acfd2fa77c939494edeee390b080 Author: matt mooney Date: Fri Jan 14 06:12:39 2011 -0800 ide: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Acked-by: David S. Miller Signed-off-by: Michal Marek commit 5c39e31195f49f6725f04b22921eca2388a3f909 Author: matt mooney Date: Fri Jan 14 06:12:38 2011 -0800 hwmon: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Acked-by: Guenter Roeck Signed-off-by: Michal Marek commit 990710ca5ddf28aef9c34594b3ffe71544e5faa4 Author: matt mooney Date: Fri Jan 14 06:12:37 2011 -0800 dma: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 8ec3b8432e4fe8d452f88f1ed9a3450e715bb797 Author: matt mooney Date: Fri Jan 14 06:12:36 2011 -0800 char: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 0ccd234ca04b09a156f8771af316ac9de2fa7312 Author: matt mooney Date: Fri Jan 14 06:12:35 2011 -0800 fs: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. And change ntfs-objs to ntfs-y for cleaner conditional inclusion. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 3996eabbab5597d27d5140e1d8f9e3f1145f8b40 Author: matt mooney Date: Fri Jan 14 06:12:34 2011 -0800 xtensa: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 9b8c24fac8f030a3369a8bc6bf990534a7ca6ce8 Author: matt mooney Date: Fri Jan 14 06:12:33 2011 -0800 um: change to new flag variables Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit c73028a028876f7fd72ec0e114b0226d17e917d3 Author: matt mooney Date: Fri Jan 14 06:12:32 2011 -0800 s390: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit e3726304a242e94a87d7b5427d88427acead7c02 Author: matt mooney Date: Fri Jan 14 06:12:31 2011 -0800 mips: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 9cce34ba6e292f9d33c4f8c151713be1c97b0995 Author: matt mooney Date: Fri Jan 14 06:12:30 2011 -0800 microblaze: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 4800cd8311f8a16a9a9f8515f2793d5761c44c41 Author: matt mooney Date: Fri Jan 14 06:12:28 2011 -0800 ia64: change to new flag variables Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 6ae8f8b8c50f6929fa99a662f6636a63ba76f93e Author: matt mooney Date: Fri Jan 14 06:12:27 2011 -0800 h8300: change to new flag variable Replace EXTRA_AFLAGS with asflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 21f0b311c6c08db6b15fd6299fe6601fec60eeb5 Author: matt mooney Date: Fri Jan 14 06:12:26 2011 -0800 arm: change to new flag variables Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit ed3cd4a86562eee79de25b567a00e648cc3dc2bf Author: matt mooney Date: Fri Jan 14 06:12:24 2011 -0800 kernel: change to new flag variable Replace EXTRA_CFLAGS with ccflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Michal Marek commit 8df341cf251f3b77eaaef66f806570e74ab44452 Merge: eb4316d ec6b426 Author: Ingo Molnar Date: Thu Mar 17 13:38:41 2011 +0100 Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent commit 00759c0ea0d3b4c918539ddd7cbbfbbb39a38fc7 Author: Randy Dunlap Date: Tue Mar 15 14:13:47 2011 -0700 modpost: fix trailing comma Consolidate locations that print a section whitelist into calls to print_section_list(). Fix print_section_list() so that it does not print a trailing comma & space: If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, becomes: If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console Signed-off-by: Randy Dunlap Signed-off-by: Michal Marek commit e1b702cf224df446b4ce0416dfb02858e7cc068b Author: Mike Waychison Date: Mon Mar 14 23:34:25 2011 -0700 KBuild: silence "'scripts/unifdef' is up to date." While changing our build system over to use the headers_install target as part of our klibc build, the following message started showing up in our logs: make[2]: `scripts/unifdef' is up to date. It turns out that the build blindly invokes a recursive make on this target, which causes make to emit this message when the target is already up to date. This isn't seen for most targets as the rest of the build relies primarily on the default target and on PHONY targets when invoking make recursively. Silence the above message when building unifdef as part of headers_install by hiding it behind a new PHONY target called "build_unifdef" that has an empty recipe. Signed-off-by: Mike Waychison Acked-by: WANG Cong Signed-off-by: Michal Marek commit 9c9585e0e96f8340d704256db00b2ec28240c36e Merge: 5d350cb c8ebae3 ba74ec7 29772c4 Author: Russell King Date: Thu Mar 17 11:04:51 2011 +0000 Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers commit 95f28604a65b1c40b6c6cd95e58439cd7ded3add Author: Jens Axboe Date: Thu Mar 17 11:13:12 2011 +0100 fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away We don't have proper reference counting for this yet, so we run into cases where the device is pulled and we OOPS on flushing the fs data. This happens even though the dirty inodes have already been migrated to the default_backing_dev_info. Reported-by: Torsten Hilbrich Tested-by: Torsten Hilbrich Cc: stable@kernel.org Signed-off-by: Jens Axboe commit a91a2785b200864aef2270ed6a3babac7a253a20 Author: Martin K. Petersen Date: Thu Mar 17 11:11:05 2011 +0100 block: Require subsystems to explicitly allocate bio_set integrity mempool MD and DM create a new bio_set for every metadevice. Each bio_set has an integrity mempool attached regardless of whether the metadevice is capable of passing integrity metadata. This is a waste of memory. Instead we defer the allocation decision to MD and DM since we know at metadevice creation time whether integrity passthrough is needed or not. Automatic integrity mempool allocation can then be removed from bioset_create() and we make an explicit integrity allocation for the fs_bio_set. Signed-off-by: Martin K. Petersen Reported-by: Zdenek Kabelac Acked-by: Mike Snitzer Signed-off-by: Jens Axboe commit 82f04ab47e1d94d78503591a7460b2cad9601ede Author: Jens Axboe Date: Thu Mar 17 11:01:52 2011 +0100 jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging 'write_op' was still used, even though it was always WRITE_SYNC now. Add plugging around the cases where it submits IO, and flush them before we end up waiting for that IO. Signed-off-by: Jens Axboe commit 65ab80279d7c323ce151e858d951e2684df72a97 Author: Jens Axboe Date: Thu Mar 17 10:56:45 2011 +0100 jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging 'write_op' was still used, even though it was always WRITE_SYNC now. Add plugging around the cases where it submits IO, and flush them before we end up waiting for that IO. Signed-off-by: Jens Axboe commit 4ee2491ed8569f370bf4c1a4c046a6efb8032bd2 Author: Jens Axboe Date: Thu Mar 17 10:51:40 2011 +0100 fs: make fsync_buffers_list() plug It used WRITE_SYNC_PLUG before and potentially submits a batch of IO, so lets enable plugging for this case. Signed-off-by: Jens Axboe commit 9b6096a65f99a89dfd8328c4e469e7b53b3ae04a Author: Shaohua Li Date: Thu Mar 17 10:47:06 2011 +0100 mm: make generic_writepages() use plugging This recovers a performance regression caused by the removal of the per-device plugging. Signed-off-by: Jens Axboe commit 1eda75c131ea42ec173323b6c34aeed78ae637c1 Author: Jon Nettleton Date: Wed Mar 16 15:32:47 2011 +0000 x86: Use PentiumPro-optimized partial_csum() on VIA C7 Testing on the OLPC XO-1.5 (VIA C7-M 1000MHz CPU) shows a partial_csum() speed increase by a factor of 1.5 when we switch to the Pentium-optimized version. Signed-off-by: Daniel Drake Cc: dilinger@queued.net Signed-off-by: Ingo Molnar commit 3d44ae402a4e35cf88784d443046c8fbe25c674b Author: Paul Mundt Date: Thu Mar 17 17:31:51 2011 +0900 sh: Convert to generic show_interrupts. Trivial conversion, simply encapsulate the NMI stats in the arch code. Signed-off-by: Paul Mundt commit eb4316dd0a96a74104e5b921e640e73a99b56795 Merge: 13e5bef 9df03ab Author: Ingo Molnar Date: Thu Mar 17 09:12:03 2011 +0100 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent commit 13e5befaddcf8d542ae45610b552105490a0010b Author: David Rientjes Date: Wed Mar 16 17:17:08 2011 -0700 trace, documentation: Fix branch profiling location in debugfs The debugfs interface for branch profiling is through /sys/kernel/debug/tracing/trace_stat/branch_annotated /sys/kernel/debug/tracing/trace_stat/branch_all so update the Kconfig accordingly. Signed-off-by: David Rientjes Cc: Steven Rostedt LKML-Reference: Signed-off-by: Ingo Molnar commit a88403335a9ffc66a0a1b46b6d303512eddde846 Author: Paul Mundt Date: Thu Mar 17 17:01:24 2011 +0900 sh: Wire up new fhandle and clock_adjtime syscalls. Signed-off-by: Paul Mundt commit 9055f895f805afd57b833e51c4665aa1b2579d43 Author: Yoshihiro Shimoda Date: Tue Mar 8 08:00:04 2011 +0000 sh: modify platform_device for sh_eth driver A new parameter is added to sh_eth_plat_data. And the sh_eth driver needs additional memory resource if a module has TSU. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 984f6cfd21babd70302592641bd01b574e25ee83 Author: Yoshihiro Shimoda Date: Tue Mar 8 08:00:00 2011 +0000 sh: add GETHER's platform_device in board-sh7757lcr This patch also modifies for ETHER's platform_device. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 1d2a1959fe534279cf37aba20b08c24c20840e52 Merge: 5a79ce7 054cfaa Author: Paul Mundt Date: Thu Mar 17 16:44:08 2011 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest commit 831532035b12a5f7b600515a6f4da0b207b82d6e Merge: b0aea14 21a06b0 Author: Benjamin Herrenschmidt Date: Thu Mar 17 17:59:01 2011 +1100 Merge remote branch 'jwb/next' into next commit def179c271ac9b5020deca798470521f14d11edd Merge: 49851ca 5cb81d1 Author: Dmitry Torokhov Date: Wed Mar 16 23:29:56 2011 -0700 Merge branch 'tsc2005' into next commit 5cb81d19bae47adcb073a5e5a3bc40dd252f239e Author: Dmitry Torokhov Date: Wed Mar 16 22:11:41 2011 -0700 Input: tsc2005 - remove 'disable' sysfs attribute I believe that enable/disable functionality should not be implemented on the individual driver level but rather in device core, potentially reusing parts of PM framework. Therefore the driver-specific "disable" attribute is removed from the mainline driver. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 0b950d3d7ce4c1e870b8efc4ae0faaf0ef53532c Author: Dmitry Torokhov Date: Wed Mar 16 22:11:34 2011 -0700 Input: tsc2005 - add open/close Introduce open and close methods for the input device to keep the device powered down when it is not in use. Also rework interaction between interrupt thread and starting/shutting off/resetting the device: instead of taking a mutex in the intterrupt thread and elsewhere disable interrupts before transitioning the device in a new state. The ESD handling is also separated from the IRQ thread; we poll regularly at a given interval and simply skip reads if we see that valid interrupt happened not so long ago. This allows us not cancel and reschedule ESD work from interrupt context all the time. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 71f80045d48f259ea423bae3c14c2361e010a9ce Author: Dmitry Torokhov Date: Wed Mar 16 22:11:25 2011 -0700 Input: tsc2005 - handle read errors from SPI layer Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit dacb650f125c7dc7ead9735d081bc078325b6d23 Author: Dmitry Torokhov Date: Wed Mar 16 22:11:14 2011 -0700 Input: tsc2005 - do not rearm timer in hardirq handler We will most likely rearm it yet again the IRQ thread so doing it here is pointless. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 80cc2f0c928ddf58051f2809e1c2e7d0172d0291 Author: Dmitry Torokhov Date: Wed Mar 16 22:11:08 2011 -0700 Input: tsc2005 - don't use work for 'pen up' handling We do not need process context to send input events so let's switch to a regular timer. I am going to get rid of taking ts->mutex in tsc2005_irq_thread() later. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 9a6e180af78247e3a7680460240bb450c39d3a5b Author: Dmitry Torokhov Date: Wed Mar 16 22:10:52 2011 -0700 Input: tsc2005 - do not use 0 in place of NULL Sparse in unhappy when people use 0 instead of NULL for pointers so let's rework the way we initialize spi_transfer structure in tsc2005_cmd() and tsc2005_write(). Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit c8b6846a7559e64d7ac4ba1ccdba05f3ee2e34e8 Author: Dmitry Torokhov Date: Wed Mar 16 22:10:46 2011 -0700 Input: tsc2005 - use true/false for boolean variables Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 8dbcc432c2b4adf4ff7183afc5f2b42276b2a987 Author: Dmitry Torokhov Date: Wed Mar 16 22:10:37 2011 -0700 Input: tsc2005 - hide selftest attribute if we can't reset If implementation to perform self-test/reset has not been provided by the platform code hide 'selftest' sysfs attribute instead of returning error when someone tries to use it. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 99bb892d8a3f4f384d61e5d20499247a7cdd3d74 Author: Dmitry Torokhov Date: Wed Mar 16 22:09:38 2011 -0700 Input: tsc2005 - rework driver initialization code We need to make sure we have time/work initialized before requesting and enabling interrupts, otherwise we might start using them way too early. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit f8a67139c68eb8a58907906622c9aa02cd6a1dd1 Author: Dmitry Torokhov Date: Wed Mar 16 22:09:32 2011 -0700 Input: tsc2005 - set up bus type in input device We know what bus we are residing on (SPI) so let's make this data available to the users. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit b4b480a8d643cbdef6f925e55759c18a674fa454 Author: Dmitry Torokhov Date: Wed Mar 16 22:09:25 2011 -0700 Input: tsc2005 - set up parent device Set up SPI device as parent of the input device so it gets placed into proper place in sysfs tree. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 2721a89ac41f2e7705484c1582c293c4eee5344d Author: Dmitry Torokhov Date: Wed Mar 16 22:09:09 2011 -0700 Input: tsc2005 - clear driver data after unbinding We should not leave garbage pointers in driver structure after we unbind it from the device or if bind fails. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit b88aa494c27552e6fa94e4abaa5ea4f9b2f170a8 Author: Dmitry Torokhov Date: Wed Mar 16 22:09:03 2011 -0700 Input: tsc2005 - add module description Add proper module description so that it would show in 'modinfo' output. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit bcd11879fb5c84b3ca9167022b4c2b66d0935c52 Author: Dmitry Torokhov Date: Wed Mar 16 22:08:53 2011 -0700 Input: tsc2005 - remove driver banner message The boot process is noisy as it is and input core already announces all new device so let's get rid of the banner message in the driver. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit ef5a672f8d67c45fe2739c3a98a4e41d96b5cabc Author: Dmitry Torokhov Date: Wed Mar 16 22:08:39 2011 -0700 Input: tsc2005 - remove incorrect module alias TSC2005 is not a platform driver so it should not define "platform:tsc2005" module alias. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 3ff8ff53aae7b7e46dec6a50c29b8a022ec299ba Author: Dmitry Torokhov Date: Wed Mar 16 22:08:26 2011 -0700 Input: tsc2005 - convert to using dev_pm_ops Newer code should not be using legacy suspend/resume methods but rather supply dev_pm_ops structure as it allows better control over power management. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 6b007d62fabb279b51c784c7c8abc6848b66a917 Author: Dmitry Torokhov Date: Wed Mar 16 22:08:08 2011 -0700 Input: tsc2005 - use spi_get/set_drvdata() Instead of peeking into underlying device and using dev_get/set_drvdata(), let's use SPI layer's implementation to access driver-private data (which may be different from driver-core private data). Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov commit 37bd44694c7215e3e46e6ee4a930d197325a7168 Author: Lauri Leukkunen Date: Wed Mar 16 22:07:36 2011 -0700 Input: introduce tsc2005 driver Discussions: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg26748.html Introduce a driver for the Texas Instruments TSC2005 touchscreen controller (http://focus.ti.com/docs/prod/folders/print/tsc2005.html). The patch is based on a driver by Lauri Leukkunen, with modifications by David Brownell, Phil Carmody, Imre Deak, Hiroshi DOYU, Ari Kauppi, Tony Lindgren, Jarkko Nikula, Eero Nurkkala and Roman Tereshonkov. Signed-off-by: Lauri Leukkunen [aaro.koskinen@nokia.com: patch description, rebasing & cleanup] Signed-off-by: Aaro Koskinen [ext-srikar.1.bhavanarayana@nokia.com: various fixes] Signed-off-by: Srikar Signed-off-by: Dmitry Torokhov commit 49851ca04c7f941ef6f5ca04751b0e0fefe9d50d Author: Dmitry Torokhov Date: Wed Mar 16 22:56:03 2011 -0700 Input: xen-kbdfront - move to drivers/input/misc drivers/input is reserved for input core code and input handlers with drivers belonging to one of the sub-directories. Signed-off-by: Dmitry Torokhov commit 0a4dfa5ddb5fc0aff331e255da282b01a74a6cd3 Author: Daniel De Graaf Date: Wed Mar 16 22:52:42 2011 -0700 Input: xen-kbdfront - add grant reference for shared page Without a grant reference, full access to the domain's memory is required to use the shared page. Add an additional parameter in xenstore to allow grant mapping to be used. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell Signed-off-by: Dmitry Torokhov commit 8c3c283e6bf463ab498d6e7823aff6c4762314b6 Author: Olaf Hering Date: Wed Mar 16 22:11:46 2011 -0700 Input: xen-kbdfront - advertise either absolute or relative coordinates A virtualized display device is usually viewed with the vncviewer application, either by 'xm vnc domU' or with vncviewer localhost:port. vncviewer and the RFB protocol provides absolute coordinates to the virtual display. These coordinates are either passed through to a PV guest or converted to relative coordinates for a HVM guest. A PV guest receives these coordinates and passes them to the kernels evdev driver. There it can be picked up by applications such as the xorg-input drivers. Using absolute coordinates avoids issues such as guest mouse pointer not tracking host mouse pointer due to wrong mouse acceleration settings in the guests X display. Advertise either absolute or relative coordinates to the input system and the evdev driver, depending on what dom0 provides. The xorg-input driver prefers relative coordinates even if a devices provides both. Signed-off-by: Olaf Hering Signed-off-by: Stefano Stabellini Signed-off-by: Dmitry Torokhov commit 2f40ea9d0743b3cc48190e4ebf3a9f474a8833a2 Merge: 6f168f2 f02726a Author: Olof Johansson Date: Wed Mar 16 23:08:22 2011 -0700 Merge branch 'trimslice/upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux-tegra into boards-for-next commit 92c260f755c42337c550d8ac1f8ccd1b32bffb20 Merge: 8e76a80 05e3475 Author: David Brown Date: Wed Mar 16 22:13:16 2011 -0700 Merge remote branch 'rmk/for-linus' into for-linus * rmk/for-linus: (1557 commits) ARM: 6806/1: irq: introduce entry and exit functions for chained handlers ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas ARM: 6747/1: P2V: Thumb2 support ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9 ARM: 6772/1: errata: possible fault MMU translations following an ASID switch ARM: 6776/1: mach-ux500: activate fix for errata 753970 ARM: 6794/1: SPEAr: Append UL to device address macros. ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files. ARM: 6681/1: SPEAr: add debugfs support to clk API ARM: 6703/1: SPEAr: update clk API support ARM: 6679/1: SPEAr: make clk API functions more generic ARM: 6737/1: SPEAr: formalized timer support ... Conflicts: arch/arm/mach-msm/board-msm7x27.c arch/arm/mach-msm/board-msm7x30.c arch/arm/mach-msm/board-qsd8x50.c arch/arm/mach-msm/board-sapphire.c arch/arm/mach-msm/include/mach/memory.h commit c87a8d8dcd2587c203f3dd8a3c5c15d1e128ec0d Author: Dave Airlie Date: Thu Mar 17 13:58:34 2011 +1000 drm/radeon: fixup refcounts in radeon dumb create ioctl. This was using old gem refcounting methods, fix it to be the same as the normal create ioctl. Signed-off-by: Dave Airlie commit a3a88a668ffe8f9771a525a2b00570f8a4c29286 Author: Paul Bolle Date: Wed Mar 16 22:10:06 2011 +0100 drm: radeon: *_cs_packet_parse_vline() cleanup Simplify the way the return value is set a number of times (mostly on error). Signed-off-by: Paul Bolle Signed-off-by: Dave Airlie commit 3409fc1b22e2717237f9f23112645f5d190cff4d Author: Nicolas Kaiser Date: Wed Mar 16 17:08:04 2011 +0100 radeon: merge list_del()/list_add_tail() to list_move_tail() Merge list_del() + list_add_tail() to list_move_tail(). Signed-off-by: Nicolas Kaiser Signed-off-by: Dave Airlie commit b04d0a90908cdb733e490486287e1ba8c568ffb0 Merge: 054cfaa c816be7 Author: Linus Torvalds Date: Wed Mar 16 20:41:28 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (33 commits) sparc32: Fix might-be-used-uninitialized warning in do_sparc_fault(). sparc: Fix .size directive for do_int_load sparc64: Fix build errors with gcc-4.6.0 sparc32,sun4m: percpu and global register definitions moved to irq.h sparc32: introduce build_device_irq sparc32: introduce sparc_irq_config sparc32: fix build with leon or floppy enabled sparc: convert to clocksource_register_hz/khz sparc64: Sharpen address space randomization calculations. sparc32: irq_32.c cleanup sparc32, sun4d: add comment in empty statement in sun4d_request_irq() sparc32,sun4d: drop unused code in sun4d_distribute_irqs() sparc32,sun4d: irq, smp files cleanup sparc32,sun4m: irq, smp files cleanup sparc32,sun4c: irq file cleanup sparc32: add irq + smp declarations to headers sparc32: remove tick14.c sparc32/leon: FPU-FSR only available when FPU present SPARC/LEON: power down instruction different of different LEONs sparc32: added U-Boot build target: uImage ... commit 054cfaacf88865bff1dd58d305443d5d6c068a08 Merge: dc113c1 1a102ff Author: Linus Torvalds Date: Wed Mar 16 19:09:57 2011 -0700 Merge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: vfs: bury ->get_sb() nfs: switch NFS from ->get_sb() to ->mount() nfs: stop mangling ->mnt_devname on NFS vfs: new superblock methods to override /proc/*/mount{s,info} nfs: nfs_do_{ref,sub}mount() superblock argument is redundant nfs: make nfs_path() work without vfsmount nfs: store devname at disconnected NFS roots nfs: propagate devname to nfs{,4}_get_root() commit dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac Merge: 63a9369 059718d Author: Linus Torvalds Date: Wed Mar 16 19:08:03 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast m68k/atari: ARAnyM - Add support for network access m68k/atari: ARAnyM - Add support for console access m68k/atari: ARAnyM - Add support for block access m68k/atari: Initial ARAnyM support m68k: Kconfig - Remove unneeded "default n" m68k: Makefiles - Change to new flags variables m68k/amiga: Reclaim Chip RAM for PPC exception handlers m68k: Allow all kernel traps to be handled via exception fixups m68k: Use base_trap_init() to initialize vectors m68k: Add helper function handle_kernel_fault() commit 63a93699c6a58795b854ff573542a08367684dae Merge: 16d8775 21bd6d3 Author: Linus Torvalds Date: Wed Mar 16 19:05:40 2011 -0700 Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm * 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6629/2: aaec2000: remove support for mach-aaec2000 ARM: lh7a40x: remove unmaintained platform support Fix up trivial conflicts in - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed) - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added) commit 16d8775700f1815076f879719ce14b33f50a3171 Merge: e345513 05e3475 Author: Linus Torvalds Date: Wed Mar 16 19:03:06 2011 -0700 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (91 commits) ARM: 6806/1: irq: introduce entry and exit functions for chained handlers ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas ARM: 6747/1: P2V: Thumb2 support ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9 ARM: 6772/1: errata: possible fault MMU translations following an ASID switch ARM: 6776/1: mach-ux500: activate fix for errata 753970 ARM: 6794/1: SPEAr: Append UL to device address macros. ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files. ARM: 6681/1: SPEAr: add debugfs support to clk API ARM: 6703/1: SPEAr: update clk API support ARM: 6679/1: SPEAr: make clk API functions more generic ARM: 6737/1: SPEAr: formalized timer support ... commit e34551339a195aa548eaf698523714a8fe7f1984 Merge: 242e5d0 47e0c7e Author: Linus Torvalds Date: Wed Mar 16 19:02:36 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (41 commits) m68knommu: external interrupt support to ColdFire intc-simr controller m68knommu: external interrupt support to ColdFire intc-2 controller m68knommu: remove ColdFire CLOCK_DIV config option m68knommu: fix gpio warnings for ColdFire 5407 targets m68knommu: fix gpio warnings for ColdFire 532x targets m68knommu: fix gpio warnings for ColdFire 5307 targets m68knommu: fix gpio warnings for ColdFire 527x targets m68knommu: fix gpio warnings for ColdFire 5272 targets m68knommu: fix gpio warnings for ColdFire 5249 targets m68knommu: fix gpio warnings for ColdFire 523x targets m68knommu: fix gpio warnings for ColdFire 520x targets m68knommu: fix gpio warnings for ColdFire 5206e targets m68knommu: fix gpio warnings for ColdFire 5206 targets m68knommu: fixing compiler warnings m68knommu: limit interrupts supported by ColdFire intc-simr driver m68knommu: move some init code out of unmask routine for ColdFire intc-2 m68knommu: limit interrupts supported by ColdFire intc-2 driver m68knommu: add basic support for the ColdFire based FireBee board m68knommu: make ColdFire internal peripheral region configurable m68knommu: clean up definitions of ColdFire peripheral base registers ... commit 242e5d06be2ad2633c85313a37862e03f4450a46 Merge: 4c5811b afe997a Author: Linus Torvalds Date: Wed Mar 16 19:01:29 2011 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] tioca: Fix assignment from incompatible pointer warnings [IA64] mca.c: Fix cast from integer to pointer warning [IA64] setup.c Typo fix "Architechtuallly" [IA64] Add CONFIG_MISC_DEVICES=y to configs that need it. [IA64] disable interrupts at end of ia64_mca_cpe_int_handler() [IA64] Add DMA_ERROR_CODE define. pstore: fix build warning for unused return value from sysfs_create_file pstore: X86 platform interface using ACPI/APEI/ERST pstore: new filesystem interface to platform persistent storage commit 289d6b0e287e0acd85f3e6b7ea6c2cb5c234909a Author: GuanXuetao Date: Fri Mar 4 20:00:11 2011 +0800 unicore32: rewrite arch-specific tlb.h to use asm-generic version Signed-off-by: Guan Xuetao commit 1cf46c42d7688a2e09de87fc9201b0e9a0961866 Author: GuanXuetao Date: Fri Mar 4 18:07:48 2011 +0800 unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs 1. remove __REG macro 2. add (void __iomem *) to io_p2v macro 3. add (phys_addr_t) to io_v2p macro 4. add PKUNITY_AHB_BASE and PKUNITY_APB_BASE definitions 5. modify all PKUNITY_mmio_BASEs from physical addr to virtual addr 6. adjust prefix macro for all usage of PKUNITY_mmio_BASEs -- by advice with Arnd Bergmann Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 4fde87cb13a29c06e0b4c2cba86445492098fbc2 Author: GuanXuetao Date: Sun Feb 27 12:46:06 2011 +0800 unicore32: replace unicore32-specific iomap functions with generic lib implementation 1. define and enable CONFIG_GENERIC_IOMAP 2. define unicore32-specific PCI_IOBASE for asm-generic/io.h 3. define HAVE_ARCH_PIO_SIZE and unicore32-specific PIO_* macros 4. remove all unicore32-specific iomap functions Signed-off-by: Guan Xuetao Reviewed-and-Acked-by: Arnd Bergmann commit ce443ab5fd536941da1d529ba3963324f941fc29 Author: GuanXuetao Date: Sat Feb 26 21:39:10 2011 +0800 unicore32 machine related: add frame buffer driver for pkunity-v3 soc change from original version -- by advice of Paul Mundt 1. remove videomemorysize definitions 2. remove unifb_enable and unifb_setup 3. use dev_warn instead of printk in fb driver 4. remove judgement for FB_ACCEL_PUV3_UNIGFX 5. adjust clk_get and clk_set_rate calls 6. add resources definitions 7. remove unifb_option 8. adjust register for platform_device 9. adjust unifb_ops position and unifb_regs assignment position Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit d10e4a660d11212a41ac5d2c116a655e25e2d38a Author: GuanXuetao Date: Sat Feb 26 21:29:29 2011 +0800 unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc change from original version -- by advice of Jean Delvare 1. remove global variable i2c_reg, replaced by local variables 2. replace ENXIO with ENODEV when no platform resources 3. add adapter->nr assignment before i2c_add_numbered_adapter() call 4. add judgement for i2c_del_adapter() return value 5. release adapter when driver removed 6. add __devexit for puv3_i2c_remove() function 7. modify several names to more appropriated ones Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit e5abf78b57199a417eb01ff922a5ea6ff9e10b61 Author: GuanXuetao Date: Sat Feb 26 21:21:18 2011 +0800 unicore32 io: redefine __REG(x) and re-use readl/writel funcs -- by advice of Arnd Bergmann Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 4517366d870b89d6fb8c0c90deb6c73d975908af Author: GuanXuetao Date: Fri Feb 25 17:58:00 2011 +0800 unicore32 i8042 upgrade and bugfix: adjust resource request region type Signed-off-by: Guan Xuetao commit 4ef2ec63cc5117d099960c49910533e467942e27 Author: GuanXuetao Date: Tue Feb 22 17:34:47 2011 +0800 unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call Signed-off-by: Guan Xuetao commit 3838b82c0a6806daf820acacf02cd9aefe9df7b8 Author: GuanXuetao Date: Fri Feb 18 18:38:33 2011 +0800 unicore32 i8042: adjust io funcs of i8042-unicore32io.h replace inb/outb with readb/writeb in i8042-unicore32io.h and correct typecasting of register and region macros -- by advice with Arnd Bergmann Signed-off-by: Guan Xuetao commit bd42aa75b4231b5fd3742de4c4b84ad590a7d654 Author: GuanXuetao Date: Sat Feb 26 20:49:47 2011 +0800 unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE for the term IOSPACE normally refers to the PCI PIO space -- by advice with Arnd Bergmann Signed-off-by: Guan Xuetao commit 36a8b8c399480b5388ddd198ead78c9dd0e50df0 Author: GuanXuetao Date: Thu Feb 17 19:15:36 2011 +0800 unicore32: modify function names and parameters for irq_chips -- by advice with Thomas Gleixner Signed-off-by: Guan Xuetao commit 3ab457cadd15bb388b200813222af1d5fb71c9d6 Author: GuanXuetao Date: Thu Feb 17 19:06:59 2011 +0800 unicore32: remove unused lines in arch/unicore32/include/asm/irq.h Signed-off-by: Guan Xuetao commit c816be7b5f24585baa9eba1f2413935f771d6ad6 Author: David S. Miller Date: Wed Mar 9 13:00:47 2011 -0800 sparc32: Fix might-be-used-uninitialized warning in do_sparc_fault(). When we try to handle vmalloc faults, we can take a code path which uses "code" before we actually set it. Amusingly gcc-3.3 notices this yet gcc-4.x does not. Reported-by: Bob Breuer Signed-off-by: David S. Miller commit a913a8234bb812d21bb0f75c2458f9eb941ddf91 Author: GuanXuetao Date: Thu Feb 17 17:50:43 2011 +0800 unicore32 time.c: change calculate method for clock_event_device apply clockevents_calc_mult_shift() to get rid of shift assignment and mult calculation for osmr0 -- by advice with Thomas Gleixner Signed-off-by: Guan Xuetao commit b31d82737d068bf7ff8ed4592914c8fd7fdb51f0 Author: GuanXuetao Date: Sun Jan 16 00:35:49 2011 +0800 unicore32: ADD MAINTAINER for unicore32 architecture Add MAINTAINER list for unicore32 architecture and pkunity soc drivers. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 35043c428f1fcb92feb5792f5878a8852ee00771 Author: Ben Hutchings Date: Wed Mar 9 12:54:27 2011 -0800 sparc: Fix .size directive for do_int_load gas used to accept (and ignore?) .size directives which referred to undefined symbols, as this does. In binutils 2.21 these are treated as errors. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 425ad52b86d9710719b3aa811d6cab56b3852981 Author: GuanXuetao Date: Sat Jan 15 18:28:19 2011 +0800 unicore32 machine related files: ps2 driver This patch implements arch-specific ps2 driver. By reviewed with Dmitry Torokhov: 1. move i8042-ucio.h to drivers/input/serio/i8042-unicore32io.h 2. move puv3_ps2_init() to arch/unicore32/kernel/puv3-core.c 3. remove unused comments. Signed-off-by: Guan Xuetao Acked-by: Dmitry Torokhov commit c6fee0810df4e0f4cf9c4834d2569ca01c02cffc Author: David S. Miller Date: Sat Feb 26 23:40:02 2011 -0800 sparc64: Fix build errors with gcc-4.6.0 Most of the warnings emitted (we fail arch/sparc file builds with -Werror) were legitimate but harmless, however one case (n2_pcr_write) was a genuine bug. Based almost entirely upon a patch by Sam Ravnborg. Reported-by: Dennis Gilmore Signed-off-by: David S. Miller commit 700598cef866011b878f389c30414d31fa5bb87b Author: GuanXuetao Date: Sat Jan 15 18:25:14 2011 +0800 unicore32 machine related files: pci bus handling This patch implements arch-specific pci bus driver. Signed-off-by: Guan Xuetao commit 0399bb5b918bd8ffbf065a3db142ff121aaa18e0 Author: Sam Ravnborg Date: Fri Feb 25 23:02:11 2011 -0800 sparc32,sun4m: percpu and global register definitions moved to irq.h entry.S access percpu + global data defined in sun4m_irq.c - so move the types to irq.h. This makes sparse happy and allow us to utilize asm-offsets later. Also updated a few comments in the sun4m_irq.c file. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit b08b4f8e63e60a64f81e194269be14afee396f33 Author: GuanXuetao Date: Sat Feb 26 20:08:36 2011 +0800 unicore32 machine related files: hardware registers This patch adds all hardware registers definitions. Signed-off-by: Guan Xuetao commit 1d05995b0880b23353741d5b2b826f7c2fd6a296 Author: Sam Ravnborg Date: Fri Feb 25 23:01:19 2011 -0800 sparc32: introduce build_device_irq build_device_irq() is used to encapsulate the plaform specific details when we build an irq. For now the default is a simple 1:1 but sun4d differs. This patch refactors functionality - but does not change the existing functionality. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit fa7499ef77db8d535e3c609c8064e9ee50c0693c Author: GuanXuetao Date: Sat Feb 26 19:51:18 2011 +0800 unicore32 machine related files: core files This patch adds machine related core files, also including build infrastructure. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 70fac51feaf2ca50c84e102e2a2699eb19ef24bd Author: GuanXuetao Date: Sat Jan 15 18:23:31 2011 +0800 unicore32 additional architecture files: boot process This patch implements booting process, including uncompression process. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit bbdc2661eabddd442240533a66b2290f77d89ccc Author: Sam Ravnborg Date: Fri Feb 25 23:00:19 2011 -0800 sparc32: introduce sparc_irq_config sparc_irq_config is used to hold the platform specific irq setup. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 96cf5185a95e0b304596fe19edcf8dfcd5c10699 Author: GuanXuetao Date: Sat Jan 15 18:23:09 2011 +0800 unicore32 additional architecture files: low-level lib: misc This patch implements the rest low-level libraries. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit a2a211cb55f0f3d13d791f3d2adccc96032e6846 Author: Sam Ravnborg Date: Fri Feb 25 22:59:20 2011 -0800 sparc32: fix build with leon or floppy enabled Add a few includes back required to build with floppy enabled Fix declaration of trapbase_cpu* so it is now consistent Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 77c93b2f2388b974253af4149aa025b4751f92ad Author: GuanXuetao Date: Sat Feb 26 18:49:26 2011 +0800 unicore32 additional architecture files: low-level lib: uaccess This patch implements low-level uaccess libraries. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 81043e811191b5ccc1e6c170ed26f4ac8388834f Author: John Stultz Date: Wed Feb 23 13:08:21 2011 -0800 sparc: convert to clocksource_register_hz/khz This converts the sparc clocksources to use clocksource_register_hz/khz Signed-off-by: John Stultz Signed-off-by: David S. Miller commit 28bab059a23aac6bb129b307410e5b63e132a290 Author: GuanXuetao Date: Sat Jan 15 18:22:19 2011 +0800 unicore32 additional architecture files: low-level lib: ocd debug This patch implements low-level debug libraries with On-Chip-Debugger hardware support. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 5a0efea09f42f7c92bd98a38d66b4dff9589266b Author: David S. Miller Date: Fri Feb 18 14:06:47 2011 -0800 sparc64: Sharpen address space randomization calculations. A recent patch to the x86 randomization code caused me to take a quick look at what we do on sparc64, and in doing so I noticed that we sometimes calculate a non-page-aligned randomization value and stick it into mmap_base. I also noticed that since I copied the logic over from PowerPC, the powerpc code has tweaked the randomization ranges in ways that would benefit us as well. For one thing, we should allow up to at least 8MB of randomization otherwise huge-page regions when HPAGE_SIZE is 4MB never randomize at all. And on the 64-bit side we were using up to 4GB. Tone it down to 1GB as 4GB can result in a lot of address space wastage. Finally, make sure all computations are unsigned. Signed-off-by: David S. Miller commit 6dea1ba1c82013c108d235ec32c6d8bd9ff6b48d Author: GuanXuetao Date: Sat Jan 15 18:21:56 2011 +0800 unicore32 additional architecture files: ptrace handling This patch adds ptrace support. Changed from previous version: 1. disable arch_has_single_step and remove single-step instruction handler 2. add 'Ross Biro 1/23/92' contributor information 3. clean unused codes Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit fd49bf48cac7126a8311592bea56518529a223e2 Author: Sam Ravnborg Date: Fri Jan 28 22:08:24 2011 +0000 sparc32: irq_32.c cleanup - drop filename in file header - drop unused includes - add KERN_* to printk - fix spaces => tabs - add spaces after reserved words - drop all externs, they are now in header files Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit d9bc15794d122cb7bdc9a069d22f3d3166dd31d4 Author: GuanXuetao Date: Sat Jan 15 18:21:31 2011 +0800 unicore32 additional architecture files: float point handling This patch implements support for float point unit, which using UniCore-F64 FPU hardware in UniCore32 ISA. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 70044df4111e1afbff91a731785673aeb42a34fd Author: Sam Ravnborg Date: Fri Jan 28 22:08:23 2011 +0000 sparc32, sun4d: add comment in empty statement in sun4d_request_irq() This looked like a bug to me. Add a comment so next reader is hopefully less confused. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 64909882862e9bb88aa6177e3f92056f5601b3e3 Author: GuanXuetao Date: Sat Feb 26 20:23:59 2011 +0800 unicore32 additional architecture files: pm related files This patch adds pm related files, including hibernate and sleep supports. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit a625a12a763fa5cfe9775aa354790782d89efb6f Author: Sam Ravnborg Date: Fri Jan 28 22:08:22 2011 +0000 sparc32,sun4d: drop unused code in sun4d_distribute_irqs() The preprocessor symbol was not defined and the code was therefore not in use. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit f864d2f8304e6be90b4c4e4ac615edc6fcefd4c1 Author: GuanXuetao Date: Sat Jan 15 18:20:01 2011 +0800 unicore32 core architecture: signals handling This patch implements signals. Signed-off-by: Guan Xuetao commit e54f8548ff5285f57125c08d8092eec38dd05e0d Author: Sam Ravnborg Date: Fri Jan 28 22:08:21 2011 +0000 sparc32,sun4d: irq, smp files cleanup - drop filename in file header - drop unused includes - add description of sun4d interrupts (from davem) - add KERN_* to printk - fix spaces => tabs - add spaces after reserved words - fix indent of a whole code block in smp4d_boot_one_cpu() Note: two printk() was updated from debug to KERN_INFO in this code block - drop all externs, they are now in header files This is partly based on a patch from: David Miller Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 752bcb4d02ccfd5e7a8d810424154169b4cca8ae Author: GuanXuetao Date: Sat Jan 15 18:19:35 2011 +0800 unicore32 core architecture: interrupts ang gpio handling This patch implements interrupts and gpio handling. UniCore32 has 9 gpio interrupt sources. And gpio device operations are also here. Signed-off-by: Guan Xuetao commit 02b2ee16cc31df2b23d6f6c68a597d947f6c10e8 Author: GuanXuetao Date: Sat Jan 15 18:19:03 2011 +0800 unicore32 core architecture: timer and time handling This patch implements timer and time. RTC and PWM device drivers are also here. Signed-off-by: Guan Xuetao commit aba20a8295a76310cd062be0736103ba5aee34fa Author: Sam Ravnborg Date: Fri Jan 28 22:08:20 2011 +0000 sparc32,sun4m: irq, smp files cleanup - drop filename in file header - drop unused includes - add description of sun4m interrupts (from davem) - add KERN_* to printk - fix spaces => tabs - add spaces after reserved words - drop all externs, they are now in header files This is partly based on a patch from: David Miller Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 10c9c10c31514564b09c153432a42ffaea3ce831 Author: GuanXuetao Date: Sat Jan 15 18:18:29 2011 +0800 unicore32 core architecture: mm related: consistent device DMA handling This patch implements consistent device DMA handling of memory management. DMA device operations are also here. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit e787098cfe69dad4e7cccf50352e830f539cd50a Author: Sam Ravnborg Date: Fri Jan 28 22:08:19 2011 +0000 sparc32,sun4c: irq file cleanup - drop filename in header - drop unused includes - add description of sun4c interrupts (from davem) - add spaces after reserved words This is partly based on a patch from: David Miller Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 56372b0b2f533c9a25bd40a0577405f6ddb7cff2 Author: GuanXuetao Date: Sat Jan 15 18:17:56 2011 +0800 unicore32 core architecture: mm related: fault handling This patch implements fault handling of memory management. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit b7afdb7e85d97294efa24fbfef7b1fa196ca808c Author: Sam Ravnborg Date: Fri Jan 28 22:08:18 2011 +0000 sparc32: add irq + smp declarations to headers In preparation for cleaning up a number of files add declarations for irq and smp related data/functions to the relevant headers. This showed that the extern declaration of cputypval differed in the two files where it was used. As cputypval is defined like this: cputypval: .asciz "sun4c" the correct representation is a char array. Fix users to use the new declaration. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit b50f1704e9c441c58cf6dc05e72953ca30e1d4d2 Author: GuanXuetao Date: Sat Jan 15 18:16:59 2011 +0800 unicore32 core architecture: mm related: generic codes This patch includes generic codes for memory management. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit e046b1e978f82e29da7670d6d680567e30dec69a Author: Sam Ravnborg Date: Fri Jan 28 22:08:17 2011 +0000 sparc32: remove tick14.c The two methods included in tick14.c was nop because the static variable linux_lvl14 was always NULL. So remove the file and callers. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit f73670e8a55c11d47c28dca35dc4bc7dfbd4e6eb Author: GuanXuetao Date: Sat Jan 15 18:16:21 2011 +0800 unicore32 core architecture: process/thread related codes This patch implements process/thread related codes. Backtrace and stacktrace are here. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 141c943fd4b323bae2b47f67743dba96134afb1f Author: GuanXuetao Date: Sat Jan 15 18:15:45 2011 +0800 unicore32 core architecture: low level entry and setup codes This patch implements low level entry and setup codes. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 79725df5786d2fa48f582b116ea1d74193cc96ca Author: GuanXuetao Date: Sat Jan 15 18:15:01 2011 +0800 unicore32 core architecture: processor and system headers This patch includes processor and system headers. System call interface is here. We used the syscall interface the same as asm-generic version. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 2666e476022c678b3758e753b20c22ca598dc73f Author: Daniel Hellstrom Date: Wed Jan 26 06:37:05 2011 +0000 sparc32/leon: FPU-FSR only available when FPU present Signed-off-by: Daniel Hellstrom Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit 87c1a3fb7c07322dfd63a63dd6d42339ad52ddee Author: GuanXuetao Date: Sat Jan 15 18:13:50 2011 +0800 unicore32 core architecture: generic elf and ksyms stuff This patch includes some generic stuff including elf and ksyms. Because all one-line asm-generic headers are auto-generated by ASM_GENERIC_HEADERS in arch/unicore32/Makefile, so the rest seems very little. ELF handling functions and module handling functions are also here. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 790edb61c0d87d1f1daafcaaa8f7c66b7b82bdad Author: GuanXuetao Date: Sat Feb 26 18:24:56 2011 +0800 unicore32 core architecture: build infrastructure This patch implements build infrastructure. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 7f509a9ef7af0d6ac852d49eb87ed2b9857821cc Author: GuanXuetao Date: Sat Jan 15 18:08:09 2011 +0800 asm-generic headers: add arch-specific __strnlen_user calling in uaccess.h This patch changes the implementation of strnlen_user in include/asm-generic/uaccess.h. Originally, it calls strlen() function directly, which may not correctly handle the access of user space in most mmu-enabled architectures. New __strnlen_user is added for using as an architecture specific function. Signed-off-by: Guan Xuetao Reviewed-by: Arnd Bergmann commit 7279b82cb1975ba4e337a549757f17418cfdffad Author: Daniel Hellstrom Date: Thu Jan 27 01:26:58 2011 +0000 SPARC/LEON: power down instruction different of different LEONs The way a LEON is powered down is implemented differently depending on CHIP type. The AMBA Plug&Play system ID tells revision of GRLIB and CHIP. This is for example needed by the GR-LEON4-ITX board and the UT699. Previously the power down support for LEON was limited to SMP, now both SMP and UP systems use the instruction. Signed-off-by: Daniel Hellstrom Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit 38f5bf84bd588a82890f5ab32cba3317555a73e1 Author: GuanXuetao Date: Sat Jan 15 18:07:08 2011 +0800 asm-generic headers: add ftrace.h This patch adds ftrace.h into asm-generic headers. The file content could be empty in most architectures. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 684151a75bf25f5aeb8a23010da91a34e17b7353 Author: Daniel Hellstrom Date: Wed Jan 26 06:36:35 2011 +0000 sparc32: added U-Boot build target: uImage This is only for LEON as u-boot for SPARC only supports LEON. Signed-off-by: Daniel Hellstrom Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit d232b128e28f54cd8811dd4f6d8b72ffb12cc0a1 Author: GuanXuetao Date: Sat Jan 15 18:06:44 2011 +0800 asm-generic headers: add sizes.h This patch adds sizes.h into asm-generic headers. Only 32-bit version supported. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 44ed3c0c47906297924c3fde801dc160f6996f7c Author: Sam Ravnborg Date: Sat Jan 22 11:32:20 2011 +0000 sparc64: rename virt_irq => irq - II The generic irq support uses the term 'irq' for the allocated irq number. Fix it so sparc64 use the same term for an irq as the generic irq support does. For a naive reader this is less confusing. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 7dc59bdde7063323b6a70c2f0fadb399ede8038d Author: GuanXuetao Date: Tue Feb 22 19:06:43 2011 +0800 asm-generic: fix inX/outX functions for architectures that have PCI The definitions for the PC-style PIO functions in asm-generic/io.h were meant as dummies so you could compile code on architectures without ISA and PCI buses. However, unicore32 actually wants to use them with a real PCI bus, so they need to be defined to actually address the register window holding the I/O ports. Signed-off-by: Arnd Bergmann commit fe41493f749797f516deb84ba07747fb7d8c04c1 Author: Sam Ravnborg Date: Sat Jan 22 11:32:19 2011 +0000 sparc64: rename virt_irq => irq - I The generic irq support uses the term 'irq' for the allocated irq number. Fix it so sparc64 use the same term for an irq as the generic irq support does. For a naive reader this is less confusing. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 4832b992553ef6c714c604809d9d3f0f4d137b7e Author: Sam Ravnborg Date: Sat Jan 22 11:32:18 2011 +0000 sparc64: use up-to-data genirq functions Drop all uses of deprecated genirq features. The irq_set_affinity() call got a third paramter 'force' which is unused. For now genirq does not use this paramter and it is ignored by sparc. Signed-off-by: Sam Ravnborg Cc: Thomas Gleixner Cc: Josip Rodin Signed-off-by: David S. Miller commit e6ebd529e4a6ddac43bc447f39d1f8a0e4d79864 Author: Sam Ravnborg Date: Sat Jan 22 11:32:17 2011 +0000 sparc64: use {get,set}_irq_data for handler_data {get,set}_irq_data uses the member "handler_data" in irq_data which fits the naem of the datatype. The change has no functional impact Signed-off-by: Sam Ravnborg Cc: Thomas Gleixner Signed-off-by: David S. Miller commit cae78728003e41e9346b92f9a1cc5ca3c3e5e70e Author: Sam Ravnborg Date: Sat Jan 22 11:32:16 2011 +0000 sparc64: all pointers to irq_handler_data renamed to handler_data In preparation of moving to use irq_data.handler_data rename all pointers to irq_handler_data "handler_data". This will also prevent name clash when we introduce the new irq methods. Signed-off-by: Sam Ravnborg Cc: Thomas Gleixner Signed-off-by: David S. Miller commit d4d1ec48c4b1568338931bf8e7833543b78ec9d5 Author: Sam Ravnborg Date: Sat Jan 22 11:32:15 2011 +0000 sparc: in handler_irq() rename irq parameter to pil The generic irq support uses "irq" to identify the virtual irq number. To avoid confusion rename the argument to handler_irq() to pil to match the name of the parameter in the PCR register. Signed-off-by: Sam Ravnborg Cc: Thomas Gleixner Signed-off-by: David S. Miller commit 9f2264aca01888999d3946bd3ce1209b199c6e5d Author: Sam Ravnborg Date: Sat Jan 22 11:32:14 2011 +0000 sparc64: fix direct access to irq_desc GENERIC_HARDIRQS_NO_DEPRECATED require us to access data via irq_data. No functional changes as data has same layout due to use of union Signed-off-by: Sam Ravnborg Cc: Thomas Gleixner Signed-off-by: David S. Miller commit 0c7c6a3c05f1d6d7e99fff0ca4056dce3ce07484 Author: Kristoffer Glembo Date: Tue Jan 18 04:10:29 2011 +0000 sparc: Fix sbus_alloc_coherent error handling. Order of kfree and free_pages were swapped in the error handling. Signed-off-by: Kristoffer Glembo Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit 7feee249d47f950a19ca142660ee41fe27b04b27 Author: Kristoffer Glembo Date: Tue Jan 18 04:10:28 2011 +0000 sparc: Make mmu_inval_dma_area take void * instead of unsigned long to minimize casts. Signed-off-by: Kristoffer Glembo Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit 1b19274083d67f66ce3097c8d2bebc22b7911e3f Author: Kristoffer Glembo Date: Tue Jan 18 04:10:27 2011 +0000 sparc/leon: Make mmu_inval_dma_area flush dcache for LEONs without snooping enabled. Signed-off-by: Kristoffer Glembo Signed-off-by: David S. Miller commit 1830474696bb01a77a3cfff477c34e0aa087ecce Author: Kristoffer Glembo Date: Tue Jan 18 04:10:26 2011 +0000 sparc/leon: Add LEON dma_ops. This patch sets the dma_ops structure for LEON. It reuses the pci32_dma_ops. Signed-off-by: Kristoffer Glembo Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit b8682cefb861c61ced6ca2300a5ef96e91c6dbff Author: Kristoffer Glembo Date: Tue Jan 18 04:10:25 2011 +0000 sparc: Add pci32_unmap_page. Signed-off-by: Kristoffer Glembo Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit 5c8345bbe8e7cfd5bfa59f0e1fcef2e12a28e430 Author: Kristoffer Glembo Date: Tue Jan 18 04:10:24 2011 +0000 sparc: Replace open coded page alignment with PAGE_ALIGN macro. Signed-off-by: Kristoffer Glembo Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit 4c5811bf463b0ef82fabbd1708f8bb2d753aeb18 Merge: f74b944 9f15444 Author: Linus Torvalds Date: Wed Mar 16 17:28:10 2011 -0700 Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits) tty: serial: altera_jtaguart: Add device tree support tty: serial: altera_uart: Add devicetree support dt: eliminate of_platform_driver shim code dt: Eliminate of_platform_{,un}register_driver dt/serial: Eliminate users of of_platform_{,un}register_driver dt/usb: Eliminate users of of_platform_{,un}register_driver dt/video: Eliminate users of of_platform_{,un}register_driver dt/net: Eliminate users of of_platform_{,un}register_driver dt/sound: Eliminate users of of_platform_{,un}register_driver dt/spi: Eliminate users of of_platform_{,un}register_driver dt: uartlite: merge platform and of_platform driver bindings dt: xilinx_hwicap: merge platform and of_platform driver bindings ipmi: convert OF driver to platform driver leds/leds-gpio: merge platform_driver with of_platform_driver dt/sparc: Eliminate users of of_platform_{,un}register_driver dt/powerpc: Eliminate users of of_platform_{,un}register_driver dt/powerpc: move of_bus_type infrastructure to ibmebus drivercore/dt: add a match table pointer to struct device dt: Typo fix. altera_ps2: Add devicetree support ... commit f74b9444192c60603020c61d7915b72893137edc Merge: 7a63628 4ba8216 Author: Linus Torvalds Date: Wed Mar 16 17:21:00 2011 -0700 Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl * 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: BKL: That's all, folks fs/locks.c: Remove stale FIXME left over from BKL conversion ipx: remove the BKL appletalk: remove the BKL x25: remove the BKL ufs: remove the BKL hpfs: remove the BKL drivers: remove extraneous includes of smp_lock.h tracing: don't trace the BKL adfs: remove the big kernel lock commit 5623a24a80814fe471e777f12b9dbbb0f77e002e Author: Jiri Kosina Date: Thu Mar 17 00:43:23 2011 +0100 HID: add support for Logitech Driving Force Pro wheel Add force feedback support for Logitech Driving Force Pro wheel. Device IDs reported by Michal Malý. Reported-by: Michal Malý Signed-off-by: Jiri Kosina commit e96838df559ed33df5e05ea013e37741669953cc Author: Jiri Kosina Date: Thu Mar 17 00:39:33 2011 +0100 HID: hid-ortek: remove spurious reference Remove spurious bugzilla reference from the source comment header. Also fix the comment to be more correct (it's HID report descriptor rather than USB). Signed-off-by: Jiri Kosina commit e6e8dd5055a974935af1398c8648d4a9359b0ecb Author: Michal Hocko Date: Wed Mar 16 15:01:37 2011 +0100 doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore commit 6837765963 ("mm: remove CONFIG_UNEVICTABLE_LRU config option") has removed the configoption so we should sync up the doc as well. Signed-off-by: Michal Hocko Signed-off-by: Jiri Kosina commit 05e34754518b6a90d5c392790c032575fab12d66 Merge: bd1274d b511d75 Author: Russell King Date: Wed Mar 16 23:35:27 2011 +0000 Merge branch 'p2v' into devel Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S commit bd1274dc005c2cee41771a7cc616f4709a6e6323 Merge: 1f0090a 3ba6e69 Author: Russell King Date: Wed Mar 16 23:35:26 2011 +0000 Merge branch 'v6v7' into devel Conflicts: arch/arm/include/asm/cacheflush.h arch/arm/include/asm/proc-fns.h arch/arm/mm/Kconfig commit 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd Merge: 2472f3c 10a8c38 Author: Russell King Date: Wed Mar 16 23:35:25 2011 +0000 Merge branch 'misc' into devel Conflicts: arch/arm/Kconfig commit 2472f3c8d8fc18b25b2cf1574c036e238187c0ff Merge: d081377 31bb68a 5dab26a 4e8d763 b6338bd f512626 bf0c111 941aefa f45b114 981a95d 6e266b2 21f47fb Author: Russell King Date: Wed Mar 16 23:35:17 2011 +0000 Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', 'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel commit 270fdc0748bd3f7b625caff985f2fcf8e2185ec7 Author: Herton Ronaldo Krzesinski Date: Wed Mar 16 14:13:53 2011 -0300 HID: add support for Ortek PKB-1700 As reported on http://ubuntuforums.org/showthread.php?t=1594007 the PKB-1700 needs same special handling as WKB-2000. This change is originally based on patch posted by user asmoore82 on the Ubuntu forums. Cc: stable@kernel.org Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Jiri Kosina commit 7a6362800cb7d1d618a697a650c7aaed3eb39320 Merge: 6445ced8 ceda86a Author: Linus Torvalds Date: Wed Mar 16 16:29:25 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits) bonding: enable netpoll without checking link status xfrm: Refcount destination entry on xfrm_lookup net: introduce rx_handler results and logic around that bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag bonding: wrap slave state work net: get rid of multiple bond-related netdevice->priv_flags bonding: register slave pointer for rx_handler be2net: Bump up the version number be2net: Copyright notice change. Update to Emulex instead of ServerEngines e1000e: fix kconfig for crc32 dependency netfilter ebtables: fix xt_AUDIT to work with ebtables xen network backend driver bonding: Improve syslog message at device creation time bonding: Call netif_carrier_off after register_netdevice bonding: Incorrect TX queue offset net_sched: fix ip_tos2prio xfrm: fix __xfrm_route_forward() be2net: Fix UDP packet detected status in RX compl Phonet: fix aligned-mode pipe socket buffer header reserve netxen: support for GbE port settings ... Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c with the staging updates. commit 6445ced8670f37cfc2c5e24a9de9b413dbfc788d Merge: e6bee32 12bb12f Author: Linus Torvalds Date: Wed Mar 16 15:19:35 2011 -0700 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (961 commits) staging: hv: fix memory leaks staging: hv: Remove NULL check before kfree Staging: hv: Get rid of vmbus_child_dev_add() Staging: hv: Change the signature for vmbus_child_device_register() Staging: hv: Get rid of vmbus_cleanup() function Staging: hv: Get rid of vmbus_dev_rm() function Staging: hv: Change the signature for vmbus_on_isr() Staging: hv: Eliminate vmbus_event_dpc() Staging: hv: Get rid of the function vmbus_msg_dpc() Staging: hv: Change the signature for vmbus_cleanup() Staging: hv: Simplify root device management staging: rtl8192e: Don't copy dev pointer to skb staging: rtl8192e: Pass priv to cmdpkt functions staging: rtl8192e: Pass priv to firmware download functions staging: rtl8192e: Pass priv to rtl8192_interrupt staging: rtl8192e: Pass rtl8192_priv to dm functions staging: rtl8192e: Pass ieee80211_device to callbacks staging: rtl8192e: Pass ieee80211_device to callbacks staging: rtl8192e: Pass ieee80211_device to callbacks staging: rtl8192e: Pass ieee80211_device to callbacks ... commit e6bee325e49f17c65c1fd66e9e8b348c85788341 Merge: a5e6b13 6ae705b Author: Linus Torvalds Date: Wed Mar 16 15:11:04 2011 -0700 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits) pch_uart: reference clock on CM-iTC pch_phub: add new device ML7213 n_gsm: fix UIH control byte : P bit should be 0 n_gsm: add a documentation serial: msm_serial_hs: Add MSM high speed UART driver tty_audit: fix tty_audit_add_data live lock on audit disabled tty: move cd1865.h to drivers/staging/tty/ Staging: tty: fix build with epca.c driver pcmcia: synclink_cs: fix prototype for mgslpc_ioctl() Staging: generic_serial: fix double locking bug nozomi: don't use flush_scheduled_work() tty/serial: Relax the device_type restriction from of_serial MAINTAINERS: Update HVC file patterns tty: phase out of ioctl file pointer for tty3270 as well tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile pch_uart: Fix DMA channel miss-setting issue. pch_uart: fix exclusive access issue pch_uart: fix auto flow control miss-setting issue pch_uart: fix uart clock setting issue pch_uart : Use dev_xxx not pr_xxx ... Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied twice, then changes to the same area in one branch) commit a5e6b135bdff649e4330f98e2e80dbb1984f7e77 Merge: 971f115 9d90c8d Author: Linus Torvalds Date: Wed Mar 16 15:05:40 2011 -0700 Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (50 commits) printk: do not mangle valid userspace syslog prefixes efivars: Add Documentation efivars: Expose efivars functionality to external drivers. efivars: Parameterize operations. efivars: Split out variable registration efivars: parameterize efivars efivars: Make efivars bin_attributes dynamic efivars: move efivars globals into struct efivars drivers:misc: ti-st: fix debugging code kref: Fix typo in kref documentation UIO: add PRUSS UIO driver support Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches firmware: Fix unaligned memory accesses in dmi-sysfs firmware: Add documentation for /sys/firmware/dmi firmware: Expose DMI type 15 System Event Log firmware: Break out system_event_log in dmi-sysfs firmware: Basic dmi-sysfs support firmware: Add DMI entry types to the headers Driver core: convert platform_{get,set}_drvdata to static inline functions Translate linux-2.6/Documentation/magic-number.txt into Chinese ... commit 971f115a50afbe409825c9f3399d5a3b9aca4381 Merge: 2e270d8 500132a Author: Linus Torvalds Date: Wed Mar 16 15:04:26 2011 -0700 Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits) USB: Add support for SuperSpeed isoc endpoints xhci: Clean up cycle bit math used during stalls. xhci: Fix cycle bit calculation during stall handling. xhci: Update internal dequeue pointers after stalls. USB: Disable auto-suspend for USB 3.0 hubs. USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol. xhci: Return canceled URBs immediately when host is halted. xhci: Fixes for suspend/resume of shared HCDs. xhci: Fix re-init on power loss after resume. xhci: Make roothub functions deal with device removal. xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports. xhci: Return a USB 3.0 hub descriptor for USB3 roothub. xhci: Register second xHCI roothub. xhci: Change xhci_find_slot_id_by_port() API. xhci: Refactor bus suspend state into a struct. xhci: Index with a port array instead of PORTSC addresses. USB: Set usb_hcd->state and flags for shared roothubs. usb: Make core allocate resources per PCI-device. usb: Store bus type in usb_hcd, not in driver flags. usb: Change usb_hcd->bandwidth_mutex to a pointer. ... commit bdce2595a2f539c6fdedd8f2bd281326b627bba3 Author: Chumbalkar, Nagananda Date: Wed Mar 16 21:37:41 2011 +0000 [CPUFREQ] pcc-cpufreq: remove duplicate statements Remove a couple of assigment statements that appear twice. Signed-off-by: Naga Chumbalkar Signed-off-by: Dave Jones commit 7ca64e2d2859e96a325c28678b5fdb5e17a5764b Author: Rafael J. Wysocki Date: Thu Mar 10 21:13:05 2011 +0100 [CPUFREQ] Remove the pm_message_t argument from driver suspend None of the existing cpufreq drivers uses the second argument of its .suspend() callback (which isn't useful anyway), so remove it. Signed-off-by: Rafael J. Wysocki Signed-off-by: Dave Jones commit 326c86deaed54ad1b364fcafe5073f563671eb58 Author: Thomas Renninger Date: Thu Mar 3 21:31:27 2011 +0100 [CPUFREQ] Remove unneeded locks There cannot be any concurrent access to these through different cpu sysfs files anymore, because these tunables are now all global (not per cpu). I still have some doubts whether some of these locks were needed at all. Anyway, let's get rid of them. Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones CC: cpufreq@vger.kernel.org commit e8951251b89440644a39f2512b4f265973926b41 Author: Thomas Renninger Date: Thu Mar 3 21:31:26 2011 +0100 [CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files Marked deprecated for quite a whilte now... Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones CC: cpufreq@vger.kernel.org commit ef598549b28014ec2ea7574d4e793728e0e33d02 Author: Thomas Renninger Date: Thu Mar 3 21:31:25 2011 +0100 [CPUFREQ] Remove deprecated sysfs file sampling_rate_max Marked deprecated for quite a while now... Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones CC: cpufreq@vger.kernel.org commit 9e91869544fc831d640cae1ffd0313b38657b593 Author: Thomas Renninger Date: Thu Mar 3 21:31:24 2011 +0100 [CPUFREQ] powernow-k8: The table index is not worth displaying and it also is misleading due to another message above which makes the index look like it is the CPU. https://bugzilla.kernel.org/show_bug.cgi?id=24562 Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones CC: cpufreq@vger.kernel.org commit 5cb2c3bd0c5e0f3ced63f250ec2ad59d7c5c626a Author: Vincent Guittot Date: Mon Feb 7 17:14:25 2011 +0100 [CPUFREQ] calculate delay after dbs_check_cpu calculate ondemand delay after dbs_check_cpu call because it can modify rate_mult value use freq_lo_jiffies value for the sub sample period of powersave_bias mode Signed-off-by: Vincent Guittot Signed-off-by: Dave Jones commit 5b95364f6101d67a073a5ec18d726e94e02ca605 Author: Vishwanath BS Date: Tue Jan 25 20:12:41 2011 +0530 [CPUFREQ] Add documentation for sampling_down_factor Update cpufreq governor documentation for sampling_down_factor tunable parameter. Signed-off-by: Vishwanath BS Signed-off-by: Dave Jones commit 2feb690c20d52e22c7874a1e090245e6a4344ce6 Author: Joe Perches Date: Sun Nov 14 19:04:23 2010 -0800 [CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Dave Jones commit 688f869ce3bdc892daa993534dc6df18c95df931 Author: Theodore Ts'o Date: Wed Mar 16 17:16:31 2011 -0400 ext4: Initialize fsync transaction ids in ext4_new_inode() When allocating a new inode, we need to make sure i_sync_tid and i_datasync_tid are initialized. Otherwise, one or both of these two values could be left initialized to zero, which could potentially result in BUG_ON in jbd2_journal_commit_transaction. (This could happen by having journal->commit_request getting set to zero, which could wake up the kjournald process even though there is no running transaction, which then causes a BUG_ON via the J_ASSERT(j_ruinning_transaction != NULL) statement. Signed-off-by: "Theodore Ts'o" commit ead9a638c8f7a4f6471a130c854afafeccbb0824 Merge: db811ca 0724d46 a8da7fe Author: Ben Dooks Date: Wed Mar 16 20:59:01 2011 +0000 Merge branches 'for-2639/i2c/i2c-tegra', 'for-2639/i2c/i2c-mpc' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-1 commit 1a102ff92579edeff5e3d5d3c76ca49977898f00 Author: Al Viro Date: Wed Mar 16 09:07:58 2011 -0400 vfs: bury ->get_sb() This is an ex-parrot. Signed-off-by: Al Viro commit 011949811b946bd3b72fca71200f197c6168a5f8 Author: Al Viro Date: Wed Mar 16 07:25:36 2011 -0400 nfs: switch NFS from ->get_sb() to ->mount() The last remaining instances of ->get_sb() can be converted ->mount() now - nothing in them uses new vfsmount anymore. Signed-off-by: Al Viro commit fd462fb51db46c84bea0fc377c11b9a7e16bc1a0 Author: Al Viro Date: Wed Mar 16 07:05:45 2011 -0400 nfs: stop mangling ->mnt_devname on NFS now we can do that - nobody cares about its value anymore. Signed-off-by: Al Viro commit c7f404b40a3665d9f4e9a927cc5c1ee0479ed8f9 Author: Al Viro Date: Wed Mar 16 06:59:40 2011 -0400 vfs: new superblock methods to override /proc/*/mount{s,info} a) ->show_devname(m, mnt) - what to put into devname columns in mounts, mountinfo and mountstats b) ->show_path(m, mnt) - what to put into relative path column in mountinfo Leaving those NULL gives old behaviour. NFS switched to using those. Signed-off-by: Al Viro commit f8ad9c4bae99854c961ca79ed130a0d11d9ab53c Author: Al Viro Date: Wed Mar 16 06:32:07 2011 -0400 nfs: nfs_do_{ref,sub}mount() superblock argument is redundant It's always equal to dentry->d_sb Signed-off-by: Al Viro commit b514f872f86d4b0c13fed74a1fe1f7ab500c4fd0 Author: Al Viro Date: Wed Mar 16 06:26:11 2011 -0400 nfs: make nfs_path() work without vfsmount part 3: now we have everything to get nfs_path() just by dentry - just follow to (disconnected) root and pick the rest of the thing there. Start killing propagation of struct vfsmount * on the paths that used to bring it to nfs_path(). Signed-off-by: Al Viro commit b1942c5f8cf3bea3a3c88a7498ae4c4361f31afe Author: Al Viro Date: Wed Mar 16 05:44:14 2011 -0400 nfs: store devname at disconnected NFS roots part 2: make sure that disconnected roots have corresponding mnt_devname values stashed into them. Have nfs*_get_root() stuff a copy of devname into ->d_fsdata of the found root, provided that it is disconnected. Have ->d_release() free it when dentry goes away. Have the places where NFS uses ->d_fsdata for sillyrename (and that can *never* happen to a disconnected root - dentry will be attached to its parent) free old devname copies if they find those. Signed-off-by: Al Viro commit 0d5839ad05acd0fe2a84a39f33ac5efdf634a5a5 Author: Al Viro Date: Wed Mar 16 05:27:27 2011 -0400 nfs: propagate devname to nfs{,4}_get_root() step 1 of ->mnt_devname fixes: make sure we have the value of devname available in ..._get_root(). Signed-off-by: Al Viro commit 2e270d84223262a38d4755c61d55f5c73ea89e56 Merge: 0bbf211 60ed8cf Author: Linus Torvalds Date: Wed Mar 16 13:26:17 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: fix cdev leak on O_PATH final fput() commit 60ed8cf78f886753e454b671841c0a3a0e55e915 Author: Miklos Szeredi Date: Wed Mar 16 18:17:54 2011 +0100 fix cdev leak on O_PATH final fput() __fput doesn't need a cdev_put() for O_PATH handles. Signed-off-by: mszeredi@suse.cz Signed-off-by: Al Viro commit ceda86a108671294052cbf51660097b6534672f5 Author: Andy Gospodarek Date: Mon Mar 14 12:05:21 2011 +0000 bonding: enable netpoll without checking link status Only slaves that are up should transmit netpoll frames, so there is no need to check to see if a slave is up before enabling netpoll on it. This resolves a reported failure on active-backup bonds where a slave interface is down when netpoll was enabled. Signed-off-by: Andy Gospodarek Tested-by: WANG Cong Signed-off-by: David S. Miller commit fbd5060875d25f7764fd1c3d35b83a8ed1d88d7b Author: Steffen Klassert Date: Tue Mar 15 21:12:49 2011 +0000 xfrm: Refcount destination entry on xfrm_lookup We return a destination entry without refcount if a socket policy is found in xfrm_lookup. This triggers a warning on a negative refcount when freeeing this dst entry. So take a refcount in this case to fix it. This refcount was forgotten when xfrm changed to cache bundles instead of policies for outgoing flows. Signed-off-by: Steffen Klassert Acked-by: Timo Teräs Signed-off-by: David S. Miller commit 8a4eb5734e8d1dc60a8c28576bbbdfdcc643626d Author: Jiri Pirko Date: Sat Mar 12 03:14:39 2011 +0000 net: introduce rx_handler results and logic around that This patch allows rx_handlers to better signalize what to do next to it's caller. That makes skb->deliver_no_wcard no longer needed. kernel-doc for rx_handler_result is taken from Nicolas' patch. Signed-off-by: Jiri Pirko Reviewed-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit 2d7011ca79f1a8792e04d131b8ea21db179ab917 Author: Jiri Pirko Date: Wed Mar 16 08:46:43 2011 +0000 bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag Since bond-related code was moved from net/core/dev.c into bonding, IFF_SLAVE_INACTIVE is no longer needed. Replace is with flag "inactive" stored in slave structure Signed-off-by: Jiri Pirko Reviewed-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit e30bc066ab67a4c8abcb972227ffe7c576f06a86 Author: Jiri Pirko Date: Sat Mar 12 03:14:37 2011 +0000 bonding: wrap slave state work transfers slave->state into slave->backup (that it's going to transfer into bitfield. Introduce wrapper inlines to do the work with it. Signed-off-by: Jiri Pirko Reviewed-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit 0bd80dad57d82676ee484fb1f9aa4c5e8b5bc469 Author: Jiri Pirko Date: Wed Mar 16 08:45:23 2011 +0000 net: get rid of multiple bond-related netdevice->priv_flags Now when bond-related code is moved from net/core/dev.c into bonding code, multiple priv_flags are not needed anymore. So let them rot. Signed-off-by: Jiri Pirko Reviewed-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit f1c1775ac7e61950225925c949045406ffcb43de Author: Jiri Pirko Date: Sat Mar 12 03:14:35 2011 +0000 bonding: register slave pointer for rx_handler Register slave pointer as rx_handler data. That would eventually prevent need to loop over slave devices to find the right slave. Use synchronize_net to ensure that bond_handle_frame does not get slave structure freed when working with that. Signed-off-by: Jiri Pirko Reviewed-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit c888385a0d61c4c6923ecc3b9dacfe8a1d8cb222 Author: Ajit Khaparde Date: Wed Mar 16 08:21:00 2011 +0000 be2net: Bump up the version number Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit d2145cde58135dabe7c48a599de4b81c2fe3ea61 Author: Ajit Khaparde Date: Wed Mar 16 08:20:46 2011 +0000 be2net: Copyright notice change. Update to Emulex instead of ServerEngines Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 5d03078a6804bf4c7f943c5b68bef80468c0717f Author: Eric Dumazet Date: Wed Mar 16 05:16:57 2011 +0000 e1000e: fix kconfig for crc32 dependency ERROR: "crc32_le" [drivers/net/e1000e/e1000e.ko] undefined! Reported-by: Frank Peters Signed-off-by: Eric Dumazet Cc: Bruce Allan Cc: Jeff Kirsher Signed-off-by: David S. Miller commit ee0caa79569a9c44febc18480beef4847aa8cecd Merge: f942dc2 400b871 Author: David S. Miller Date: Wed Mar 16 11:12:57 2011 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 059718d572e8ad388313b863aff717623bb2552f Author: Geert Uytterhoeven Date: Fri Jan 7 13:24:00 2011 +0100 m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast amiga_chip_alloc() returns a void *, so we don't need a cast. Also clean up coding style while we're at it. Signed-off-by: Geert Uytterhoeven commit 9cd7b148312f6971f37cfac6a490688286bd1522 Author: Milan Jurik Date: Tue Nov 18 21:02:18 2008 +0100 m68k/atari: ARAnyM - Add support for network access [petr: Second author] [michael, geert: Cleanups and updates] Signed-off-by: Milan Jurik Signed-off-by: Petr Stehlik Signed-off-by: Michael Schmitz Signed-off-by: Geert Uytterhoeven Cc: netdev@vger.kernel.org commit 37b0b65f6362269a4cb86ed8be1c0ac8caa497f8 Author: Roman Zippel Date: Tue Nov 18 21:02:19 2008 +0100 m68k/atari: ARAnyM - Add support for console access [geert: Cleanups and updates] Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Acked-by: Petr Stehlik commit b2edd2fd9b10c0cfc5a305eaf91587e6142b08f9 Author: Roman Zippel Date: Tue Nov 18 21:02:19 2008 +0100 m68k/atari: ARAnyM - Add support for block access [geert: Cleanups and updates] Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Acked-by: Petr Stehlik commit 65cd577d5e61043d1c1aec5812dea8a5c834652d Author: Petr Stehlik Date: Tue Nov 18 21:02:18 2008 +0100 m68k/atari: Initial ARAnyM support Add improved support for running under the ARAnyM emulator (Atari Running on Any Machine - http://aranym.org/). [michael, geert: Cleanups and updates] Signed-off-by: Petr Stehlik Signed-off-by: Michael Schmitz Signed-off-by: Geert Uytterhoeven commit 93ff9542462ba5074fb6b6cd9e27c4fb04d452ec Author: Geert Uytterhoeven Date: Sun Jan 16 19:54:14 2011 +0100 m68k: Kconfig - Remove unneeded "default n" Reported-by: Phillip Lougher Signed-off-by: Geert Uytterhoeven commit 6ba99e0fcfe839ecff973b35f771ed066c11d317 Author: matt mooney Date: Fri Jan 14 06:12:29 2011 -0800 m68k: Makefiles - Change to new flags variables Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y. Signed-off-by: matt mooney Acked-by: WANG Cong Signed-off-by: Geert Uytterhoeven commit f369e3781611e78127c34195659538e37568c79c Author: Geert Uytterhoeven Date: Sun Jan 9 14:19:42 2011 +0100 m68k/amiga: Reclaim Chip RAM for PPC exception handlers On m68k, it doesn't make sense to reserve memory for the PPC exception handlers, and APUS support is dead. Signed-off-by: Geert Uytterhoeven commit cf6da575ad8d86afa591dd78114067bbff448c36 Author: Andreas Schwab Date: Tue Nov 18 21:25:17 2008 +0100 m68k: Allow all kernel traps to be handled via exception fixups This will be needed by the ARAnyM Native Feature initialization code. Also document that the VEC_TRACE check is needed for 68020/30. Signed-off-by: Andreas Schwab Signed-off-by: Geert Uytterhoeven commit f67080884a81f58cf95e25c284e30cbed21122a3 Author: Roman Zippel Date: Tue Nov 18 21:25:17 2008 +0100 m68k: Use base_trap_init() to initialize vectors So basic initialization is all in one place. Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven commit dcdf3a293522e6ef09d8b3650ac1ceec56438e5d Author: Roman Zippel Date: Tue Nov 18 21:25:17 2008 +0100 m68k: Add helper function handle_kernel_fault() Add helper function handle_kernel_fault() in signal.c, so frame_extra_sizes can become static, and to avoid future code duplication. Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven commit 0bbf211975addc2963b63a41a2eac99928365996 Merge: 51e8703 d5fdafd Author: Linus Torvalds Date: Wed Mar 16 10:49:02 2011 -0700 Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra * 'for-linus' of git://android.git.kernel.org/kernel/tegra: (61 commits) ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice ARM: tegra: add PCI Express power gating ARM: tegra: PCIE minor code refactoring ARM: Tegra: DMA: Fail safe if initialization fails ARM: Tegra: Rename clk_dev1/2 to cdev1/2 ARM: Tegra: Rename I2S clocks to match driver name ARM: Tegra: Make tegra_dma_init a postcore_initcall ARM: tegra: add seaboard, wario and kaen boards ARM: tegra: harmony: fix pinmux for MMC slot ARM: tegra: harmony: register sdhci devices ARM: tegra: remove stale nvidia atag handler ARM: tegra: common device resources ARM: tegra: harmony: move over to tegra_gpio_config ARM: tegra: add tegra_gpio_table and tegra_gpio_config ARM: tegra: Hide EMC scaling config behind ARCH_TEGRA ARM: tegra: Fix typo in TEGRA_IRQ_TO_GPIO ARM: tegra: common: Enable core clocks ARM: tegra: timer: Enable timer and rtc clocks ARM: tegra: Move tegra_common_init to tegra_init_early ARM: tegra: clock: prevent accidental disables of cpu clock ... commit 51e8703bdf12e2481b205096c973a3ab6a8ca18b Merge: 1fd06bb 0b9b020 Author: Linus Torvalds Date: Wed Mar 16 10:48:16 2011 -0700 Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze * 'next' of git://git.monstr.eu/linux-2.6-microblaze: (33 commits) microblaze: Do not copy reset vectors/manual reset vector setup microblaze: Fix _reset function microblaze: Fix microblaze init vectors microblaze: Fix circular headers dependency when ftrace is enabled. microblaze: Fix typo in Kconfig microblaze: Add missing export symbols for lib functions microblaze: Fix /dev/zero corruption from __clear_user() microblaze: Convert irq_chip to new functions microblaze: Select GENERIC_HARDIRQS_NO_DEPRECATED microblaze: Remove stale irq_chip.end microblaze: Fix sparse warnings - signal.c microblaze: Fix sparse warning - fault.c microblaze: Fix missing microblaze specific syscalls declaration microblaze: Fix sparse warnings - cache.c microblaze: Fix sparse warning - cpuinfo.h microblaze: Fix sparse warning - unwind.c microblaze: Fix sparse warning - consistent_alloc function microblaze: Fix sparse warnings - ptrace microblaze: Fix sparse warning - sw_exceptions microblaze: Fix sparse warning - timer.c ... commit 1fd06bb1571e2618ae392e2484925bf0dadd7857 Author: Randy Dunlap Date: Tue Mar 15 16:12:30 2011 -0700 sched.c: fix kernel-doc for runqueue_is_locked() Fix kernel-doc warning for runqueue_is_locked(): Warning(kernel/sched.c:664): missing initial short description on line: Signed-off-by: Randy Dunlap Cc: Ingo Molnar Signed-off-by: Linus Torvalds commit bb6405eab2a408c46949b3353ecfa1126caa3af2 Author: Eric B Munson Date: Tue Mar 15 16:12:18 2011 -0700 Documentation: update cgroup pid and cpuset information The cgroup documentation does not specify how a process can be removed from a particular group. This patch adds a note at the end of the simple example about how this is done. Also, some cgroups (like cpusets) require user input before a new group can be used. This is noted in the patch as well. Signed-off-by: Eric B Munson Acked-by: Paul Menage Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit ca3b78aa1672162f93de90cbf5051edea298a290 Author: Federica Teodori Date: Tue Mar 15 16:12:05 2011 -0700 Documentation: file handles are now freed Since file handles are freed, a little amendment to the documentation Signed-off-by: Federica Teodori Acked-by: Rik van Riel Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit aa4862c38b179646cea73adae41e0078ba05bb60 Author: Roland Kammerer Date: Tue Mar 15 16:11:52 2011 -0700 Documentation: update header filename in CodingStyle pr_info() and pr_debug() are in linux/printk.h, not linux/kernel.h. Last updated is unnecessary, we have git for that. Signed-off-by: Roland Kammerer Signed-off-by: Randy Dunlap Acked-by: Harry Wei Signed-off-by: Linus Torvalds commit a994a85543b3edcc117977f72cf8b4935dd0bc39 Author: Rob Landley Date: Tue Mar 15 16:11:41 2011 -0700 Documentation: add devicetree docs index file The device tree infrastructure is being genericized so its documentation moved out of the PowerPC directory. Signed-off-by: Rob Landley Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit a261e6960cfc6b4981bd764ce829ae061f84eb8b Author: Rob Landley Date: Tue Mar 15 16:11:29 2011 -0700 Documentation: remove obsolete files from 00-INDEX Time interpolators were removed in git 1f564ad6d41828 ("[IA64] remove time interpolator"), and Voyager support went away in git b6b6e2b112caf ("Documentation: remove obsolete voyager.txt file") Signed-off-by: Rob Landley Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit b3e96c0c756211e805c6941d4a6e5f6e1995cb6b Author: Shriram Rajagopalan Date: Tue Feb 22 14:59:06 2011 -0800 xen: use freeze/restore/thaw PM events for suspend/resume/chkpt Use PM_FREEZE, PM_THAW and PM_RESTORE power events for suspend/resume/checkpoint functionality, instead of PM_SUSPEND and PM_RESUME. Use of these pm events fixes the Xen Guest hangup when taking checkpoints. When a suspend event is cancelled (while taking checkpoints once/continuously), we use PM_THAW instead of PM_RESUME. PM_RESTORE is used when suspend is not cancelled. See Documentation/power/devices.txt and linux/pm.h for more info about freeze, thaw and restore. The sequence of pm events in a suspend-resume scenario is shown below. dpm_suspend_start(PMSG_FREEZE); dpm_suspend_noirq(PMSG_FREEZE); sysdev_suspend(PMSG_FREEZE); cancelled = suspend_hypercall() sysdev_resume(); dpm_resume_noirq(cancelled ? PMSG_THAW : PMSG_RESTORE); dpm_resume_end(cancelled ? PMSG_THAW : PMSG_RESTORE); Acked-by: Ian Campbell Signed-off-by: Shriram Rajagopalan Signed-off-by: Konrad Rzeszutek Wilk commit 400b871ba623b5e8263a3a43de7b45fab0103a57 Author: Thomas Graf Date: Wed Mar 16 18:32:13 2011 +0100 netfilter ebtables: fix xt_AUDIT to work with ebtables Even though ebtables uses xtables it still requires targets to return EBT_CONTINUE instead of XT_CONTINUE. This prevented xt_AUDIT to work as ebt module. Upon Jan's suggestion, use a separate struct xt_target for NFPROTO_BRIDGE having its own target callback returning EBT_CONTINUE instead of cloning the module. Signed-off-by: Thomas Graf Signed-off-by: Patrick McHardy commit 65d8defe2e13fbebd74f96d2b5ca9aad435e6648 Author: Shyam_Iyer@Dell.com Date: Fri Mar 11 03:35:56 2011 +0530 PCI: label: remove #include of ACPI header to avoid warnings I found that including acpi/apci_drivers.h is not necessary and introduces these warnings: In file included from drivers/pci/pci-label.c:32: include/acpi/acpi_drivers.h:103: warning: ‘struct acpi_device’ declared inside parameter list include/acpi/acpi_drivers.h:103: warning: its scope is only this definition or declaration, which is probably not what you want include/acpi/acpi_drivers.h:107: warning: ‘struct acpi_pci_root’ declared inside parameter list Signed-off-by: Shyam Iyer Signed-off-by: Jesse Barnes commit 07eefe1ca542129c24833c96ceb83b9aaa3b458d Author: Narendra_K@Dell.com Date: Mon Mar 7 12:55:56 2011 -0800 PCI: label: Fix compilation error when CONFIG_ACPI is unset This patch fixes compilation error descibed below introduced by the commit 6058989bad05b82e78baacce69ec14f27a11b5fd drivers/pci/pci-label.c: In function ‘pci_create_firmware_label_files’: drivers/pci/pci-label.c:366:2: error: implicit declaration of function ‘device_has_dsm’ Signed-off-by: Narendra K Signed-off-by: Jesse Barnes commit 41e0e0738cf864f4f49b11aac804496999b311d9 Merge: e7fd3b4 344c21c Author: Linus Torvalds Date: Wed Mar 16 10:14:56 2011 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, AMD: Set ARAT feature on AMD processors x86, quirk: Fix SB600 revision check x86: stop_machine_text_poke() should issue sync_core() x86, amd-nb: Misc cleanliness fixes commit e7fd3b4669f5b835c8afce28425d9f698a558115 Merge: fc82e1d 2ae9d29 Author: Linus Torvalds Date: Wed Mar 16 10:10:02 2011 -0700 Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix binutils-2.21 symbol related build failures x86-64, trampoline: Remove unused variable x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot x86, reboot: Move the real-mode reboot code to an assembly file x86: Make the GDT_ENTRY() macro in safe for assembly x86, trampoline: Use the unified trampoline setup for ACPI wakeup x86, trampoline: Common infrastructure for low memory trampolines Fix up trivial conflicts in arch/x86/kernel/Makefile commit c7853aea57d8e850b0979e7bdcbcabdcbbdd9e37 Author: Kazuhiro SUZUKI Date: Fri Feb 18 14:43:07 2011 -0800 xen: xenbus PM events support Make xenbus frontend device subscribe to PM events to receive suspend/resume/freeze/thaw/restore notifications. Signed-off-by: Kenji Wakamiya Signed-off-by: Kazuhiro Suzuki Signed-off-by: Shriram Rajagopalan Acked-by: Ian Campbell [shriram--minor mods and improved commit message] Signed-off-by: Konrad Rzeszutek Wilk commit afe997a183ecc0be72652c7a5ce2152bdf91724e Merge: 4897313 168f2e1 Author: Tony Luck Date: Wed Mar 16 09:58:31 2011 -0700 Pull pstorev4 into release branch commit 4897313a62cf0b106e9e861bf7350a9cfc0715d0 Merge: 521cb40 b4a6b34 Author: Tony Luck Date: Wed Mar 16 09:57:50 2011 -0700 Pull misc-2.6.39 into release branch commit 433e8327caf9f7c0432b2f2f6684a5b79cfe18e9 Merge: 27b92d4 cc90fd7 Author: Takashi Iwai Date: Wed Mar 16 17:38:46 2011 +0100 Merge branch 'topic/hda' into for-linus commit 27b92d4ff2be2359a21ff4acde5b63563ff720e2 Merge: 5de0ee5 e58a894 Author: Takashi Iwai Date: Wed Mar 16 17:38:41 2011 +0100 Merge branch 'topic/asoc' into for-linus commit 5b7c757d1a8878d49f46c826d6081816935664aa Author: Nicolas Kaiser Date: Wed Mar 16 17:10:11 2011 +0100 ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail() Merge list_del() + list_add_tail() to list_move_tail(). Signed-off-by: Nicolas Kaiser Signed-off-by: Takashi Iwai commit f5e0cec4495398b259b3ede7cbc3ce4bd0e1cef0 Author: Guennadi Liakhovetski Date: Fri Feb 25 16:58:38 2011 +0100 mmc: sh_mmcif: support aggressive clock gating To support MMC aggressive clock gating the driver has to stop the interface clock when the .set_ios() method is called with .clock == 0. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Chris Ball commit b676f0391a5f6816c047cbd1e2ad2a897f3c161a Author: Philip Rakity Date: Sun Feb 13 23:13:09 2011 -0800 mmc: check if mmc cards < 2GB do sector addressing Some TOSHIBA MMC cards only support sector addressing even though the size is < 2GB. According to JEDEC Spec JESD84-A441-1 the ocr register (bits 30, 29) determine byte/sector mode. Use them. Signed-off-by: Philip Rakity Signed-off-by: Chris Ball commit 2f94e55ae5ddad83e661002985d2ea11b6d51d3d Author: Philip Rakity Date: Sun Feb 13 23:12:28 2011 -0800 mmc: core: comment on why sdio_reset is done at init time sdio_reset sends a CMD52 to reset the sdio card. This is highly recommended for sdio cards being reinitialized. Since we do not know if the card is being reinitialized we just send the command. SD/eMMC cards are supposed to ignore the CMD before the CMD0. Document why we are doing this. Signed-off-by: Philip Rakity Signed-off-by: Chris Ball commit fc82e1d59a24cbac01c49d4eb3b28d6abc26a5f4 Merge: 48d5f67 bea3864 Author: Linus Torvalds Date: Wed Mar 16 09:24:44 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (21 commits) PM / Hibernate: Reduce autotuned default image size PM / Core: Introduce struct syscore_ops for core subsystems PM PM QoS: Make pm_qos settings readable PM / OPP: opp_find_freq_exact() documentation fix PM: Documentation/power/states.txt: fix repetition PM: Make system-wide PM and runtime PM treat subsystems consistently PM: Simplify kernel/power/Kconfig PM: Add support for device power domains PM: Drop pm_flags that is not necessary PM: Allow pm_runtime_suspend() to succeed during system suspend PM: Clean up PM_TRACE dependencies and drop unnecessary Kconfig option PM: Remove CONFIG_PM_OPS PM: Reorder power management Kconfig options PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME) PM / ACPI: Remove references to pm_flags from bus.c PM: Do not create wakeup sysfs files for devices that cannot wake up USB / Hub: Do not call device_set_wakeup_capable() under spinlock PM: Use appropriate printk() priority level in trace.c PM / Wakeup: Don't update events_check_enabled in pm_get_wakeup_count() PM / Wakeup: Make pm_save_wakeup_count() work as documented ... commit 48d5f6731837f0ec9a0e19ca763aa17d58385a98 Merge: 0f6e0e8 043332c Author: Linus Torvalds Date: Wed Mar 16 09:24:25 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/cma: Replace global lock in rdma_destroy_id() with id-specific one IB/cm: Cancel pending LAP message when exiting IB_CM_ESTABLISH state IB/cm: Bump reference count on cm_id before invoking callback RDMA/cma: Fix crash in request handlers IB/ipath: Don't reset disabled devices IB/qib: Fix M_Key field in SubnGet and SubnGetResp MADs IB/qib: Set default LE2 value for active cables to 0 RDMA/cxgb4: Debugfs dump_qp() updates RDMA/cxgb4: Dispatch FATAL event on EEH errors RDMA/cxgb4: Use ULP_MODE_TCPDDP RDMA/cxgb4: Enable on-chip SQ support by default RDMA/cxgb4: Do CIDX_INC updates every 1/16 CQ depth CQE reaps RDMA/cxgb4: Remove db_drop_task RDMA/cxgb4: Turn on delayed ACK IB/qib: Return correct MAD when setting link width to 255 commit 0f6e0e8448a16d8d22119ce91d8dd24b44865b51 Merge: 0d2ecee a002951 Author: Linus Torvalds Date: Wed Mar 16 09:15:43 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (33 commits) AppArmor: kill unused macros in lsm.c AppArmor: cleanup generated files correctly KEYS: Add an iovec version of KEYCTL_INSTANTIATE KEYS: Add a new keyctl op to reject a key with a specified error code KEYS: Add a key type op to permit the key description to be vetted KEYS: Add an RCU payload dereference macro AppArmor: Cleanup make file to remove cruft and make it easier to read SELinux: implement the new sb_remount LSM hook LSM: Pass -o remount options to the LSM SELinux: Compute SID for the newly created socket SELinux: Socket retains creator role and MLS attribute SELinux: Auto-generate security_is_socket_class TOMOYO: Fix memory leak upon file open. Revert "selinux: simplify ioctl checking" selinux: drop unused packet flow permissions selinux: Fix packet forwarding checks on postrouting selinux: Fix wrong checks for selinux_policycap_netpeer selinux: Fix check for xfrm selinux context algorithm ima: remove unnecessary call to ima_must_measure IMA: remove IMA imbalance checking ... commit 0d2ecee2bdb2a19d04bc5cefac0f86e790f1aad4 Merge: 3ae2a1ce f07ef1d Author: Linus Torvalds Date: Wed Mar 16 09:15:21 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: tcrypt - do not attempt to write to readonly variable random: update interface comments to reflect reality crypto: picoxcell - add support for the picoxcell crypto engines crypto: sha1 - Add test vector to test partial block processing hwrng: omap - Convert release_resource to release_region/release_mem_region crypto: aesni-intel - Fix remaining leak in rfc4106_set_hash_key crypto: omap-sham - don't treat NULL clk as an error crypto: omap-aes - don't treat NULL clk as an error crypto: testmgr - mark ghash as fips_allowed crypto: testmgr - mark xts(aes) as fips_allowed crypto: skcipher - remove redundant NULL check hwrng: pixocell - add support for picoxcell TRNG crypto: aesni-intel - Don't leak memory in rfc4106_set_hash_subkey commit 3ae2a1ce2e7b70254e5c9e465adefac9cba191d6 Merge: 26a992d 7e32d02 Author: Linus Torvalds Date: Wed Mar 16 08:58:43 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: GFS2: Don't use _raw version of RCU dereference GFS2: Adding missing unlock_page() GFS2: Update to AIL list locking GFS2: introduce AIL lock GFS2: fix block allocation check for fallocate GFS2: Optimize glock multiple-dequeue code GFS2: Remove potential race in flock code GFS2: Fix glock deallocation race GFS2: quota allows exceeding hard limit GFS2: deallocation performance patch GFS2: panics on quotacheck update GFS2: Improve cluster mmap scalability GFS2: Fix glock queue trace point GFS2: Post-VFS scale update for RCU path walk GFS2: Use RCU for glock hash table commit 26a992dbc24e34cbdd03621d1c97ce571ad74e65 Merge: abab012 7c9e592 Author: Linus Torvalds Date: Wed Mar 16 08:58:09 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: (46 commits) fs/9p: Make the writeback_fid owned by root fs/9p: Writeback dirty data before setattr fs/9p: call vmtruncate before setattr 9p opeation fs/9p: Properly update inode attributes on link fs/9p: Prevent multiple inclusion of same header fs/9p: Workaround vfs rename rehash bug fs/9p: Mark directory inode invalid for many directory inode operations fs/9p: Add . and .. dentry revalidation flag fs/9p: mark inode attribute invalid on rename, unlink and setattr fs/9p: Add support for marking inode attribute invalid fs/9p: Initialize root inode number for dotl fs/9p: Update link count correctly on different file system operations fs/9p: Add drop_inode 9p callback fs/9p: Add direct IO support in cached mode fs/9p: Fix inode i_size update in file_write fs/9p: set default readahead pages in cached mode fs/9p: Move writeback fid to v9fs_inode fs/9p: Add v9fs_inode fs/9p: Don't set stat.st_blocks based on nrpages fs/9p: Add inode hashing ... commit abab012a52237693ae48a655ece30cacb2ce4cf7 Merge: 79d8a8f 50be5e3 Author: Linus Torvalds Date: Wed Mar 16 08:57:32 2011 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (29 commits) ahci: add another PCI ID for marvell libata: Use 'bool' return value for ata_id_XXX sata_fsl: Update RX_WATER_MARK for TRANSCFG sata_fsl: Fix wrong Device Error Register usage libata: Include WWN ID in inquiry VPD emulation ata/pata_arasan_cf: fill dma chan->private from pdata->dma_priv ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_ pata_arasan_cf: fix printk format string warning pata_arasan_cf: Adding support for arasan compact flash host controller libata-sff: add ata_sff_queue_work() & ata_sff_queue_delayed_work() ahci: AHCI mode SATA patch for Intel Patsburg SATA RAID controller ahci: recognize Marvell 88se9125 PCIe SATA 6.0 Gb/s controller libata: remove ATA_FLAG_LPM libata: remove ATA_FLAG_NO_LEGACY libata: remove ATA_FLAG_MMIO libata: remove ATA_FLAG_{SRST|SATA_RESET} ipr/sas_ata: use mode mask macros from sata_dwc_460ex: add debugging options sata_dwc_460ex: fix misuse of ata_get_cmd_descript() sata_dwc_460ex: fix return value of dma_dwc_xfer_setup() ... commit 344c21c32287755b5cda0eeb84adb4546a57c1db Merge: b87cf80 84fd1d3 Author: Ingo Molnar Date: Wed Mar 16 16:33:56 2011 +0100 Merge branch 'x86/amd-nb' into x86/urgent Merge reason: This is one followup commit that was not in x86/mm - merge it via the urgent path Signed-off-by: Ingo Molnar commit 79d8a8f736151b12129984b1250fd708440e742c Merge: bd2895e b9ec40a Author: Linus Torvalds Date: Wed Mar 16 08:22:41 2011 -0700 Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu, x86: Add arch-specific this_cpu_cmpxchg_double() support percpu: Generic support for this_cpu_cmpxchg_double() alpha: use L1_CACHE_BYTES for cacheline size in the linker script percpu: align percpu readmostly subsection to cacheline Fix up trivial conflict in arch/x86/kernel/vmlinux.lds.S due to the percpu alignment having changed ("x86: Reduce back the alignment of the per-CPU data section") commit bd2895eeade5f11f3e5906283c630bbdb4b57454 Merge: 016aa2e 24d51ad Author: Linus Torvalds Date: Wed Mar 16 08:20:19 2011 -0700 Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq * 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: fix build failure introduced by s/freezeable/freezable/ workqueue: add system_freezeable_wq rds/ib: use system_wq instead of rds_ib_fmr_wq net/9p: replace p9_poll_task with a work net/9p: use system_wq instead of p9_mux_wq xfs: convert to alloc_workqueue() reiserfs: make commit_wq use the default concurrency level ocfs2: use system_wq instead of ocfs2_quota_wq ext4: convert to alloc_workqueue() scsi/scsi_tgt_lib: scsi_tgtd isn't used in memory reclaim path scsi/be2iscsi,qla2xxx: convert to alloc_workqueue() misc/iwmc3200top: use system_wq instead of dedicated workqueues i2o: use alloc_workqueue() instead of create_workqueue() acpi: kacpi*_wq don't need WQ_MEM_RECLAIM fs/aio: aio_wq isn't used in memory reclaim path input/tps6507x-ts: use system_wq instead of dedicated workqueue cpufreq: use system_wq instead of dedicated workqueues wireless/ipw2x00: use system_wq instead of dedicated workqueues arm/omap: use system_wq in mailbox workqueue: use WQ_MEM_RECLAIM instead of WQ_RESCUER commit d2b217439fd1d8f7857175f063113f4d1d66306c Author: Mi Jinlong Date: Thu Mar 10 17:43:37 2011 +0800 nfs41: make sure nfs server return right ca_maxresponsesize_cached According to rfc5661, ca_maxresponsesize_cached: Like ca_maxresponsesize, but the maximum size of a reply that will be stored in the reply cache (Section 2.10.6.1). For each channel, the server MAY decrease this value, but MUST NOT increase it. the latest kernel(2.6.38-rc8) may increase the value for ignoring request's ca_maxresponsesize_cached value. We should not ignore it. Signed-off-by: Mi Jinlong Signed-off-by: J. Bruce Fields commit 016aa2ed1cc9cf704cf76d8df07751b6daa9750f Merge: 34d211a 241e666 Author: Linus Torvalds Date: Wed Mar 16 08:10:07 2011 -0700 Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: smp: Document transitivity for memory barriers. rcu: add comment saying why DEBUG_OBJECTS_RCU_HEAD depends on PREEMPT. rcupdate: remove dead code rcu: add documentation saying which RCU flavor to choose rcutorture: Get rid of duplicate sched.h include rcu: call __rcu_read_unlock() in exit_rcu for tiny RCU commit 34d211a2d5df4984a35b18d8ccacbe1d10abb067 Author: Linus Torvalds Date: Wed Mar 16 08:04:07 2011 -0700 Increase OSF partition limit from 8 to 18 It turns out that while a maximum of 8 partitions may be what people "should" have had, you can actually fit up to 18 entries(*) in a sector. And some people clearly were taking advantage of that, like Michael Cree, who had ten partitions on one of his OSF disks. (*) The OSF partition data starts at byte offset 64 in the first sector, and the array of 16-byte partition entries start at offset 148 in the on-disk partition structure. Reported-by: Michael Cree Cc: stable@kernel.org (v2.6.38) Signed-off-by: Linus Torvalds commit ca47ceaa2c407bbddd395c1807b616042365bd65 Author: Daniel De Graaf Date: Wed Mar 9 18:07:34 2011 -0500 xen-gntdev: Use ballooned pages for grant mappings Grant mappings cause the PFN<->MFN mapping to be lost on the pages used for the mapping. Instead of leaking memory, use pages that have already been ballooned out and so have no valid mapping. This removes the need for the bad-page leak workaround as pages are repopulated by the balloon driver. Acked-by: Ian Campbell Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit b6f3067985f12d514187059fb10fe3c877f87cb2 Author: Konrad Rzeszutek Wilk Date: Tue Mar 15 10:23:57 2011 -0400 xen-balloon: Add interface to retrieve ballooned pages Pages that have been ballooned are useful for other Xen drivers doing grant table actions, because these pages have valid struct page/PFNs but have no valid MFN so are available for remapping. Acked-by: Ian Campbell Signed-off-by: Daniel De Graaf [v2: Deal with rebasing on top of modified balloon code] Signed-off-by: Konrad Rzeszutek Wilk commit 803eb047a28d239809fff1f87274cdaa94e0d8ea Author: Daniel De Graaf Date: Mon Mar 14 11:29:37 2011 -0400 xen-balloon: Move core balloon functionality out of module The basic functionality of ballooning pages is useful for Xen drivers in general. Rather than require a dependency on the balloon module, split the functionality that is reused into the core. The balloon module is still required to follow ballooning requests from xenstore or to view balloon statistics in sysfs. Acked-by: Ian Campbell Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit 40095de1f9082f058970b985a96d2fbef43f94f4 Author: Konrad Rzeszutek Wilk Date: Mon Mar 14 11:42:40 2011 -0400 xen/balloon: Remove pr_info's and don't alter retry_count In the past the retry_count (in other form of this code) was zero. Meaning retry forever. Do the same thing here without changing it to the value 16. Also remove some of the pr_info as there is no need to spam the user. Acked-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit d668a8b022a201e65ec5e301a9e6dff78987550c Author: Guenter Roeck Date: Tue Mar 15 16:34:07 2011 -0700 hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes The alarm bit assumed to be a low voltage alarm bit is not set for low voltage alarms, and the alarm bit assumed to be a high voltage alarm turns out to be a general alarm bit which is set for both low and high voltage alarms. Remove the in1_min_alarm sysfs attribute and rename in1_max_alarm to in1_alarm to reflect the situation. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare commit bab1d9444d9a147f1dc3478dd06c16f490227f3e Author: Christoph Hellwig Date: Tue Mar 15 21:51:24 2011 +0100 prune back iprune_sem iprune_sem is continously giving us lockdep warnings because we do take it in read mode in the reclaim path, but we're also doing non-NOFS allocations under it taken in write mode. Taking a bit deeper look at it I think it's fixable quite trivially: - for invalidate_inodes we do not need iprune_sem at all. We have an active reference on the superblock, so the filesystem is not going away until it has finished. - for evict_inodes we do need it, to make sure prune_icache has done it's work before we tear down the superblock. But there is no reason to hold it over the actual reclaim operation - it's enough to cycle through it after the actual reclaim to make sure we wait for any pending prune_icache to complete. We just have to remove the WARN_ON for otherwise busy inodes as they can actually happen now. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 5229645bdc35f1cc43eb8b25b6993c8fa58b4b43 Author: Stephen Rothwell Date: Wed Mar 16 18:09:27 2011 +1100 vfs: add nonconflicting values for O_PATH [AV: on architectures where default conflicts with existing flags, that is] Signed-off-by: Stephen Rothwell Signed-off-by: Al Viro commit 909a78b320b31ca9709d7ea5f602ec1bd2015192 Author: Benson Leung Date: Sun Feb 27 17:41:48 2011 -0800 bq20z75: Fix time and temp units Corrected temperature and time to empty/full conversions. Temperature is in 0.1°C, time is in seconds. Corrected units in comment. "Convert to µWh." Signed-off-by: Benson Leung Acked-by: Rhyland Klein Signed-off-by: Anton Vorontsov commit a7d9ace4eb3a6a3c3fcb12fb05510c1893808263 Author: Rhyland Klein Date: Wed Mar 9 16:18:02 2011 -0800 bq20z75: Fix issues with present and suspend There are a few issues found around the battery not being present. If the battery isn't present, then a few undesirable things happen. The first was excessive reporting of failed properties. This was fixed by instead returning ENODATA for all properties other than PRESENT if the battery isn't present. That way the callers can identify the difference between a failure and the battery not being there. The next issue was in the suspend logic. It was found that if the battery wasn't present, then it would return a failure, preventing the system from going into suspend. If there is no battery present, the io is expected to fail, so in that case, we shouldn't return the failure and just acknowledge that it was expected. I also found that when a gpio was used, i didn't maintain the internal is_present state properly. I added a set of that to fix that. Lastly, the code to see io's fail and figure out that the battery isn't present when not using a gpio had a problem. In that code, it looked for the read to fail and if it did, then handled it. The problem is that in function to get the property, it first writes a value and that write can fail, causing the code to never reach the logic after the read. Fix is to move the logic till after the write. Signed-off-by: Rhyland Klein Signed-off-by: Anton Vorontsov commit a223246f7280422f77c15b71455fe3362d3604b4 Author: Vasily Khoruzhick Date: Fri Mar 11 15:09:32 2011 +0200 z2_battery: Fix count of properties PROP_STATUS property was not counted, as result VOLTAGE_MIN property is missing in sysfs. Fix it. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut Signed-off-by: Anton Vorontsov commit f8d878ddbb3c08bc2f876975df674484208536ac Author: Heiko Stuebner Date: Mon Mar 14 21:12:39 2011 +0100 s3c_adc_battery: Fix method names when PM not set s3c_adc_battery declares wrong method names when CONFIG_PM is not set. Signed-off-by: Heiko Stuebner Acked-by: Vasily Khoruzhick Signed-off-by: Anton Vorontsov commit ec6b426c4dbb9eef40375c389746cab7e931a584 Author: Robert Richter Date: Wed Mar 16 12:10:12 2011 +0100 oprofile, s390: Cleanups Remove unused HAVE_HWSAMPLER config option. It is not used anymore, removing it. Also make some functions static and some coding style fixes. Signed-off-by: Robert Richter commit c814d160f61466ea6d4491bb4e8e548856e27a58 Author: Heinz Graalfs Date: Tue Feb 15 13:02:14 2011 -0500 oprofile, s390: Remove hwsampler_files.c and merge it into init.c Merge the contents of hwsampler_files.c into arch/s390/oprofile/init.c. Signed-off-by: Mahesh Salgaonkar Signed-off-by: Heinz Graalfs Signed-off-by: Robert Richter commit 38b435b16c36b0d863efcf3f07b34a6fac9873fd Author: Peter Zijlstra Date: Tue Mar 15 14:37:10 2011 +0100 perf: Fix tear-down of inherited group events When destroying inherited events, we need to destroy groups too, otherwise the event iteration in perf_event_exit_task_context() will miss group siblings and we leak events with all the consequences. Reported-and-tested-by: Vince Weaver Signed-off-by: Peter Zijlstra Cc: # .35+ LKML-Reference: <1300196470.2203.61.camel@twins> Signed-off-by: Ingo Molnar commit ee643c4179c3a18b018de3a4c07a7bb3a75c8e4e Author: Richard Kennedy Date: Mon Mar 7 15:46:59 2011 +0000 perf: Reorder & optimize perf_event_context to remove alignment padding on 64 bit builds Remove 8 bytes of alignment padding from perf_event_context on 64 bit builds which shrinks its size to 192 bytes allowing it to fit into one fewer cache lines and into a smaller slab. Signed-off-by: Richard Kennedy Signed-off-by: Peter Zijlstra LKML-Reference: <1299512819.2039.5.camel@castor.rsk> Signed-off-by: Ingo Molnar commit a0f7d0f7fc02465bb9758501f611f63381792996 Author: Frederic Weisbecker Date: Mon Mar 7 21:27:09 2011 +0100 perf: Handle stopped state with tracepoints We toggle the state from start and stop callbacks but actually don't check it when the event triggers. Do it so that these callbacks actually work. Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Stephane Eranian Cc: Signed-off-by: Peter Zijlstra LKML-Reference: <1299529629-18280-2-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 91b2f482e62ad0d444222253026a5cbca28c4ab9 Author: Frederic Weisbecker Date: Mon Mar 7 21:27:08 2011 +0100 perf: Fix the software events state check Fix the mistakenly inverted check of events state. Signed-off-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Stephane Eranian Cc: LKML-Reference: <1299529629-18280-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 0837e3242c73566fc1c0196b4ec61779c25ffc93 Author: Anton Blanchard Date: Wed Mar 9 14:38:42 2011 +1100 perf, powerpc: Handle events that raise an exception without overflowing Events on POWER7 can roll back if a speculative event doesn't eventually complete. Unfortunately in some rare cases they will raise a performance monitor exception. We need to catch this to ensure we reset the PMC. In all cases the PMC will be 256 or less cycles from overflow. Signed-off-by: Anton Blanchard Signed-off-by: Peter Zijlstra Cc: # as far back as it applies cleanly LKML-Reference: <20110309143842.6c22845e@kryten> Signed-off-by: Ingo Molnar commit 7d5d02dadd43db7f829775e404e82019c5d5586f Author: Lin Ming Date: Wed Mar 9 23:21:29 2011 +0800 perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints PEBS_EVENT_CONSTRAINT() is just a duplicate of INTEL_UEVENT_CONSTRAINT(). Remove it and use INTEL_UEVENT_CONSTRAINT() instead. Signed-off-by: Lin Ming Signed-off-by: Peter Zijlstra LKML-Reference: <1299684089-22835-3-git-send-email-ming.m.lin@intel.com> Signed-off-by: Ingo Molnar commit eefaaac46470d105f58cff93c8176cfadc75b857 Author: Lin Ming Date: Wed Mar 9 23:21:28 2011 +0800 perf, x86: Clean up SandyBridge PEBS events Use INTEL_EVENT_CONSTRAINT() for the events where all umasks support PEBS. Signed-off-by: Lin Ming Signed-off-by: Peter Zijlstra LKML-Reference: <1299684089-22835-2-git-send-email-ming.m.lin@intel.com> Signed-off-by: Ingo Molnar commit b87cf80af3ba4b4c008b4face3c68d604e1715c6 Author: Boris Ostrovsky Date: Tue Mar 15 12:13:44 2011 -0400 x86, AMD: Set ARAT feature on AMD processors Support for Always Running APIC timer (ARAT) was introduced in commit db954b5898dd3ef3ef93f4144158ea8f97deb058. This feature allows us to avoid switching timers from LAPIC to something else (e.g. HPET) and go into timer broadcasts when entering deep C-states. AMD processors don't provide a CPUID bit for that feature but they also keep APIC timers running in deep C-states (except for cases when the processor is affected by erratum 400). Therefore we should set ARAT feature bit on AMD CPUs. Tested-by: Borislav Petkov Acked-by: Andreas Herrmann Acked-by: Mark Langsdorf Acked-by: Thomas Gleixner Signed-off-by: Boris Ostrovsky LKML-Reference: <1300205624-4813-1-git-send-email-ostr@amd64.org> Signed-off-by: Ingo Molnar commit 1d3e09a304e6c4e004ca06356578b171e8735d3c Author: Andreas Herrmann Date: Tue Mar 15 15:31:37 2011 +0100 x86, quirk: Fix SB600 revision check Commit 7f74f8f28a2bd9db9404f7d364e2097a0c42cc12 (x86 quirk: Fix polarity for IRQ0 pin2 override on SB800 systems) introduced a regression. It removed some SB600 specific code to determine the revision ID without adapting a corresponding revision ID check for SB600. See this mail thread: http://marc.info/?l=linux-kernel&m=129980296006380&w=2 This patch adapts the corresponding check to cover all SB600 revisions. Tested-by: Wang Lei Signed-off-by: Andreas Herrmann Cc: Andrew Morton Cc: stable@kernel.org # 38.x, 37.x, 32.x LKML-Reference: <20110315143137.GD29499@alberich.amd.com> Signed-off-by: Ingo Molnar commit 58cbe2476abce8b5e3508d23bd05c2e2e8c394da Author: Randy Dunlap Date: Tue Mar 15 16:12:30 2011 -0700 sched, kernel-doc: Fix runqueue_is_locked() description Fix kernel-doc warning for runqueue_is_locked(): Warning(kernel/sched.c:664): missing initial short description Signed-off-by: Randy Dunlap Cc: Linus Torvalds LKML-Reference: <20110315161230.c4e1e8e3.rdunlap@xenotime.net> Signed-off-by: Ingo Molnar commit 8b7cdd08fe304b41a2399eaaa5225159ac6db0d8 Merge: d109028 43adec9 Author: Ingo Molnar Date: Wed Mar 16 13:42:48 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent commit 9df03abeda3d928ecdedc0f427336931eac0a477 Author: Marcin Slusarz Date: Tue Feb 22 18:47:15 2011 +0100 perf lock: Fix sorting by wait_min If lock was uncontended, wait_time_min == ULLONG_MAX, so we need to handle this case differently to show high wait times first Acked-by: Hitoshi Mitake Cc: Hitoshi Mitake Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <20110222174715.GC9687@joi.lan> Signed-off-by: Marcin Slusarz Signed-off-by: Arnaldo Carvalho de Melo commit 5d630e43284fdb0613e4e7e7dd906f27bc25b6af Author: Artem Bityutskiy Date: Mon Mar 14 17:55:40 2011 +0200 UBIFS: clean-up commentaries Clean-up commentaries in debug.h and remove references to non-existing symblols. Signed-off-by: Artem Bityutskiy commit 7c83cc91ab1505e53ebfb99b1ea19ed1cf01c1b0 Author: Artem Bityutskiy Date: Fri Mar 11 17:15:55 2011 +0200 UBIFS: save 128KiB or more RAM When debugging is enabled, we allocate a buffer of PEB size for various debugging purposes. However, now all users of this buffer are gone and we can safely remove it and save 128KiB or more RAM. Signed-off-by: Artem Bityutskiy commit f5cf319cf32d2284b3fbc24f3c526e2a9363b4ac Author: Artem Bityutskiy Date: Fri Mar 11 17:11:25 2011 +0200 UBIFS: allocate orphans scan buffer on demand Instead of using pre-allocated 'c->dbg->buf' buffer in 'dbg_scan_orphans()', dynamically allocate it when needed. The intend is to get rid of the pre-allocated 'c->dbg->buf' buffer and save 128KiB of RAM (or more if PEB size is larger). Indeed, currently we allocate this memory even if the user never enables any self-check, which is wasteful. Signed-off-by: Artem Bityutskiy commit cab95d446cb766062fa7e2e7e326035d7c65b803 Author: Artem Bityutskiy Date: Fri Mar 11 16:58:39 2011 +0200 UBIFS: allocate lpt dump buffer on demand Instead of using pre-allocated 'c->dbg->buf' buffer in 'dump_lpt_leb()', dynamically allocate it when needed. The intend is to get rid of the pre-allocated 'c->dbg->buf' buffer and save 128KiB of RAM (or more if PEB size is larger). Indeed, currently we allocate this memory even if the user never enables any self-check, which is wasteful. Signed-off-by: Artem Bityutskiy commit 6fb324a4b0c3c9297cd569bd125ed691f2f98d57 Author: Artem Bityutskiy Date: Fri Mar 11 15:56:38 2011 +0200 UBIFS: allocate ltab checking buffer on demand Instead of using pre-allocated 'c->dbg->buf' buffer in 'dbg_check_ltab_lnum()', dynamically allocate it when needed. The intend is to get rid of the pre-allocated 'c->dbg->buf' buffer and save 128KiB of RAM (or more if PEB size is larger). Indeed, currently we allocate this memory even if the user never enables any self-check, which is wasteful. Signed-off-by: Artem Bityutskiy commit cd5f7485bbbbfeea4363b535abeaa01df6942c66 Author: Artem Bityutskiy Date: Fri Mar 11 15:50:37 2011 +0200 UBIFS: allocate scanning buffer on demand Instead of using pre-allocated 'c->dbg->buf' buffer in 'scan_check_cb()', dynamically allocate it when needed. The intend is to get rid of the pre-allocated 'c->dbg->buf' buffer and save 128KiB of RAM (or more if PEB size is larger). Indeed, currently we allocate this memory even if the user never enables any self-check, which is wasteful. Signed-off-by: Artem Bityutskiy commit 73d9aec3fd212d7bf8af5aa1eca9c79f8a90ad5a Author: Artem Bityutskiy Date: Fri Mar 11 15:39:09 2011 +0200 UBIFS: allocate dump buffer on demand Instead of using pre-allocated 'c->dbg->buf' buffer in 'dbg_dump_leb()', dynamically allocate it when needed. The intend is to get rid of the pre-allocated 'c->dbg->buf' buffer and save 128KiB of RAM (or more if PEB size is larger). Indeed, currently we allocate this memory even if the user never enables any self-check, which is wasteful. Signed-off-by: Artem Bityutskiy commit 58d406ed6a5f1ca4bc1dba5390b718c67847fa5f Author: Josh Hunt Date: Tue Mar 15 19:16:40 2011 -0700 perf tools: Version incorrect with some versions of grep Some versions of grep don't treat '\s' properly. When building perf on such systems and using a kernel tarball the perf version is unable to be determined from the main kernel Makefile and the user is left with a version of '..'. Replacing the use of '\s' with '[[:space:]]', which should work in all grep versions, gives a usable version number. Reported-by: Tapan Dhimant Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tapan Dhimant Cc: linux-kernel@vger.kernel.org Cc: stable@kernel.org LKML-Reference: <1300241800-30281-1-git-send-email-johunt@akamai.com> Signed-off-by: Josh Hunt Signed-off-by: Arnaldo Carvalho de Melo commit 28237e4583604818294dc1ce7881db5f53377b9c Author: Artem Bityutskiy Date: Tue Mar 15 10:30:40 2011 +0200 UBI: make tests modes dynamic Similarly to the debugging checks and message, make the test modes be dynamically selected via the "debug_tsts" module parameter or via the "/sys/module/ubi/parameters/debug_tsts" sysfs file. This is consistent with UBIFS as well. And now, since all the Kconfig knobs became dynamic, we can remove the Kconfig.debug file completely. Signed-off-by: Artem Bityutskiy commit 92d124f5314913a21f7fa98b22ee457dab171edd Author: Artem Bityutskiy Date: Mon Mar 14 18:17:40 2011 +0200 UBI: make self-checks dynamic This patch adds a possibility to dynamically switch UBI self-checks on and off, instead of toggling them compile-time from the configuration menu. This is much more flexible, and consistent with UBIFS, and this also simplifies UBI Kconfig menu and the code. This patch introduces two levels of self-checks - general, which includes all self-checks which are relatively fast, and I/O, which includes write-verify checks and erase-verify checks, which are relatively slow and involve flash I/O. Signed-off-by: Artem Bityutskiy commit b342efd4a49cef9cf1a260c1814aad97722f38f8 Author: Artem Bityutskiy Date: Fri Mar 11 14:33:23 2011 +0200 UBI: make debugging messages dynamic This patch adds a possibility to dynamically select UBI debugging messages, instead of selecting them compile-time from the configuration menu. This is much more flexible, and consistent with UBIFS, and this also simplifies UBI Kconfig menu and the code. Signed-off-by: Artem Bityutskiy commit 6f9fdf62db64b1e52e5b7a9f785554e8b877b65c Author: Artem Bityutskiy Date: Fri Mar 11 13:08:51 2011 +0200 UBI: remove UBI_IO_DEBUG macro This additional little macro is used to print a bit more messages while scanning the media. However, we have the 'dbg_bld()' macro for this, so we better us 'dbg_bld()' and kill UBI_IO_DEBUG. This simplifies the code a tiny bit. Signed-off-by: Artem Bityutskiy commit 6edb9793959fb547a15d5ffe6b142d9f0b3e41a6 Author: Artem Bityutskiy Date: Mon Mar 14 17:11:29 2011 +0200 UBI: kill debugging buffer This patch kills the 'ubi->dbg_peb_buf' debugging buffer and the associated mutex, because all users of this buffer are now gone. We are killing this buffer because we are going to switch to dynamic debugging control, just like in UBIFS, which means that CONFIG_MTD_UBI_DEBUG_PARANOID will be removed. In this case we'd end up always allocating 'ubi->dbg_peb_buf', which is rather large (128KiB or more), and this would be wasteful. Thus, we are just killing it. Signed-off-by: Artem Bityutskiy commit 332873d60b943c9bf53957c6e334038ac5e9dc6b Author: Artem Bityutskiy Date: Mon Mar 14 17:09:40 2011 +0200 UBI: allocate erase checking buffer on demand Instead of using pre-allocated 'ubi->dbg_peb_buf' buffer in 'ubi_dbg_check_all_ff()', dynamically allocate it when needed. The intend is to get rid of the pre-allocated 'ubi->dbg_peb_buf' buffer completely. And the need for this arises because we want to change to dynamic debugging control instead of compile-time control, i.e., we are going to kill the CONFIG_MTD_UBI_DEBUG_PARANOID Kconfig option, which would mean that 'ubi->dbg_peb_buf' is always allocated, which would be wasteful. Thus, we are getting rid of 'ubi->dbg_peb_buf', and this is a preparation for that. signed-off-by: Artem Bityutskiy commit a75867432a7eb2cdcaa8613a3b72b1d0594dd930 Author: Artem Bityutskiy Date: Mon Mar 14 17:06:52 2011 +0200 UBI: allocate write checking buffer on demand Instead of using pre-allocated 'ubi->dbg_peb_buf' buffer in 'ubi_dbg_check_write()', dynamically allocate it when needed. The intend is to get rid of the pre-allocated 'ubi->dbg_peb_buf' buffer completely. And the need for this arises because we want to change to dynamic debugging control instead of compile-time control, i.e., we are going to kill the CONFIG_MTD_UBI_DEBUG_PARANOID Kconfig option, which would mean that 'ubi->dbg_peb_buf' is always allocated, which would be wasteful. Thus, we are getting rid of 'ubi->dbg_peb_buf', and this is a preparation for that. Signed-off-by: Artem Bityutskiy commit e58a8947b0264ec1f43ce5deef563b72acf1284f Merge: 27380fb fa4d1f5 Author: Takashi Iwai Date: Wed Mar 16 12:14:46 2011 +0100 Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc commit c9ac1361d2258a667672cf531cd840807daba4f1 Merge: 53b5031 2563afa Author: Paul Mundt Date: Wed Mar 16 18:07:16 2011 +0900 Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 commit 0e794589e588a88d34e339feee50c72606fb21a7 Author: Al Viro Date: Wed Mar 16 02:45:02 2011 -0400 fix follow_link() breakage commit 574197e0de46a8a4db5c54ef7b65e43ffa8873a7 had a missing piece, breaking the loop detection ;-/ Signed-off-by: Al Viro commit 53b5031430bb3a7941b340b453afe4eabeb5340c Author: Damian Hobson-Garcia Date: Thu Feb 24 05:47:13 2011 +0000 fbdev: sh_mobile_lcdc: Add YUV framebuffer support Supports YCbCr420sp, YCbCr422sp, and YCbCr44sp, formats (bpp = 12, 16, and 24) respectively. When double-buffering both Y planes appear before the C planes (Y-Y-C-C), as opposed to Y-C-Y-C. Set .nonstd in struct sh_mobile_lcdc_chan_cfg to enable YUV mode, and use .bpp to distiguish between the 3 modes. The value of .nonstd is copied to bits 16-31 of LDDFR in the LCDC and should be set accordingly. .nonstd must be set to 0 for RGB mode. Due to the encoding of YUV data, the framebuffer will clear to green instead of black. In YUV 420 mode, panning is only possible in 2 line increments. Additionally in YUV 420 mode the vertical resolution of the framebuffer must be an even number. Signed-off-by: Damian Hobson-Garcia Signed-off-by: Paul Mundt commit 9d4ed9e0771767a110dafffdeb0963e852fd6ae4 Author: Kirill A. Shutemov Date: Wed Mar 16 00:53:24 2011 +0200 ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination Signed-off-by: Kirill A. Shutemov Signed-off-by: Takashi Iwai commit 5de0ee574be8f6922a6c33f2fbc7e9b130a2f626 Author: Stephen Rothwell Date: Wed Mar 16 17:39:28 2011 +1100 ALSA: firewire - msleep needs delay.h fixes this error: sound/firewire/fcp.c: In function 'fcp_avc_transaction': sound/firewire/fcp.c:103: error: implicit declaration of function 'msleep' Signed-off-by: Stephen Rothwell Signed-off-by: Takashi Iwai commit 53a2b81c4e659d894aadc56715c8d8a9afa60d67 Author: Dmitry Torokhov Date: Tue Mar 15 23:18:00 2011 -0700 Input: tc3589x-keypad - fix 'double const' warning Also rearrange driver structure initializer a bit. Signed-off-by: Dmitry Torokhov commit 64dcddd888998f7db9929e19fc063e75e3ea21f5 Author: Magnus Damm Date: Tue Mar 15 22:32:39 2011 -0700 Input: tca6416-keypad - suspend/resume wakeup support Extend the tca6416 driver to use enable_irq_wake() and disable_irq_wake() in the suspend/resume hooks. This makes it possible to wake up from suspend-to-ram using a tca6416 key on the sh7372 mackerel board. Signed-off-by: Magnus Damm Signed-off-by: Dmitry Torokhov commit 17c84ef1e1265fad787d4082bd40a63eb6f3eeb1 Author: K, Mythri P Date: Mon Mar 14 23:57:42 2011 -0500 OMAP4: HDMI: Add HDMI structure in the board file for OMAP4 PANDA Adding board file structure for display which adds the display structure with HDMI as the default driver when the display init is called. HDMI GPIO configurations are also done in this file. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit 0425b48b3f24b0b2b1f9b4f24fd491b70a8f911c Author: Mythri P K Date: Tue Mar 8 18:50:09 2011 +0530 OMAP4: HDMI: Add HDMI structure in the board file for OMAP4 SDP Adding board file structure for display which adds the display structure with HDMI as the default driver when the display init is called. HDMI GPIO configurations are also done in this file. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit adbc2feee11aef2b3b0f4eff427d2ea5c211e798 Author: Mythri P K Date: Wed Mar 9 15:40:02 2011 +0530 OMAP4: DSS: HDMI: Call to HDMI module init to register driver. calling the platform registration of HDMI driver from core during initialization. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit 642e21bff200610b1d4c0e706d0a6b16ae4e25db Author: Mythri P K Date: Thu Mar 10 15:12:48 2011 +0530 OMAP4: DSS2: HDMI: Add makefile and kconfig changes to enable HDMI in OMAP4 Adding kconfig and makefile changes to add support for HDMI in OMAP4. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit 70be83235ea2815f6c2a5fd45753de406be6c6aa Author: Mythri P K Date: Thu Mar 10 15:48:48 2011 +0530 OMAP4: DSS2: HDMI: HDMI panel driver addition in the DSS The panel driver(hdmi_omap4_panel.c) in omap2/dss acts as a controller to manage the enable and disable requests and synchronize audio and video. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit c3198a5e83121d6e3d01816f15164f158f4301d8 Author: Mythri P K Date: Sat Mar 12 12:04:27 2011 +0530 OMAP4: DSS2: HDMI: HDMI driver addition in the DSS Adding the hdmi interface driver(hdmi.c) to the dss driver. It configures the audio and video portion of HDMI based on functionality called by the panel driver. Signed-off-by: Mythri P K Signed-off-by: Yong Zhi Signed-off-by: Tomi Valkeinen commit 26adeece88ffe172db7e26f856b576cccfb0ec85 Author: Mythri P K Date: Tue Mar 8 17:27:56 2011 +0530 OMAP4: DSS2: HDMI: HDMI driver header file addition Adding the hdmi interface driver header file (hdmi.h) to the dss driver. Register and structure declaration done here. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit d3862610c95564a586951d5be291b9b0200d39fe Author: Mythri P K Date: Fri Mar 11 18:02:49 2011 +0530 OMAP4: DSS2: HDMI: Dispc gamma enable set/reset function for TV. Adding function to reset/set gamma table bit for TV interface, currently only support for disabled is added. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit 7ed024aa280cb38c8aa5c188d2d2c98f5daede10 Author: Mythri P K Date: Wed Mar 9 16:31:38 2011 +0530 OMAP4: DSS2: HDMI: Select between HDMI VENC clock source. Adding function to select between HDMI or VENC clock source. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit b119601d4e226e42a067ff33116774d79dd9afbc Author: Mythri P K Date: Tue Mar 8 17:15:54 2011 +0530 OMAP4: DSS2: Add display type HDMI to DSS2 Adding display type HDMI in dss_features, overlay and the manager so that HDMI type of display will be recognized. Signed-off-by: Mythri P K Signed-off-by: Tomi Valkeinen commit d10902812c9cd5583130a4ebb9ad19c60b68149d Merge: 181f977 25874a2 Author: Linus Torvalds Date: Tue Mar 15 20:01:36 2011 -0700 Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits) x86: Clean up apic.c and apic.h x86: Remove superflous goal definition of tsc_sync x86: dt: Correct local apic documentation in device tree bindings x86: dt: Cleanup local apic setup x86: dt: Fix OLPC=y/INTEL_CE=n build rtc: cmos: Add OF bindings x86: ce4100: Use OF to setup devices x86: ioapic: Add OF bindings for IO_APIC x86: dtb: Add generic bus probe x86: dtb: Add support for PCI devices backed by dtb nodes x86: dtb: Add device tree support for HPET x86: dtb: Add early parsing of IO_APIC x86: dtb: Add irq domain abstraction x86: dtb: Add a device tree for CE4100 x86: Add device tree support x86: e820: Remove conditional early mapping in parse_e820_ext x86: OLPC: Make OLPC=n build again x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection x86: OLPC: Cleanup config maze completely x86: OLPC: Hide OLPC_OPENFIRMWARE config switch ... Fix up conflicts in arch/x86/platform/ce4100/ce4100.c commit 181f977d134a9f8e3f8839f42af655b045fc059e Merge: d5d4239 25542c6 Author: Linus Torvalds Date: Tue Mar 15 19:49:10 2011 -0700 Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (93 commits) x86, tlb, UV: Do small micro-optimization for native_flush_tlb_others() x86-64, NUMA: Don't call numa_set_distanc() for all possible node combinations during emulation x86-64, NUMA: Don't assume phys node 0 is always online in numa_emulation() x86-64, NUMA: Clean up initmem_init() x86-64, NUMA: Fix numa_emulation code with node0 without RAM x86-64, NUMA: Revert NUMA affine page table allocation x86: Work around old gas bug x86-64, NUMA: Better explain numa_distance handling x86-64, NUMA: Fix distance table handling mm: Move early_node_map[] reverse scan helpers under HAVE_MEMBLOCK x86-64, NUMA: Fix size of numa_distance array x86: Rename e820_table_* to pgt_buf_* bootmem: Move __alloc_memory_core_early() to nobootmem.c bootmem: Move contig_page_data definition to bootmem.c/nobootmem.c bootmem: Separate out CONFIG_NO_BOOTMEM code into nobootmem.c x86-64, NUMA: Seperate out numa_alloc_distance() from numa_set_distance() x86-64, NUMA: Add proper function comments to global functions x86-64, NUMA: Move NUMA emulation into numa_emulation.c x86-64, NUMA: Prepare numa_emulation() for moving NUMA emulation into a separate file x86-64, NUMA: Do not scan two times for setup_node_bootmem() ... Fix up conflicts in arch/x86/kernel/smpboot.c commit d5d42399bd7b66bd6b55363b311810504110c967 Merge: 209b6c8 9599ec0 Author: Linus Torvalds Date: Tue Mar 15 19:41:42 2011 -0700 Merge branch 'x86-mem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64, mem: Convert memmove() to assembly file and fix return value bug commit 209b6c8fa72e8b726a0cd273a56aded55be22bfa Merge: 0310e43 1396fa9 Author: Linus Torvalds Date: Tue Mar 15 19:40:53 2011 -0700 Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, microcode, AMD: Fix signedness bug in generic_load_microcode() x86, microcode, AMD: Extend ucode size verification x86, microcode, AMD: Cleanup dmesg output x86, microcode, AMD: Remove unneeded memset call x86, microcode, AMD: Simplify get_next_ucode x86, microcode, AMD: Simplify install_equiv_cpu_table x86, microcode, AMD: Release firmware on error x86, microcode: Correct sysdev_add error path commit 0310e437182568a9e0aa862f2a9d13908069df73 Merge: 5f6fb45 53c39ce Author: Linus Torvalds Date: Tue Mar 15 19:40:35 2011 -0700 Merge branch 'um-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'um-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: um: Select GENERIC_HARDIRQS_NO_DEPRECATED um: Use proper accessors in show_interrupts() um: Convert irq_chips to new functions um: Remove stale irq_chip.end commit f942dc2552b8bfdee607be867b12a8971bb9cd85 Author: Ian Campbell Date: Tue Mar 15 00:06:18 2011 +0000 xen network backend driver netback is the host side counterpart to the frontend driver in drivers/net/xen-netfront.c. The PV protocol is also implemented by frontend drivers in other OSes too, such as the BSDs and even Windows. The patch is based on the driver from the xen.git pvops kernel tree but has been put through the checkpatch.pl wringer plus several manual cleanup passes and review iterations. The driver has been moved from drivers/xen/netback to drivers/net/xen-netback. One major change from xen.git is that the guest transmit path (i.e. what looks like receive to netback) has been significantly reworked to remove the dependency on the out of tree PageForeign page flag (a core kernel patch which enables a per page destructor callback on the final put_page). This page flag was used in order to implement a grant map based transmit path (where guest pages are mapped directly into SKB frags). Instead this version of netback uses grant copy operations into regular memory belonging to the backend domain. Reinstating the grant map functionality is something which I would like to revisit in the future. Note that this driver depends on 2e820f58f7ad "xen/irq: implement bind_interdomain_evtchn_to_irqhandler for backend drivers" which is in linux next via the "xen-two" tree and is intended for the 2.6.39 merge window: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/backends this branch has only that single commit since 2.6.38-rc2 and is safe for cross merging into the net branch. Signed-off-by: Ian Campbell Reviewed-by: Ben Hutchings Signed-off-by: David S. Miller commit e0da2481fc00e031c04480b9dc88fae9eff39a19 Merge: 5f86cad 2e820f5 Author: David S. Miller Date: Tue Mar 15 19:37:10 2011 -0700 Merge branch 'stable/backends' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen commit 5f86cad1e8224af9e3b9b43dd84b146a9ff0df87 Author: Phil Oester Date: Mon Mar 14 06:22:06 2011 +0000 bonding: Improve syslog message at device creation time When the bonding module is loaded, it creates bond0 by default. Then, when attempting to create bond0, the following messages are printed to syslog: kernel: bonding: bond0 is being created... kernel: bonding: Bond creation failed. Which seems to indicate a problem, when in reality there is no problem. Since the actual error code is passed down from bond_create, make use of it to print a bit less ominous message: kernel: bonding: bond0 is being created... kernel: bond0 already exists. Signed-off-by: Phil Oester Signed-off-by: Andy Gospodarek Signed-off-by: David S. Miller commit e826eafa65c6f1f7c8db5a237556cebac57ebcc5 Author: Phil Oester Date: Mon Mar 14 06:22:05 2011 +0000 bonding: Call netif_carrier_off after register_netdevice Bringing up a bond interface with all network cables disconnected does not properly set the interface as DOWN because the call to netif_carrier_off occurs too early in bond_init. The call needs to occur after register_netdevice has set dev->reg_state to NETREG_REGISTERED, so that netif_carrier_off will trigger the call to linkwatch_fire_event. Signed-off-by: Phil Oester Signed-off-by: Andy Gospodarek Signed-off-by: David S. Miller commit fd0e435b0fe85622f167b84432552885a4856ac8 Author: Phil Oester Date: Mon Mar 14 06:22:04 2011 +0000 bonding: Incorrect TX queue offset When packets come in from a device with >= 16 receive queues headed out a bonding interface, syslog gets filled with this: kernel: bond0 selects TX queue 16, but real number of TX queues is 16 because queue_mapping is offset by 1. Adjust return value to account for the offset. This is a revision of my earlier patch (which did not use the skb_rx_queue_* helpers - thanks to Ben for the suggestion). Andy submitted a similar patch which emits a pr_warning on invalid queue selection, but I believe the log spew is not useful. We can revisit that question in the future, but in the interim I believe fixing the core problem is worthwhile. Signed-off-by: Phil Oester Signed-off-by: Andy Gospodarek Signed-off-by: David S. Miller commit 5f6fb45466b2273ffb91c9cf209f164f666c33b1 Merge: 3904afb c0185808 Author: Linus Torvalds Date: Tue Mar 15 19:23:40 2011 -0700 Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (116 commits) x86: Enable forced interrupt threading support x86: Mark low level interrupts IRQF_NO_THREAD x86: Use generic show_interrupts x86: ioapic: Avoid redundant lookup of irq_cfg x86: ioapic: Use new move_irq functions x86: Use the proper accessors in fixup_irqs() x86: ioapic: Use irq_data->state x86: ioapic: Simplify irq chip and handler setup x86: Cleanup the genirq name space genirq: Add chip flag to force mask on suspend genirq: Add desc->irq_data accessor genirq: Add comments to Kconfig switches genirq: Fixup fasteoi handler for oneshot mode genirq: Provide forced interrupt threading sched: Switch wait_task_inactive to schedule_hrtimeout() genirq: Add IRQF_NO_THREAD genirq: Allow shared oneshot interrupts genirq: Prepare the handling of shared oneshot interrupts genirq: Make warning in handle_percpu_event useful x86: ioapic: Move trigger defines to io_apic.h ... Fix up trivial(?) conflicts in arch/x86/pci/xen.c due to genirq name space changes clashing with the Xen cleanups. The set_irq_msi() had moved to xen_bind_pirq_msi_to_irq(). commit 3904afb41d4316f7a2968c615d689e19149a4f84 Merge: 502f4d4 fd8fa4d3 Author: Linus Torvalds Date: Tue Mar 15 19:16:00 2011 -0700 Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Combine printk()s in show_regs_common() x86: Don't call dump_stack() from arch_trigger_all_cpu_backtrace_handler() commit 502f4d4f74219749a9758b9bbc27fb665b2e83ab Merge: da849ab e5fea86 Author: Linus Torvalds Date: Tue Mar 15 19:00:53 2011 -0700 Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix and clean up generic_processor_info() x86: Don't copy per_cpu cpuinfo for BSP two times x86: Move llc_shared_map out of cpu_info commit da849abeb86ddaa093b0935fde595e8e4dd21ffc Merge: 21a3281 371c394 Author: Linus Torvalds Date: Tue Mar 15 18:59:56 2011 -0700 Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, binutils, xen: Fix another wrong size directive x86: Remove dead config option X86_CPU x86: Really print supported CPUs if PROCESSOR_SELECT=y x86: Fix a bogus unwind annotation in lib/semaphore_32.S um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S x86: Remove unused bits from lib/thunk_*.S x86: Use {push,pop}_cfi in more places x86-64: Add CFI annotations to lib/rwsem_64.S x86, asm: Cleanup unnecssary macros in asm-offsets.c x86, system.h: Drop unused __SAVE/__RESTORE macros x86: Use bitmap library functions x86: Partly unify asm-offsets_{32,64}.c x86: Reduce back the alignment of the per-CPU data section commit 21a32816b2e13eafb6d8a4589a84c6e629adc392 Merge: 420c1c5 ea04683 Author: Linus Torvalds Date: Tue Mar 15 18:59:21 2011 -0700 Merge branch 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer RTC: sa1100: Update the sa1100 RTC driver. RTC: Fix the cross interrupt issue on rtc-test. RTC: Remove UIE and PIE information from the sa1100 driver proc. RTC: Include information about UIE and PIE in RTC driver proc. RTC: Clean out UIE icotl implementations RTC: Cleanup rtc_class_ops->update_irq_enable() RTC: Cleanup rtc_class_ops->irq_set_freq() RTC: Cleanup rtc_class_ops->irq_set_state RTC: Initialize kernel state from RTC commit 4a37390de98547e42ad0cb617bd2f2d452f2d4c7 Merge: 4a2b9c3 fea41cc Author: David S. Miller Date: Tue Mar 15 18:55:20 2011 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 4a2b9c3756077c05dd8666e458a751d2248b61b6 Author: Dan Siemon Date: Tue Mar 15 13:56:07 2011 +0000 net_sched: fix ip_tos2prio ECN support incorrectly maps ECN BESTEFFORT packets to TC_PRIO_FILLER (1) instead of TC_PRIO_BESTEFFORT (0) This means ECN enabled flows are placed in pfifo_fast/prio low priority band, giving ECN enabled flows [ECT(0) and CE codepoints] higher drop probabilities. This is rather unfortunate, given we would like ECN being more widely used. Ref : http://www.coverfire.com/archives/2011/03/13/pfifo_fast-and-ecn/ Signed-off-by: Dan Siemon Signed-off-by: Eric Dumazet Cc: Dave Täht Cc: Jonathan Morton Signed-off-by: David S. Miller commit 420c1c572d4ceaa2f37b6311b7017ac6cf049fe2 Merge: 9620639 6e6823d Author: Linus Torvalds Date: Tue Mar 15 18:53:35 2011 -0700 Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (62 commits) posix-clocks: Check write permissions in posix syscalls hrtimer: Remove empty hrtimer_init_hres_timer() hrtimer: Update hrtimer->state documentation hrtimer: Update base[CLOCK_BOOTTIME].offset correctly timers: Export CLOCK_BOOTTIME via the posix timers interface timers: Add CLOCK_BOOTTIME hrtimer base time: Extend get_xtime_and_monotonic_offset() to also return sleep time: Introduce get_monotonic_boottime and ktime_get_boottime hrtimers: extend hrtimer base code to handle more then 2 clockids ntp: Remove redundant and incorrect parameter check mn10300: Switch do_timer() to xtimer_update() posix clocks: Introduce dynamic clocks posix-timers: Cleanup namespace posix-timers: Add support for fd based clocks x86: Add clock_adjtime for x86 posix-timers: Introduce a syscall for clock tuning. time: Splitout compat timex accessors ntp: Add ADJ_SETOFFSET mode bit time: Introduce timekeeping_inject_offset posix-timer: Update comment ... Fix up new system-call-related conflicts in arch/x86/ia32/ia32entry.S arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/syscall_table_32.S (name_to_handle_at()/open_by_handle_at() vs clock_adjtime()), and some due to movement of get_jiffies_64() in: kernel/time.c commit 9620639b7ea3843983f4ced8b4c81eb4d8974838 Merge: a926021 6d1cafd Author: Linus Torvalds Date: Tue Mar 15 18:37:30 2011 -0700 Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) sched: Resched proper CPU on yield_to() sched: Allow users with sufficient RLIMIT_NICE to change from SCHED_IDLE policy sched: Allow SCHED_BATCH to preempt SCHED_IDLE tasks sched: Clean up the IRQ_TIME_ACCOUNTING code sched: Add #ifdef around irq time accounting functions sched, autogroup: Stop claiming ownership of the root task group sched, autogroup: Stop going ahead if autogroup is disabled sched, autogroup, sysctl: Use proc_dointvec_minmax() instead sched: Fix the group_imb logic sched: Clean up some f_b_g() comments sched: Clean up remnants of sd_idle sched: Wholesale removal of sd_idle logic sched: Add yield_to(task, preempt) functionality sched: Use a buddy to implement yield_task_fair() sched: Limit the scope of clear_buddies sched: Check the right ->nr_running in yield_task_fair() sched: Avoid expensive initial update_cfs_load(), on UP too sched: Fix switch_from_fair() sched: Simplify the idle scheduling class softirqs: Account ksoftirqd time as cpustat softirq ... commit 38f1cff0863809587b5fd10ecd0c24c8b543a48c Merge: 4819d2e 5359533 Author: Dave Airlie Date: Wed Mar 16 11:34:41 2011 +1000 Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next This commit changed an internal radeon structure, that meant a new driver in -next had to be fixed up, merge in the commit and fix up the driver. Also fixes a trivial nouveau merge. Conflicts: drivers/gpu/drm/nouveau/nouveau_mem.c commit a926021cb1f8a99a275eaf6eb546102e9469dc59 Merge: 0586bed 5e814dd Author: Linus Torvalds Date: Tue Mar 15 18:31:30 2011 -0700 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (184 commits) perf probe: Clean up probe_point_lazy_walker() return value tracing: Fix irqoff selftest expanding max buffer tracing: Align 4 byte ints together in struct tracer tracing: Export trace_set_clr_event() tracing: Explain about unstable clock on resume with ring buffer warning ftrace/graph: Trace function entry before updating index ftrace: Add .ref.text as one of the safe areas to trace tracing: Adjust conditional expression latency formatting. tracing: Fix event alignment: skb:kfree_skb tracing: Fix event alignment: mce:mce_record tracing: Fix event alignment: kvm:kvm_hv_hypercall tracing: Fix event alignment: module:module_request tracing: Fix event alignment: ftrace:context_switch and ftrace:wakeup tracing: Remove lock_depth from event entry perf header: Stop using 'self' perf session: Use evlist/evsel for managing perf.data attributes perf top: Don't let events to eat up whole header line perf top: Fix events overflow in top command ring-buffer: Remove unused #include tracing: Add an 'overwrite' trace_option. ... commit 0586bed3e8563c2eb89bc7256e30ce633ae06cfb Merge: b80cd62 dbebbfb Author: Linus Torvalds Date: Tue Mar 15 18:28:30 2011 -0700 Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rtmutex: tester: Remove the remaining BKL leftovers lockdep/timers: Explain in detail the locking problems del_timer_sync() may cause rtmutex: Simplify PI algorithm and make highest prio task get lock rwsem: Remove redundant asmregparm annotation rwsem: Move duplicate function prototypes to linux/rwsem.h rwsem: Unify the duplicate rwsem_is_locked() inlines rwsem: Move duplicate init macros and functions to linux/rwsem.h rwsem: Move duplicate struct rwsem declaration to linux/rwsem.h x86: Cleanup rwsem_count_t typedef rwsem: Cleanup includes locking: Remove deprecated lock initializers cred: Replace deprecated spinlock initialization kthread: Replace deprecated spinlock initialization xtensa: Replace deprecated spinlock initialization um: Replace deprecated spinlock initialization sparc: Replace deprecated spinlock initialization mips: Replace deprecated spinlock initialization cris: Replace deprecated spinlock initialization alpha: Replace deprecated spinlock initialization rtmutex-tester: Remove BKL tests commit 4819d2e4310796c4e9eef674499af9b9caf36b5a Author: Chris Wilson Date: Tue Mar 15 11:04:41 2011 +0000 drm: Retry i2c transfer of EDID block after failure Usually EDID retrieval is fine. However, sometimes, especially when the machine is loaded, it fails, but succeeds after a few retries. Based on a patch by Michael Buesch. Reported-by: Michael Buesch Signed-off-by: Chris Wilson Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie commit 942b0e95c34f1ba432d08e1c0288ed032d32c3b2 Author: Alex Deucher Date: Mon Mar 14 23:18:00 2011 -0400 drm/radeon/kms: fix typo in atom overscan setup Typo in the aspect scale setup. Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit b80cd62b7d4406bbe8c573fe4381dcc71a2850fd Merge: c345f60 07d5eca Author: Linus Torvalds Date: Tue Mar 15 18:23:52 2011 -0700 Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: arm: Remove bogus comment in futex_atomic_cmpxchg_inatomic() futex: Deobfuscate handle_futex_death() plist: Add priority list test plist: Shrink struct plist_head futex,plist: Remove debug lock assignment from plist_node futex,plist: Pass the real head of the priority list to plist_del() futex: Sanitize futex ops argument types futex: Sanitize cmpxchg_futex_value_locked API futex: Remove redundant pagefault_disable in futex_atomic_cmpxchg_inatomic() futex: Avoid redudant evaluation of task_pid_vnr() futex: Update futex_wait_setup comments about locking commit c345f60a5f58a65004f22fb0d257d65ec1528310 Merge: 422e6c4 9977728 Author: Linus Torvalds Date: Tue Mar 15 18:23:25 2011 -0700 Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: debugobjects: Add hint for better object identification commit 007c80a5497a3f9c8393960ec6e6efd30955dcb1 Author: Chris Wilson Date: Tue Mar 15 11:40:00 2011 +0000 drm: Hold the mode mutex whilst probing for sysfs status As detect will use hw registers and may modify structures, it needs to be serialised by use of the dev->mode_config.mutex. Make it so. Otherwise, we may cause random crashes as the sysfs file is queried whilst a concurrent hotplug poll is being run. For example: [ 1189.189626] BUG: unable to handle kernel NULL pointer dereference at 00000100 [ 1189.189821] IP: [] intel_tv_detect_type+0xa2/0x203 [i915] [ 1189.190020] *pde = 00000000 [ 1189.190104] Oops: 0000 [#1] SMP [ 1189.190209] last sysfs file: /sys/devices/pci0000:00/0000:00:02.0/drm/card0/card0-SVIDEO-1/status [ 1189.190412] Modules linked in: mperf cpufreq_conservative cpufreq_userspace cpufreq_powersave cpufreq_stats decnet uinput fuse loop joydev snd_hd a_codec_realtek snd_hda_intel snd_hda_codec snd_hwdep snd_pcm_oss snd_mixer_oss snd_pcm i915 snd_seq_midi snd_rawmidi snd_seq_midi_event snd_seq drm_kms_helper snd_timer uvcvideo d rm snd_seq_device eeepc_laptop tpm_tis usbhid videodev i2c_algo_bit v4l1_compat snd sparse_keymap i2c_core hid serio_raw tpm psmouse evdev tpm_bios rfkill shpchp ac processor rng_c ore battery video power_supply soundcore pci_hotplug button output snd_page_alloc usb_storage uas ext3 jbd mbcache sd_mod crc_t10dif ata_generic ahci libahci ata_piix libata uhci_h cd ehci_hcd scsi_mod usbcore thermal atl2 thermal_sys nls_base [last unloaded: scsi_wait_scan] [ 1189.192007] [ 1189.192007] Pid: 1464, comm: upowerd Not tainted 2.6.37-2-686 #1 ASUSTeK Computer INC. 701/701 [ 1189.192007] EIP: 0060:[] EFLAGS: 00010246 CPU: 0 [ 1189.192007] EIP is at intel_tv_detect_type+0xa2/0x203 [i915] [ 1189.192007] EAX: 00000000 EBX: dca74000 ECX: e0f68004 EDX: 00068004 [ 1189.192007] ESI: dd110c00 EDI: 400c0c37 EBP: dca7429c ESP: de365e2c [ 1189.192007] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 [ 1189.192007] Process upowerd (pid: 1464, ti=de364000 task=dcc8acb0 task.ti=de364000) [ 1189.192007] Stack: Mar 15 03:43:23 hostname kernel: [ 1189.192007] e0c2cda4 70000000 400c0c30 00000000 dd111000 de365e54 de365f24 dd110c00 [ 1189.192007] e0c22203 01000000 00000003 00000000 00000000 00000000 00000000 4353544e [ 1189.192007] 30383420 00000069 00000000 00000000 00000000 00000000 00000000 00000000 [ 1189.192007] Call Trace: Mar 15 03:43:23 hostname kernel: [ 1189.192007] [] ? intel_tv_detect+0x89/0x12d [i915] [ 1189.192007] [] ? status_show+0x0/0x2f [drm] [ 1189.192007] [] ? status_show+0x14/0x2f [drm] [Digression: what is upowerd doing reading those power hungry files?] Reported-by: Paul Menzel Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 44cff8a9ee8a974f9e931df910688e7fc1f0b0f9 Author: Phillip Lougher Date: Tue Mar 15 22:09:55 2011 +0000 Squashfs: handle corruption of directory structure Handle the rare case where a directory metadata block is uncompressed and corrupted, leading to a kernel oops in directory scanning (memcpy). Normally corruption is detected at the decompression stage and dealt with then, however, this will not happen if: - metadata isn't compressed (users can optionally request no metadata compression), or - the compressed metadata block was larger than the original, in which case the uncompressed version was used, or - the data was corrupt after decompression This patch fixes this by adding some sanity checks against known maximum values. Signed-off-by: Phillip Lougher commit 0724d46417545aa3035d88fb8885dffe68817a8c Author: Kumar Gala Date: Tue Mar 15 11:02:43 2011 -0500 i2c-mpc: Add support for 64bit system Currently i2c-mpc supports 32bit system only, this modification makes it supported on both 32-bit and 64-bit systems. The P5020 is the first 64-bit PPC system with the i2c-mpc controller. Based in patch from Xulei Signed-off-by: Kumar Gala Signed-off-by: Ben Dooks commit 986d4abbddf9e76184f6cabf66654ea8e61bcde5 Author: Randy Dunlap Date: Tue Mar 15 17:11:59 2011 -0700 sunrpc: fix printk format warning Fix printk format build warning: net/sunrpc/xprtrdma/verbs.c:1463: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'dma_addr_t' Signed-off-by: Randy Dunlap Signed-off-by: Trond Myklebust commit 4d4a76f3309edc671918a767b336492fbc80a16d Author: j223yang@asset.uwaterloo.ca Date: Thu Mar 10 12:40:28 2011 -0500 xprt: remove redundant null check 'req' is dereferenced before checked for NULL. The patch simply removes the check. Signed-off-by: Jinqiu Yang Signed-off-by: Trond Myklebust commit be8b981453a4904399cb090c1660618e250092d8 Author: David Dillow Date: Tue Jan 18 21:58:09 2011 -0500 IB/srp: try to use larger FMR sizes to cover our mappings Now that we can get larger SG lists, we can take advantage of HCAs that allow us to use larger FMR sizes. In many cases, we can use up to 512 entries, so start there and work our way down. Signed-off-by: David Dillow commit c07d424d6118d528ef71b22b7424bfc359c307a5 Author: David Dillow Date: Sun Jan 16 13:57:10 2011 -0500 IB/srp: add support for indirect tables that don't fit in SRP_CMD This allows us to guarantee the ability to submit up to 8 MB requests based on the current value of SCSI_MAX_SG_CHAIN_SEGMENTS. While FMR will usually condense the requests into 8 SG entries, it is imperative that the target support external tables in case the FMR mapping fails or is not supported. We add a safety valve to allow targets without the needed support to reap the benefits of the large tables, but fail in a manner that lets the user know that the data didn't make it to the device. The user must add "allow_ext_sg=1" to the target parameters to indicate that the target has the needed support. If indirect_sg_entries is not specified in the modules options, then the sg_tablesize for the target will default to cmd_sg_entries unless overridden by the target options. Signed-off-by: David Dillow commit 8f26c9ff9cd0317ad867bce972f69e0c6c2cbe3c Author: David Dillow Date: Fri Jan 14 19:45:50 2011 -0500 IB/srp: rework mapping engine to use multiple FMR entries Instead of forcing all of the S/G entries to fit in one FMR, and falling back to indirect descriptors if that fails, allow the use of as many FMRs as needed to map the request. This lays the groundwork for allowing indirect descriptor tables that are larger than can fit in the command IU, but should marginally improve performance now by reducing the number of indirect descriptors needed. We increase the minimum page size for the FMR pool to 4K, as larger pages help increase the coverage of each FMR, and it is rare that the kernel would send down a request with scattered 512 byte fragments. This patch also move some of the target initialization code afte the parsing of options, to keep it together with the new code that needs to allocate memory based on the options given. Signed-off-by: David Dillow commit 4924864404d0ce2c32a6d20b27b5b6fcb31e481d Author: David Dillow Date: Fri Jan 14 18:23:24 2011 -0500 IB/srp: allow sg_tablesize to be set for each target Different configurations of target software allow differing max sizes of the command IU. Allowing this to be changed per-target allows all targets on an initiator to get an optimal setting. We deprecate srp_sg_tablesize and replace it with cmd_sg_entries in preparation for allowing more indirect descriptors than can fit in the IU. Signed-off-by: David Dillow commit 961e0be89a5120a1409ebc525cca6f603615a8a8 Author: David Dillow Date: Fri Jan 14 17:32:07 2011 -0500 IB/srp: move IB CM setup completion into its own function This is to clean up prior to further changes. Signed-off-by: David Dillow commit 8c4037b501acd2ec3abc7925e66af8af40a2da9d Author: David Dillow Date: Fri Jan 14 17:02:23 2011 -0500 IB/srp: always avoid non-zero offsets into an FMR It is unclear exactly how this code works around Mellanox SRP targets, or if the problem is on the target side or in the HCA itself. In an abundance of caution, we should always enable the workaround. Signed-off-by: David Dillow commit 422e6c4bc4b48c15b3cb57a1ca71431abfc57e54 Merge: c83ce98 574197e Author: Linus Torvalds Date: Tue Mar 15 15:48:13 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (57 commits) tidy the trailing symlinks traversal up Turn resolution of trailing symlinks iterative everywhere simplify link_path_walk() tail Make trailing symlink resolution in path_lookupat() iterative update nd->inode in __do_follow_link() instead of after do_follow_link() pull handling of one pathname component into a helper fs: allow AT_EMPTY_PATH in linkat(), limit that to CAP_DAC_READ_SEARCH Allow passing O_PATH descriptors via SCM_RIGHTS datagrams readlinkat(), fchownat() and fstatat() with empty relative pathnames Allow O_PATH for symlinks New kind of open files - "location only". ext4: Copy fs UUID to superblock ext3: Copy fs UUID to superblock. vfs: Export file system uuid via /proc//mountinfo unistd.h: Add new syscalls numbers to asm-generic x86: Add new syscalls for x86_64 x86: Add new syscalls for x86_32 fs: Remove i_nlink check from file system link callback fs: Don't allow to create hardlink for deleted file vfs: Add open by file handle support ... commit c83ce989cb5ff86575821992ea82c4df5c388ebc Author: Trond Myklebust Date: Tue Mar 15 13:36:43 2011 -0400 VFS: Fix the nfs sillyrename regression in kernel 2.6.38 The new vfs locking scheme introduced in 2.6.38 breaks NFS sillyrename because the latter relies on being able to determine the parent directory of the dentry in the ->iput() callback in order to send the appropriate unlink rpc call. Looking at the code that cares about races with dput(), there doesn't seem to be anything that specifically uses d_parent as a test for whether or not there is a race: - __d_lookup_rcu(), __d_lookup() all test for d_hashed() after d_parent - shrink_dcache_for_umount() is safe since nothing else can rearrange the dentries in that super block. - have_submount(), select_parent() and d_genocide() can test for a deletion if we set the DCACHE_DISCONNECTED flag when the dentry is removed from the parent's d_subdirs list. Signed-off-by: Trond Myklebust Cc: stable@kernel.org (2.6.38, needs commit c826cb7dfce8 "dcache.c: create helper function for duplicated functionality" ) Signed-off-by: Linus Torvalds commit a002951c97ff8da49938c982a4c236bf2fafdc9f Merge: 521cb40 c151694 Author: James Morris Date: Wed Mar 16 09:41:17 2011 +1100 Merge branch 'next' into for-linus commit c826cb7dfce80512c26c984350077a25046bd215 Author: Linus Torvalds Date: Tue Mar 15 15:29:21 2011 -0700 dcache.c: create helper function for duplicated functionality This creates a helper function for he "try to ascend into the parent directory" case, which was written out in triplicate before. With all the locking and subtle sequence number stuff, we really don't want to duplicate that kind of code. Signed-off-by: Linus Torvalds commit 7313714775a6411402f63261c05fbb4ee3d5b64a Author: Eric Dumazet Date: Tue Mar 15 15:26:43 2011 -0700 xfrm: fix __xfrm_route_forward() This function should return 0 in case of error, 1 if OK commit 452edd598f60522 (xfrm: Return dst directly from xfrm_lookup()) got it wrong. Reported-and-bisected-by: Michael Smith Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c337ffb68e1e71bad069b14d2246fa1e0c31699c Merge: 30df754 84c0c69 Author: David S. Miller Date: Tue Mar 15 15:15:17 2011 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 30df754dedebf27ef90452944a723ba058d23396 Merge: 9ecb42f 1fb0ef3 Author: David S. Miller Date: Tue Mar 15 15:06:35 2011 -0700 Merge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip commit 9ecb42fda614c4e4f46e95712621510f8d746980 Author: Padmanabh Ratnakar Date: Tue Mar 15 14:57:09 2011 -0700 be2net: Fix UDP packet detected status in RX compl Status of UDP packet detection not getting populated in RX completion structure. This is required in csum_passed() routine. Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 638be344593b66ccca6802c6076a5b3d9200829d Author: Rémi Denis-Courmont Date: Tue Mar 15 14:55:49 2011 -0700 Phonet: fix aligned-mode pipe socket buffer header reserve When the pipe uses aligned-mode data packets, we must reserve 4 bytes instead of 3 for the pipe protocol header. Otherwise the Phonet header would not be aligned, resulting in potentially corrupted headers with later unaligned memory writes. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit bfd823bd74333615783d8108889814c6d82f2ab0 Author: Sony Chacko Date: Tue Mar 15 14:54:55 2011 -0700 netxen: support for GbE port settings o Enable setting speed and auto negotiation parameters for GbE ports. o Hardware do not support half duplex setting currently. David Miller: Amit please update your patch to silently reject link setting attempts that are unsupported by the device. Signed-off-by: Sony Chacko Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 84c0c6933cb0303fa006992a6659c2b46de4eb17 Author: Jeongtae Park Date: Tue Mar 15 14:52:48 2011 -0700 smsc911x: Fix build error when SMSC_TRACE() used This patch fixes build error when SMSC_TRACE() used. Signed-off-by: Jeongtae Park Signed-off-by: David S. Miller commit d87f4fe2121a017241e495fedc0a79d0dec05a92 Merge: 918690f 7ef5ed1 Author: David S. Miller Date: Tue Mar 15 14:50:09 2011 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit 6f168f2fa60f87e85e0df25e87e2372f22f5eb7c Author: Mike Rapoport Date: Wed Mar 9 16:31:18 2011 +0200 ARM: tegra: harmony: initialize the TPS65862 PMIC Initialize the PMIC voltage regulators and provide the supply map for PCI-e clock supply. The rest of the supplies should be added together with the drivers that use them. Signed-off-by: Mike Rapoport CC: Mark Brown Signed-off-by: Olof Johansson commit 944d46b5347c20be3a3f4c36a6d830e126d9735a Author: Mike Rapoport Date: Wed Mar 9 16:31:19 2011 +0200 ARM: tegra: update defconfig * Enable TPS6586x PMIC driver * Enable RealTek 8169 used on TrimSlice * Allow booting with root on NFS Signed-off-by: Mike Rapoport Signed-off-by: Olof Johansson commit ce005cf450b2c1c93e48c45a4cc717e9d104c054 Author: Mike Rapoport Date: Wed Mar 9 16:31:17 2011 +0200 ARM: tegra: harmony: update PCI-e initialization sequence On Harmony board PCI-e subsystem can be enabled only after certain voltage regulators are on. One of the regulators is an internal regulator on the PMIC and another one is controlled by a PMIC GPIO. Addition of the voltage control to the Harmony PCI-e initialization allows booting of kernel with CONFIG_TEGRA_PCI even if the PMIC driver is not loaded. In this case the PCI-e initialization will fail gracefully intead of hanging the system. Signed-off-by: Mike Rapoport Signed-off-by: Olof Johansson commit 574197e0de46a8a4db5c54ef7b65e43ffa8873a7 Author: Al Viro Date: Mon Mar 14 22:20:34 2011 -0400 tidy the trailing symlinks traversal up * pull the handling of current->total_link_count into __do_follow_link() * put the common "do ->put_link() if needed and path_put() the link" stuff into a helper (put_link(nd, link, cookie)) * rename __do_follow_link() to follow_link(), while we are at it Signed-off-by: Al Viro commit b356379a020bb7197603118bb1cbc903963aa198 Author: Al Viro Date: Mon Mar 14 21:54:55 2011 -0400 Turn resolution of trailing symlinks iterative everywhere The last remaining place (resolution of nested symlink) converted to the loop of the same kind we have in path_lookupat() and path_openat(). Note that we still *do* have a recursion in pathname resolution; can't avoid it, really. However, it's strictly for nested symlinks now - i.e. ones in the middle of a pathname. link_path_walk() has lost the tail now - it always walks everything except the last component. do_follow_link() renamed to nested_symlink() and moved down. Signed-off-by: Al Viro commit ce0525449da56444948c368f52e10f3db0465338 Author: Al Viro Date: Mon Mar 14 21:28:04 2011 -0400 simplify link_path_walk() tail Now that link_path_walk() is called without LOOKUP_PARENT only from do_follow_link(), we can simplify the checks in last component handling. First of all, checking if we'd arrived to a directory is not needed - the caller will check it anyway. And LOOKUP_FOLLOW is guaranteed to be there, since we only get to that place with nd->depth > 0. Signed-off-by: Al Viro commit bd92d7fed877ed1e6997e4f3f13dbcd872947653 Author: Al Viro Date: Mon Mar 14 19:54:59 2011 -0400 Make trailing symlink resolution in path_lookupat() iterative Now the only caller of link_path_walk() that does *not* pass LOOKUP_PARENT is do_follow_link() Signed-off-by: Al Viro commit b21041d0f72899ed815bd2cbf7275339c74737b6 Author: Al Viro Date: Mon Mar 14 20:01:51 2011 -0400 update nd->inode in __do_follow_link() instead of after do_follow_link() ... and note that we only need to do it for LAST_BIND symlinks Signed-off-by: Al Viro commit ce57dfc1791221ef58b6d6b8f5437fccefc4e187 Author: Al Viro Date: Sun Mar 13 19:58:58 2011 -0400 pull handling of one pathname component into a helper new helper: walk_component(). Handles everything except symlinks; returns negative on error, 0 on success and 1 on symlinks we decided to follow. Drops out of RCU mode on such symlinks. link_path_walk() and do_last() switched to using that. Signed-off-by: Al Viro commit 11a7b371b64ef39fc5fb1b6f2218eef7c4d035e3 Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:42 2011 +0530 fs: allow AT_EMPTY_PATH in linkat(), limit that to CAP_DAC_READ_SEARCH We don't want to allow creation of private hardlinks by different application using the fd passed to them via SCM_RIGHTS. So limit the null relative name usage in linkat syscall to CAP_DAC_READ_SEARCH Signed-off-by: Aneesh Kumar K.V commit 918690f9811029667eaf132dbfeb180c6e4e2029 Merge: 31111c2 106af2c Author: David S. Miller Date: Tue Mar 15 13:57:18 2011 -0700 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 44626e4a3bd764283193e14e64f9324e48b4bfd8 Author: Konrad Rzeszutek Wilk Date: Tue Mar 15 16:40:33 2011 -0400 xen: events: Fix compile error if CONFIG_SMP is not defined. drivers/xen/events.c:396: error: 'struct irq_data' has no member named 'affinity' Reported-by: Randy Dunlap Signed-off-by: Konrad Rzeszutek Wilk commit 31111c26d976ca0f298312f08e44cdb078005b03 Merge: 0c0217b 2f5dc63 Author: David S. Miller Date: Tue Mar 15 13:03:27 2011 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 Conflicts: Documentation/feature-removal-schedule.txt commit 5e814dd597c42daeb8d2a276e64a6ec986ad0e2a Author: Ingo Molnar Date: Tue Mar 15 20:51:09 2011 +0100 perf probe: Clean up probe_point_lazy_walker() return value Newer compilers (gcc 4.6) complains about: return ret < 0 ?: 0; For the following reason: util/probe-finder.c: In function ‘probe_point_lazy_walker’: util/probe-finder.c:1331:18: error: the omitted middle operand in ?: will always be ‘true’, suggest explicit middle operand [-Werror=parentheses] And indeed the return value is a somewhat obscure (but correct) value of 'true', so return 'ret' instead - this is cleaner and unconfuses GCC as well. Cc: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Masami Hiramatsu Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit b0aea14bdc4a9ee5d1e8cb78488263d6ce32095e Author: Vasiliy Kulikov Date: Sun Oct 17 18:51:41 2010 +0400 powerpc/85xx: Fix signedness bug in cache-sram sram_params.sram_size and sram_params.sram_offset were unsigned. If get_cache_sram_size() or get_cache_sram_offset() returns error code then it is not seen to the caller. Made sram_size and sram_offset signed. Signed-off-by: Vasiliy Kulikov Signed-off-by: Kumar Gala commit 2f5dc63123905a89d4260ab8ee08d19ec104db04 Author: Florian Westphal Date: Tue Mar 15 20:17:44 2011 +0100 netfilter: xt_addrtype: ipv6 support The kernel will refuse certain types that do not work in ipv6 mode. We can then add these features incrementally without risk of userspace breakage. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit de81bbea17650769882bc625d6b5df11ee7c4b24 Author: Florian Westphal Date: Tue Mar 15 20:16:20 2011 +0100 netfilter: ipt_addrtype: rename to xt_addrtype Followup patch will add ipv6 support. ipt_addrtype.h is retained for compatibility reasons, but no longer used by the kernel. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit a2b31dd93000136d82f675952e322ec18973a348 Author: Vivek Mahajan Date: Tue Dec 8 13:01:15 2009 +0530 powerpc/fsl: 85xx: document cache sram bindings Adds binding documentation for cache sram for the PQ3 and some QorIQ based platforms. Signed-off-by: Vivek Mahajan Signed-off-by: Kumar Gala commit 52052875549f6ecd6520279ee0f94e4721d80077 Author: Stuart Yoder Date: Wed Jan 19 16:30:14 2011 -0600 powerpc/fsl: define binding for fsl mpic interrupt controllers Define the binding for compatible = "fsl,mpic", including the definition of 4-cell interrupt specifiers. The 3rd and 4th cells are needed to define additional types of interrupt source outside the "normal" external and internal interrupts in FSL SoCs. Define error interrupt, IPIs, and PIC timer sources. Signed-off-by: Stuart Yoder Signed-off-by: Kumar Gala commit 6820fead714d57012428c96266e86105e39075e0 Author: Scott Wood Date: Mon Jan 17 14:25:28 2011 -0600 powerpc/fsl_msi: Handle msi-available-ranges better Now handles multiple ranges, doesn't make assumptions about interrupt specifier format, and doesn't claim interrupts that don't correspond to an available range. Also has some better error checking. The device tree binding is updated to clarify some existing assumptions. Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit 48a10cdfc0262ee7b5ccd4cbb673957e320ec563 Author: Julia Lawall Date: Tue Aug 31 17:48:55 2010 +0200 drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak Add a call to of_node_put in the error handling code following a call to of_find_compatible_node or of_find_node_by_type. This patch also substantially reorganizes the error handling code in the function, to that it is possible first to jump to code that frees qe_port and then to jump to code that also puts np. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ local idexpression x; expression E,E1,E2; statement S; @@ *x = (of_find_node_by_path |of_find_node_by_name |of_find_node_by_phandle |of_get_parent |of_get_next_parent |of_get_next_child |of_find_compatible_node |of_match_node |of_find_node_by_type |of_find_node_with_property |of_find_matching_node |of_parse_phandle )(...); ... if (x == NULL) S <... when != x = E *if (...) { ... when != of_node_put(x) when != if (...) { ... of_node_put(x); ... } ( return <+...x...+>; | * return ...; ) } ...> ( E2 = x; | of_node_put(x); ) // Signed-off-by: Julia Lawall Acked-by: Timur Tabi Acked-by: Grant Likely Signed-off-by: Kumar Gala commit afc0a07d4a283599ac3a6a31d7454e9baaeccca0 Author: Shan Hai Date: Wed Nov 17 10:28:53 2010 +0800 powerpc/85xx: Fix SPE float to integer conversion failure Conversion from float to integer should based on both the instruction encoding and the sign of the operand. A simple testcase to show the issue: static float fm; static signed int si_min = (-2147483647 - 1); static unsigned int ui; int main() { fm = (float) si_min; ; ui = (unsigned int)fm; printf("ui=%d, should be %d\n", ui, si_min); return 0; } Result: ui=-1, should be -2147483648 Signed-off-by: Shan Hai Signed-off-by: Kumar Gala commit 106af2c99a5249b809aaed45b8353ac087821f4a Merge: 0c0217b 7d2c16b Author: John W. Linville Date: Tue Mar 15 14:16:48 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 76ca07832842100b14a31ad8996dab7b0c28aa42 Merge: 27d2a8b b056b6a Author: Linus Torvalds Date: Tue Mar 15 10:59:09 2011 -0700 Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm * 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm: xen: suspend: remove xen_hvm_suspend xen: suspend: pull pre/post suspend hooks out into suspend_info xen: suspend: move arch specific pre/post suspend hooks into generic hooks xen: suspend: refactor non-arch specific pre/post suspend hooks xen: suspend: add "arch" to pre/post suspend hooks xen: suspend: pass extra hypercall argument via suspend_info struct xen: suspend: refactor cancellation flag into a structure xen: suspend: use HYPERVISOR_suspend for PVHVM case instead of open coding xen: switch to new schedop hypercall by default. xen: use new schedop interface for suspend xen: do not respond to unknown xenstore control requests xen: fix compile issue if XEN is enabled but XEN_PVHVM is disabled xen: PV on HVM: support PV spinlocks and IPIs xen: make the ballon driver work for hvm domains xen-blkfront: handle Xen major numbers other than XENVBD xen: do not use xen_info on HVM, set pv_info name to "Xen HVM" xen: no need to delay xen_setup_shutdown_event for hvm guests anymore commit 043332cf28368e38fdfcee1a4827025e8bdbc540 Merge: a396d43 db5d040 2a54390 36b87b4 Author: Roland Dreier Date: Tue Mar 15 10:58:04 2011 -0700 Merge branches 'cma', 'cxgb4', 'ipath' and 'qib' into for-next commit a396d43a35fb91f2d4920a4700d25ecc5ec92404 Author: Sean Hefty Date: Wed Feb 23 09:05:39 2011 -0800 RDMA/cma: Replace global lock in rdma_destroy_id() with id-specific one rdma_destroy_id currently uses the global rdma cm 'lock' to test if an rdma_cm_id has been bound to a device. This prevents an active address resolution callback handler from assigning a device to the rdma_cm_id after rdma_destroy_id checks for one. Instead, we can replace the use of the global lock around the check to the rdma_cm_id device pointer by setting the id state to destroying, then flushing all active callbacks. The latter is accomplished by acquiring and releasing the handler_mutex. Any active handler will complete first, and any newly scheduled handlers will find the rdma_cm_id in an invalid state. In addition to optimizing the current locking scheme, the use of the rdma_cm_id mutex is a more intuitive synchronization mechanism than that of the global lock. These changes are based on feedback from Doug Ledford while he was trying to debug a crash in the rdma cm destroy path. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8d8ac86564b616bc17054cbb6e727588da64c86b Author: Sean Hefty Date: Thu Mar 3 23:31:06 2011 +0000 IB/cm: Cancel pending LAP message when exiting IB_CM_ESTABLISH state This problem was reported by Moni Shoua and Amir Vadai : When destroying a cm_id from a context of a work queue and if the lap_state of this cm_id is IB_CM_LAP_SENT, we need to release the reference of this id that was taken upon the send of the LAP message. Otherwise, if the expected APR message gets lost, it is only after a long time that the reference will be released, while during that the work handler thread is not available to process other things. It turns out that we need to cancel any pending LAP messages whenever we transition out of the IB_CM_ESTABLISH state. This occurs when disconnecting - either sending or receiving a DREQ. It can also happen in a corner case where we receive a REJ message after sending an RTU, followed by a LAP. Add checks and cancel any outstanding LAP messages in these three cases. Canceling the LAP when sending a DREQ fixes the destroy problem reported by Moni. When a cm_id is destroyed in the IB_CM_ESTABLISHED state, it sends a DREQ to the remote side to notify the peer that the connection is going away. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 29963437a48475036353b95ab142bf199adb909e Author: Sean Hefty Date: Wed Feb 23 08:17:40 2011 -0800 IB/cm: Bump reference count on cm_id before invoking callback When processing a SIDR REQ, the ib_cm allocates a new cm_id. The refcount of the cm_id is initialized to 1. However, cm_process_work will decrement the refcount after invoking all callbacks. The result is that the cm_id will end up with refcount set to 0 by the end of the sidr req handler. If a user tries to destroy the cm_id, the destruction will proceed, under the incorrect assumption that no other threads are referencing the cm_id. This can lead to a crash when the cm callback thread tries to access the cm_id. This problem was noticed as part of a larger investigation with kernel crashes in the rdma_cm when running on a real time OS. Signed-off-by: Sean Hefty Acked-by: Doug Ledford Cc: Signed-off-by: Roland Dreier commit 41babf753cc82ab6208903625a084bf305c32d06 Author: Jaehoon Chung Date: Thu Feb 24 13:46:11 2011 +0900 mmc: dw_mmc: support DDR mode This patch adds DDR mode support to dw_mmc. If we set any bit in UHS_REG bit[16:31], the card of that slot is supported for DDR mode. For example, if UHS_REG[16] is set, card number 0 is DDR mode. Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park Acked-by: Will Newton Signed-off-by: Chris Ball commit e7054ba1f73c0a0e2489251499bdbc21b88b4190 Author: Chris Ball Date: Wed Feb 23 17:29:13 2011 -0500 mmc: via-sdmmc: Remove set-but-unused variable. drivers/mmc/host/via-sdmmc.c: In function ‘via_reset_pcictrl’: drivers/mmc/host/via-sdmmc.c:805:8: warning: variable ‘addrbase’ set but not used [-Wunused-but-set-variable] Signed-off-by: Chris Ball Cc: Harald Welte Acked-by: Wolfram Sang commit b3bd1b5b0054f716e58a65d4e2e449ea0252e9dd Author: Chris Ball Date: Wed Feb 23 23:17:43 2011 +0000 mmc: cb710: Return err value in cb710_wait_while_busy() Fixes: drivers/mmc/host/cb710-mmc.c: In function ‘cb710_wait_while_busy’: drivers/mmc/host/cb710-mmc.c:182:6: warning: variable ‘err’ set but not used [-Wunused-but-set-variable] Signed-off-by: Chris Ball Acked-by: Michał Mirosław Acked-by: Wolfram Sang commit 24c300199b2f9125169c09ca3e950b17c16e2eab Author: Chris Ball Date: Wed Feb 23 17:29:11 2011 -0500 mmc: sdhci-pci: Remove set-but-unused variable. drivers/mmc/host/sdhci-pci.c: In function ‘sdhci_pci_probe_slot’: drivers/mmc/host/sdhci-pci.c:913:18: warning: variable ‘addr’ set but not used [-Wunused-but-set-variable] Signed-off-by: Chris Ball Acked-by: Wolfram Sang commit e4243f13d10e5fbe2b84e211dcac3bc6e0792167 Author: Shawn Guo Date: Mon Feb 21 18:35:28 2011 +0800 mmc: mxs-mmc: add mmc host driver for i.MX23/28 This adds the mmc host driver for Freescale MXS-based SoC i.MX23/28. The driver calls into mxs-dma via generic dmaengine api for both pio and data transfer. Thanks Chris Ball for the indentation patch. Signed-off-by: Shawn Guo Reviewed-by: Arnd Bergmann Tested-by: Wolfram Sang Signed-off-by: Chris Ball commit 8154b5756d3cb850f846ff38cf35cbbb7c2b45fe Author: Wolfram Sang Date: Thu Feb 10 18:07:30 2011 +0100 mmc: sdhci-tegra: free irq on error and remove Signed-off-by: Wolfram Sang Acked-by: Olof Johansson Signed-off-by: Chris Ball commit f53fbde48ef0a5ce7733fbc84da18014d0a11cf0 Author: Sascha Hauer Date: Fri Feb 18 10:21:09 2011 +0100 mmc: mxcmmc: use dmaengine API This switches the mxcmmc driver to use the dmaengine API. Unlike the old one this one is always present in the tree, even if no DMA is implemented, hence we can remove all the #ifdefs in from the driver. The driver automatically switches to PIO mode if no DMA support or no suitable channel is available. Signed-off-by: Sascha Hauer Acked-by: Arnd Bergmann Signed-off-by: Chris Ball commit c9b2a06fb0efda37241861915a8639c27bddaa85 Author: Jaehoon Chung Date: Thu Feb 17 16:12:38 2011 +0900 mmc: dw_mmc: support 8-bit buswidth This patch adds support for 8-bit buswidth. dw_mmc can use 8-bit buswidth and set to CTYPE_8BIT in card-type register. Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park Acked-by: Will Newton Signed-off-by: Chris Ball commit 37b7785e3ac5128809340eaeb791ca7a471c4e32 Author: Jaehoon Chung Date: Thu Feb 17 13:09:04 2011 +0900 mmc: dw_mmc: modify quirks bit-shift control If we need some quirks, maybe add quirks in future But now, quirks value set to integer..later we should be confused.. So I think that need bit-shift control. And If we need not any quirks, we didn't set anything.. (Need not DW_MCI_QUIRK_NONE) Signed-off-by: Jaehoon Chung Acked-by: Will Newton Signed-off-by: Chris Ball commit 449bdc2d9d62794246351d10dd4534a239bf06b6 Author: Linus Walleij Date: Thu Feb 10 16:11:07 2011 +0100 mmc: tmio_mmc: use dmaengine helpers, drop submit check Use the new dmaengine helper functions, and drop the error check on the returned cookier from the dmaengine - we recently established that this is really not allowed to fail. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit 3383433ce70613514593c940a2ae4e6ab19f2b28 Author: Linus Walleij Date: Thu Feb 10 16:10:56 2011 +0100 mmc: tmio_mmc: drop dma_sglen state variable This variable doesn't seem to be used for anything after the other patches so just drop it. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit d7554caa2c3410c07a1889a08c66288edbdc216a Author: Linus Walleij Date: Thu Feb 10 16:10:47 2011 +0100 mmc: tmio_mmc: unmap with the proper sglen According to the DMA-API you shall unmap the sglists with the same sglist length as passed into the mapping function, not the returned value from the mapping function. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit 2dc7ddc1e7e68ee7793dda0ca0d659367d035e3d Author: Linus Walleij Date: Thu Feb 10 16:10:37 2011 +0100 mmc: tmio_mmc: map DMA buffers on the DMA engine device As established for the MMCI, it is proper to map the DMA buffers on the DMA engine which is the one actually performing the DMA. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit 27d2a8b97ebc4467e47722415b81ebe72d5f654f Merge: 010b8f4 44e6976 51de695 44b46c3 Author: Linus Torvalds Date: Tue Mar 15 10:49:16 2011 -0700 Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/ia64' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: ia64 build broken due to "xen: switch to new schedop hypercall by default." * 'stable/blkfront-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: Union the blkif_request request specific fields * 'stable/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: annotate functions which only call into __init at start of day xen p2m: annotate variable which appears unused xen: events: mark cpu_evtchn_mask_p as __refdata commit a5ece7d29d09714a690f83f6f0ce395f4374021e Author: Linus Walleij Date: Thu Feb 10 16:10:00 2011 +0100 mmc: sh_mmcif: use dmaengine helpers, drop submit check Use the new dmaengine helper functions, and drop the error check on the returned cookier from the dmaengine - we recently established that this is really not allowed to fail. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit f38f94c6b226f7c6888bedbcadf0ed2ddca7d029 Author: Linus Walleij Date: Thu Feb 10 16:09:50 2011 +0100 mmc: sh_mmcif: rename and retype activity variable The host_sglen is now actually used to keep track of whether DMA is active or not, so rename and retype it to bool. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit 9dc3fb5e4584630c50f7a5405efe9835d321ad44 Author: Linus Walleij Date: Thu Feb 10 16:09:40 2011 +0100 mmc: sh_mmcif: unmap with the proper sglen According to the DMA-API you shall unmap the sglists with the same sglist length as passed into the mapping function, not the returned value from the mapping function. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit 1ed828dbb4a90f273b2a3cc70c9c28306427ea7c Author: Linus Walleij Date: Thu Feb 10 16:09:29 2011 +0100 mmc: sh_mmcif: map DMA buffers on the DMA engine device As established for the MMCI, it is proper to map the DMA buffers on the DMA engine which is the one actually performing the DMA. Signed-off-by: Linus Walleij Signed-off-by: Chris Ball commit 5328906aa2e54a7a5e99e1ba8ee52b387e8be44b Author: Linus Walleij Date: Thu Feb 10 16:08:26 2011 +0100 mmc: atmel-mci: use dmaengine helper functions Use the new dmaengine helpers to make the code more readable. Signed-off-by: Linus Walleij Signed-off-by: Nicolas Ferre Signed-off-by: Chris Ball commit 88ce4db313bca1e4e6ef3b448471f85d3e14a854 Author: Linus Walleij Date: Thu Feb 10 16:08:16 2011 +0100 mmc: atmel-mci: conform to DMA-API Fixes the following: - It is perfectly legal for the dma_map_sg() to return fewer entries than were passed in. - Supply the returned numer of (possibly coalesced) entries to the device_pre_slave_sg() function. - Use the proper original sg_len when unmapping the sglist in the error path. Signed-off-by: Linus Walleij Signed-off-by: Nicolas Ferre Signed-off-by: Chris Ball commit 266ac3f297adb72fb6c34949a38337c6fad4c7a6 Author: Linus Walleij Date: Thu Feb 10 16:08:06 2011 +0100 mmc: atmel-mci: map DMA sglist on the DMA engine As established for the MMCI, it is proper to map the DMA buffers on the DMA engine which is the one actually performing the DMA. Signed-off-by: Linus Walleij Signed-off-by: Nicolas Ferre Signed-off-by: Chris Ball commit 5fd11c0754fa069b6aba64b65734aa2fb193552d Author: Manoj Iyer Date: Fri Feb 11 16:25:31 2011 -0600 mmc: sdhci: Add Ricoh e823 PCI ID Signed-off-by: Manoj Iyer Cc: Signed-off-by: Chris Ball commit ce1014965ae2538e7447b19879bd0e8109690b79 Author: Mark Brown Date: Thu Feb 10 10:58:37 2011 +0000 mmc: Ensure prototypes for SD API are visible in sd.c So we know the implementation and prototypes agree with each other. Signed-off-by: Mark Brown Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 50cec37c1ac24e9a02b845242a4712e2fb092b5c Author: Will Newton Date: Thu Feb 10 10:41:02 2011 +0000 mmc: Improve MMC_TEST config text. The test file is created under debugfs, not sysfs. Also remove the unnecessary default n. Signed-off-by: Will Newton Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit aadb9f4110096876c6f03073415439f76f0c61ca Author: Will Newton Date: Thu Feb 10 10:40:57 2011 +0000 mmc: dw_mmc: Enable low-power mode for the card clock. Setting this bit in the clock enable register will stop the clock when the card is in the IDLE state. Signed-off-by: Will Newton Signed-off-by: Chris Ball commit dd6c4b9807581b37bf68ba3cd160c6859f070d39 Author: Will Newton Date: Thu Feb 10 14:37:03 2011 -0500 mmc: dw_mmc: Run card detect tasklet during slot initialisation. We need to run the card detect tasklet at the end of slot initialisation as it is possible that a card has been inserted prior to boot, so we don't see an insertion interrupt and now the card is sitting there inserted but with no power to it. Signed-off-by: Neil Jones Signed-off-by: Will Newton Reviewed-by: Matt Fleming Signed-off-by: Chris Ball commit 170cba8cad5d9350f2c76bbd22013cc31ae26b0f Author: Fabio Estevam Date: Thu Jan 20 15:02:59 2011 -0200 mmc: mmc_mxc: Allow selection only for the correct platforms Currently MMC_MXC driver can be selected by all i.MX devices. Restrict its use only for the appropriate processors. Signed-off-by: Fabio Estevam Acked-by: Sascha Hauer Signed-off-by: Chris Ball commit a803d7fbc1ae64244eb8738aa0e4ac491b45d26c Author: Simon Horman Date: Wed Feb 9 07:25:22 2011 +0900 mmc: tmio_mmc: Improve readability of the output of pr_debug_status() Reviewed-by: Guennadi Liakhovetski Signed-off-by: Simon Horman Signed-off-by: Chris Ball commit a803d551d92079beb599cc37fa407c059c82c821 Author: Adrian Hunter Date: Tue Feb 8 13:41:03 2011 +0200 mmc: mmc_test: add tests to measure large sequential I/O performance Add two large sequential I/O performance tests: 35. Large sequential read into scattered pages 36. Large sequential write from scattered pages The tests measure transfer times for 10MiB, 100MiB, 1000MiB. Signed-off-by: Adrian Hunter Signed-off-by: Chris Ball commit b6056d12342f936256cbf64c86459af06f11cd5e Author: Adrian Hunter Date: Tue Feb 8 13:41:02 2011 +0200 mmc: mmc_test: add tests to measure random I/O operations per second Existing performance tests measure single or sequential I/O speed. Add two random I/O tests: 33. Random read performance by transfer size 34. Random write performance by transfer size Signed-off-by: Adrian Hunter Signed-off-by: Chris Ball commit 0532ff6358ae00615cfba7212f5075356b437c66 Author: Adrian Hunter Date: Tue Feb 8 13:41:01 2011 +0200 mmc: mmc_test: make performance test area size about 4MiB The test area size was set to the preferred erase size but for comparison purposes it is better if it is the same size for different devices. Make it a multiple of preferred erase size that is greater than or equal to 4MiB. Signed-off-by: Adrian Hunter Signed-off-by: Chris Ball commit 12f8ef8fb21f3b410b28eb57fc79bfe71232512a Author: Pierre Tardy Date: Sun Feb 6 19:04:17 2011 +0100 mmc: remove BROKEN_CLK_GATING quirk for wl1271 This sdio card supports having its sdio clock shutdown. It is also not using the SDIO IRQ, but rather uses a side gpio irq. Signed-off-by: Pierre Tardy Signed-off-by: Chris Ball commit db9935000d95ae3f9702b7ff6ac0eef2319d8772 Author: Pierre Tardy Date: Sun Feb 6 19:03:47 2011 +0100 mmc: add MMC_QUIRK_BROKEN_CLK_GATING Some sdio card are not following sdio standard, and do not work when the sdio bus's clock is gated. To keep functionnality for all legacy driver, we turn this quirk on for every sdio card. Drivers needs to disable the quirk manually when someone verifies that their supported card works with clock gating. Signed-off-by: Pierre Tardy Acked-by: Ohad Ben-Cohen Signed-off-by: Chris Ball commit 57f0adc7eaaf4315d568e72069dbe48aa7e20995 Author: Pierre Tardy Date: Sun Feb 6 19:03:46 2011 +0100 mmc: add per device quirk placeholder Some cards have quirks valid for every platforms using current platform quirk hooks leads to a lot of code and debug duplication. So we inspire a bit from what exists in PCI subsystem and do our own per vendorid/deviceid quirk. We still drop the complexity of the pci quirk system (with special section tables, and so on). That can be added later if needed. Signed-off-by: Pierre Tardy Acked-by: Linus Walleij Acked-by: Ohad Ben-Cohen Signed-off-by: Chris Ball commit 66c036e0142fed2484d58a2d3c7a4d21ba32b6a6 Author: Pierre Tardy Date: Sun Feb 6 19:02:48 2011 +0100 mmc: put the led blinking code after clock ungating Since mmc clock gating can also be used as a power gating tip, it's better to put the led blinking after having ungated the clock. Signed-off-by: Pierre Tardy Acked-by: Linus Walleij Signed-off-by: Chris Ball commit 54d6b44a5f0da708e8a9e496df304e05e8748ef9 Author: Pawel Moll Date: Sun Feb 6 15:06:24 2011 -0500 mmc: mmc_test: Only warn about not waiting for busy if it's supported If the MMC host controller does not support waiting for card signaling busy state (MMC_CAP_WAIT_WHILE_BUSY cap), there is no point in prining the relevant warning message. Signed-off-by: Pawel Moll Reviewed-by: Matt Fleming Signed-off-by: Chris Ball commit 732f0e31db03c84005578927ed9d4e996c3c0020 Author: Kyungmin Park Date: Sat Oct 30 12:58:56 2010 +0900 mmc: sdhci-s3c: Auto CMD12 support Samsung SDHCI host controller supports the Auto CMD12. Signed-off-by: Kyungmin Park Signed-off-by: Chris Ball commit 3362177fe1b7c23ee8497ee720ab4d6f6ba0b840 Author: Marc-André Hébert Date: Mon Jan 31 12:31:24 2011 -0500 mmc: Fix the block device read only flag While the MMC handled the card's read only flag correctly on open, it did not setup the flag in the allocated disk structure. The consequence being that probing the /sys/class/block/mmcblkX/ro attribute always reported 0. Signed-off-by: Marc-Andre Hebert Reviewed-by: Chris Ball Tested-by: Chris Ball Signed-off-by: Chris Ball commit 709de99df0ecf3102e7728fbd876a3591859f423 Author: Chuanxiao Dong Date: Sat Jan 22 04:09:41 2011 +0800 mmc: export eMMC4.4 enhanced area details to sysfs Enhanced area feature is a new feature defined in eMMC4.4 standard. This user data area provides higher performance/reliability, at the expense of using twice the effective media space due to the area using SLC. The MMC driver now reads out the enhanced area offset and size and adds them to the device attributes in sysfs. Enabling the enhanced area can only be done once, and should be done in manufacturing. To use this feature, bit ERASE_GRP_DEF should also be set. Documentation/ABI/testing/sysfs-devices-mmc describes the two new attributes. Signed-off-by: Chuanxiao Dong Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 010b8f4e264b0b6f596186574956dde2fa02df1c Merge: 397fae0 71eef7d Author: Linus Torvalds Date: Tue Mar 15 10:47:56 2011 -0700 Merge branch 'stable/irq.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/irq.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: events: remove dom0 specific xen_create_msi_irq xen: events: use xen_bind_pirq_msi_to_irq from xen_create_msi_irq xen: events: push set_irq_msi down into xen_create_msi_irq xen: events: update pirq_to_irq in xen_create_msi_irq xen: events: refactor xen_create_msi_irq slightly xen: events: separate MSI PIRQ allocation from PIRQ binding to IRQ xen: events: assume PHYSDEVOP_get_free_pirq exists xen: pci: collapse apic_register_gsi_xen_hvm and xen_hvm_register_pirq xen: events: return irq from xen_allocate_pirq_msi xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi xen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq available. xen: pci: only define xen_initdom_setup_msi_irqs if CONFIG_XEN_DOM0 commit 397fae081869784d07cd4edde0ddf436ca2011e0 Merge: c7146dd 1aa0b51 3d74a53 Author: Linus Torvalds Date: Tue Mar 15 10:47:16 2011 -0700 Merge branches 'stable/irq.rework' and 'stable/pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/irq.rework' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/irq: Cleanup up the pirq_to_irq for DomU PV PCI passthrough guests as well. xen: Use IRQF_FORCE_RESUME xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend. xen: Fix compile error introduced by "switch to new irq_chip functions" xen: Switch to new irq_chip functions xen: Remove stale irq_chip.end xen: events: do not free legacy IRQs xen: events: allocate GSIs and dynamic IRQs from separate IRQ ranges. xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq xen:events: move find_unbound_irq inside CONFIG_PCI_MSI xen: handled remapped IRQs when enabling a pcifront PCI device. genirq: Add IRQF_FORCE_RESUME * 'stable/pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: pci/xen: When free-ing MSI-X/MSI irq->desc also use generic code. pci/xen: Cleanup: convert int** to int[] pci/xen: Use xen_allocate_pirq_msi instead of xen_allocate_pirq xen-pcifront: Sanity check the MSI/MSI-X values xen-pcifront: don't use flush_scheduled_work() commit c7146dd0090b9c98ae8525900abf1c38fc7e4e0d Merge: 521cb40 706cc9d 86b3212 Author: Linus Torvalds Date: Tue Mar 15 10:32:15 2011 -0700 Merge branches 'stable/p2m-identity.v4.9.1' and 'stable/e820' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/p2m-identity.v4.9.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/m2p: Check whether the MFN has IDENTITY_FRAME bit set.. xen/m2p: No need to catch exceptions when we know that there is no RAM xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set. xen/debugfs: Add 'p2m' file for printing out the P2M layout. xen/setup: Set identity mapping for non-RAM E820 and E820 gaps. xen/mmu: WARN_ON when racing to swap middle leaf. xen/mmu: Set _PAGE_IOMAP if PFN is an identity PFN. xen/mmu: Add the notion of identity (1-1) mapping. xen: Mark all initial reserved pages for the balloon as INVALID_P2M_ENTRY. * 'stable/e820' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/e820: Don't mark balloon memory as E820_UNUSABLE when running as guest and fix overflow. xen/setup: Inhibit resource API from using System RAM E820 gaps as PCI mem gaps. commit 25ae21a10112875763c18b385624df713a288a05 Author: Sean Hefty Date: Wed Feb 23 08:11:32 2011 -0800 RDMA/cma: Fix crash in request handlers Doug Ledford and Red Hat reported a crash when running the rdma_cm on a real-time OS. The crash has the following call trace: cm_process_work cma_req_handler cma_disable_callback rdma_create_id kzalloc init_completion cma_get_net_info cma_save_net_info cma_any_addr cma_zero_addr rdma_translate_ip rdma_copy_addr cma_acquire_dev rdma_addr_get_sgid ib_find_cached_gid cma_attach_to_dev ucma_event_handler kzalloc ib_copy_ah_attr_to_user cma_comp [ preempted ] cma_write copy_from_user ucma_destroy_id copy_from_user _ucma_find_context ucma_put_ctx ucma_free_ctx rdma_destroy_id cma_exch cma_cancel_operation rdma_node_get_transport rt_mutex_slowunlock bad_area_nosemaphore oops_enter They were able to reproduce the crash multiple times with the following details: Crash seems to always happen on the: mutex_unlock(&conn_id->handler_mutex); as conn_id looks to have been freed during this code path. An examination of the code shows that a race exists in the request handlers. When a new connection request is received, the rdma_cm allocates a new connection identifier. This identifier has a single reference count on it. If a user calls rdma_destroy_id() from another thread after receiving a callback, rdma_destroy_id will proceed to destroy the id and free the associated memory. However, the request handlers may still be in the process of running. When control returns to the request handlers, they can attempt to access the newly created identifiers. Fix this by holding a reference on the newly created rdma_cm_id until the request handler is through accessing it. Signed-off-by: Sean Hefty Acked-by: Doug Ledford Cc: Signed-off-by: Roland Dreier commit 9ced9f03d12d7539e86b0bff5bc750153c976c34 Merge: 9b963f3 b0b6ff0 Author: Russell King Date: Tue Mar 15 16:32:47 2011 +0000 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/mm/Kconfig commit 09adc80c611bb8902daa8ccfe34dbbc009d6befe Author: Sage Weil Date: Fri Feb 4 21:38:47 2011 -0800 ceph: preserve I_COMPLETE across rename d_move puts the renamed dentry at the end of d_subdirs, screwing with our cached dentry directory offsets. We were just clearing I_COMPLETE to avoid any possibility of trouble. However, assigning the renamed dentry an offset at the end of the directory (to match it's new d_subdirs position) is sufficient to maintain correct behavior and hold onto I_COMPLETE. This is especially important for workloads like rsync, which renames files into place. Before, we would lose I_COMPLETE and do MDS lookups for each file. With this patch we only talk to the MDS on create and rename. Signed-off-by: Sage Weil commit b09734b1f4abd86e046777f0f268215b4ef1b523 Author: Tommi Virtanen Date: Wed Feb 2 11:39:32 2011 -0800 libceph: Fix base64-decoding when input ends in newline. It used to return -EINVAL because it thought the end was not aligned to 4 bytes. Clean up superfluous src < end test in if, the while itself guarantees that. Signed-off-by: Tommi Virtanen Signed-off-by: Sage Weil commit 6966727db1389f4926c6fa6e87a600112a5658b9 Author: Heiko Carstens Date: Tue Mar 15 17:08:33 2011 +0100 [S390] kexec: Disable ftrace during kexec Disable ftrace during kexec. Same as on x86/powerpc. ac4414e "powerpc/kdump: Disable ftrace during kexec". Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d7b081ac0b8eee5f2a58123235061ee1b99a4f4d Author: Heiko Carstens Date: Tue Mar 15 17:08:32 2011 +0100 [S390] support XZ compressed kernel Add support for XZ compressed kernel. Same as on x86 and sh. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 3041b6ab5f36ac303981e9f170ff2ae43dc9d125 Author: Sebastian Ott Date: Tue Mar 15 17:08:31 2011 +0100 [S390] css_bus_type: make it static Make css_bus_type static. Subchannel drivers have to use css_driver_register. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit e6aed122a9185d0fe5890f02ea8efc32c355bc44 Author: Sebastian Ott Date: Tue Mar 15 17:08:30 2011 +0100 [S390] css_driver: remove duplicate members Remove the owner and name members of struct css_driver and convert all drivers to store this data in the embedded struct device_driver. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 085ee9db88bebaadd6d54751b0ced8db486dddfc Author: Sebastian Ott Date: Tue Mar 15 17:08:29 2011 +0100 [S390] css: remove subchannel private All subchannel drivers use drv_data, so get rid of the additional private pointer of struct subchannel. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 85fb534e27eca3f433a7b53bb78cf208b92bf190 Author: Sebastian Ott Date: Tue Mar 15 17:08:28 2011 +0100 [S390] css: move chsc_private to drv_data Use the subchannels drv_data to access chsc_private for chsc subchannels. Note: Also set the drv_data prior to the cio_enable_subchannel call, since we can receive an interrupt the moment we enable the subchannel and the IRQ handler relies on this data. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit f92519e83e3bd509cb861a946701a26f74cb77fa Author: Sebastian Ott Date: Tue Mar 15 17:08:27 2011 +0100 [S390] css: move io_private to drv_data Use the subchannels drv_data to access io_subchannel_private for io subchannels. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 97eb6bfcb942a59f5c8d273523d68c6a0f57a6f2 Author: Sebastian Ott Date: Tue Mar 15 17:08:26 2011 +0100 [S390] cio: move cdev pointer to io_subchannel_private Move the subchannels ccw device pointer from drv_data to the private data for I/O subchannels, since it is not the only drv_data for I/O subchannels. The next step will be to make io_subchannel_private the new drv_data for I/O subchannels. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit c513d07a2df0f7076c1707274e29737f09df3b7f Author: Sebastian Ott Date: Tue Mar 15 17:08:25 2011 +0100 [S390] cio: move options to io_sch_private Move the options member from struct subchannel to io_subchannel_private since it's I/O subchannel specific. Also remove the unused cio_get_options function. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit dbda8ce5407c731a0108a35db3e058d5d350dd80 Author: Sebastian Ott Date: Tue Mar 15 17:08:24 2011 +0100 [S390] cio: move asms to generic header The ssch and csch functions are not I/O subchannel specific, thus move them from io_sch.h to ioasm.h Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 9e6f9f851cfa41f42f8985e0b82a54b1b28d3465 Author: Sebastian Ott Date: Tue Mar 15 17:08:23 2011 +0100 [S390] cio: move orb definitions to separate header Move the data definition for the orb union to a separate header file. Also apply the curent codingstyle. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 305b1523250faf9675919def94906775992ce52d Author: Jan Glauber Date: Tue Mar 15 17:08:22 2011 +0100 [S390] Write protect module text and RO data Implement write protection for kernel modules text and read-only data sections by implementing set_memory_[ro|rw] on s390. Since s390 has no execute bit in the pte's NX is not supported. set_memory_[ro|rw] will only work on normal pages and not on large pages, so in case a large page should be modified bail out with a warning. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit d54cddb620fa493968111f479029dcd910fcb921 Author: Heiko Carstens Date: Tue Mar 15 17:08:21 2011 +0100 [S390] dasd: get rid of compile warning Get rid of this: drivers/s390/block/dasd_eckd.c: In function 'dasd_eckd_build_cp_tpm_track.clone.8': drivers/s390/block/dasd_eckd.c:2589:34: warning: 'len_to_track_end' may be used uninitialized in this function Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ee5894fb0f128476dc9afb2ed50cab1427dfe0c3 Author: Sebastian Ott Date: Tue Mar 15 17:08:20 2011 +0100 [S390] remove superfluous check from do_IRQ Don't check for the int_type if an adapter interrupt is presented. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 2c190da477c9ab167f5bb37414d99ef2063b388a Author: Jan Glauber Date: Tue Mar 15 17:08:19 2011 +0100 [S390] remove redundant stack check option Newer gcc versions offer an architecture-independent option to check the stack size and warn if it reaches a certain limit. This option already existed for s390 by using -mwarn-dynamicstack. Since one stack check option is enough remove the s390 specific stack check but keep the option that warns about dynamic stack usage because that is not covered by the generic option. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 112e75466f63997d0f4c3c13ecf999e36aea692f Author: Timur Tabi Date: Tue Feb 8 17:39:46 2011 -0600 watchdog: booke_wdt: clean up status messages Improve the status messages that are displayed during some operations of the PowerPC watchdog timer driver. When the watchdog is enabled, the timeout is displayed as a number of seconds, instead of an obscure "period". The "period" is the position of a bit in a 64-bit timer register. The higher the value, the quicker the watchdog timeout occurs. Some people chose a high "period" value for the timer and get confused as to why the board resets within a few seconds. Messages displayed during open and close are now debug messages, so that they don't clutter the console by default. Finally, printk() is replaced with the pr_xxx() equivalent. Signed-off-by: Timur Tabi Signed-off-by: Wim Van Sebroeck commit 5f3b27569fc0286a51f8d0655c7fb4f5b36aea65 Author: Wim Van Sebroeck Date: Wed Feb 23 20:04:38 2011 +0000 watchdog: cleanup spaces before tabs cleanup spaces before tabs in drivers/watchdog/ Signed-off-by: Wim Van Sebroeck commit 4562f53940432369df88e195ef8f9b642bdf7cd6 Author: Wim Van Sebroeck Date: Mon Feb 21 12:16:44 2011 +0000 watchdog: convert to DEFINE_PCI_DEVICE_TABLE Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE tables. Signed-off-by: Wim Van Sebroeck commit 066d6c7f4ec94d40d13061714489783916548cdb Author: Jan Beulich Date: Mon Oct 4 10:37:26 2010 +0100 watchdog: Xen watchdog driver While the hypervisor change adding SCHEDOP_watchdog support included a daemon to make use of the new functionality, having a kernel driver for /dev/watchdog so that user space code doesn't need to distinguish non-Xen and Xen seems to be preferable. Signed-off-by: Jan Beulich Cc: Jeremy Fitzhardinge Signed-off-by: Wim Van Sebroeck commit 57539c1cf9f146ab9988a350dbc2d7e69a8a5c30 Author: Donald Johnson Date: Wed Feb 2 16:20:16 2011 +0000 watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms. This submission includes: - Fix to intel_scu_write() to start watchdog timer the on the first write, and refresh on subsequent writes. This enables Open, write, write, ... usage model. - Moves boot parameter checks from intel_scu_open() to intel_scu_watchdog_init(), so driver init will fail if these parameters are out of bounds. - Adds check for whether process waiting in wait_event_interruptible() received a signal while it was waiting. - Other small error handling changes. Removed the read() method for now as that wass a non-standard behaviour. Signed-off-by: Donald Johnson Signed-off-by: Shuduo Sang Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 742e4b630895d751812b0682750db76c8072bf37 Author: Wim Van Sebroeck Date: Sun Jan 16 19:05:39 2011 +0000 watchdog: jz4740_wdt - fix magic character checking When writing to /dev/watchdog all characters should be checked for the magic character 'V'. Signed-off-by: Wim Van Sebroeck commit f865c35224bb310a1b464062ae1e946d261708e3 Author: Paul Cercueil Date: Sun Dec 5 21:08:22 2010 +0100 watchdog: add JZ4740 watchdog driver Adds support for the hardware watchdog found in Ingenic's jz4740 System-on-Chip. Signed-off-by: Paul Cercueil Signed-off-by: Wim Van Sebroeck commit 4bc30272a15c58fc358bde093703d23bc0cf8e66 Author: Huaro Tomita Date: Fri Jan 21 07:37:51 2011 +0900 watchdog: it87_wdt: Add support for IT8721F watchdog This patch adds support for a watchdog in IT8721F Super IO chip to it87_wdt driver. This new chips differ from the older IT87xxxF chips in the following ways: * WDT_GAMEPORT is not in IT8721F. * WDT_PWROK is not in IT8721F. Signed-off-by: Haruo Tomita Signed-off-by: Wim Van Sebroeck commit a4616153deae053b29a2b7dd9ec4b2a225accfc5 Author: Tony Camuso Date: Fri Feb 4 17:38:59 2011 -0500 watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled Builds the hpwdt driver as a module by default. If the hardware is present, the module will be loaded. Also, if hpwdt is loaded, it will decode NMIs by default. This has been made possible by he patches to hpwdt made by Dann Frazier as well as related patches submitted by Don Zickus. hpwdt only loads on hp ProLiant x86 32-bit and 64-bit platforms. Signed-off-by: Tony Camuso Signed-off-by: Wim Van Sebroeck commit ea6649c721e0d8d2f79ae13ad9a21444f69dae70 Author: Naga Chumbalkar Date: Fri Feb 4 19:47:13 2011 +0000 watchdog: hpwdt: Fix a couple of typos Fix some typos. Signed-off-by: Naga Chumbalkar Signed-off-by: Wim Van Sebroeck commit 9b963f32c38b4c7d2da667e4458967b550f30bee Merge: 4c4070a 60d97a8 Author: Russell King Date: Tue Mar 15 15:41:15 2011 +0000 Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable commit cf773702b912544fdb8573c5f4299513d66bb0bf Author: Xulei Date: Wed Jan 19 17:07:30 2011 +0800 powerpc/85xx: Update sata controller compatible for p1022ds board Update p1022 sata compatible to "fsl,p1022-sata", "fsl,pq-sata-v2". p1022ds sata controller is v2 version comparing previous FSL sata controller, for example, mpc8536. Signed-off-by: Lei Xu Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit 2f957fc9595b5baaae7b5a3dc8c83b3a9950a39e Author: Xulei Date: Wed Jan 19 17:07:29 2011 +0800 ATA: Add FSL sata v2 controller support In FSL sata v2 block, the snoop bit of PRDT Word3 description information is at bit28 instead of bit22. This patch adds FSL sata v2 probe and resolve this difference. Signed-off-by: Lei Xu Signed-off-by: Roy Zang Acked-by: Jeff Garzik Signed-off-by: Kumar Gala commit 0e00f7aed6af21fc09b2a94d28bc34e449bd3a53 Author: Mathieu Desnoyers Date: Thu Mar 3 11:01:37 2011 -0500 x86: stop_machine_text_poke() should issue sync_core() Intel Archiecture Software Developer's Manual section 7.1.3 specifies that a core serializing instruction such as "cpuid" should be executed on _each_ core before the new instruction is made visible. Failure to do so can lead to unspecified behavior (Intel XMC erratas include General Protection Fault in the list), so we should avoid this at all cost. This problem can affect modified code executed by interrupt handlers after interrupt are re-enabled at the end of stop_machine, because no core serializing instruction is executed between the code modification and the moment interrupts are reenabled. Because stop_machine_text_poke performs the text modification from the first CPU decrementing stop_machine_first, modified code executed in thread context is also affected by this problem. To explain why, we have to split the CPUs in two categories: the CPU that initiates the text modification (calls text_poke_smp) and all the others. The scheduler, executed on all other CPUs after stop_machine, issues an "iret" core serializing instruction, and therefore handles core serialization for all these CPUs. However, the text modification initiator can continue its execution on the same thread and access the modified text without any scheduler call. Given that the CPU that initiates the code modification is not guaranteed to be the one actually performing the code modification, it falls into the XMC errata. Q: Isn't this executed from an IPI handler, which will return with IRET (a serializing instruction) anyway? A: No, now stop_machine uses per-cpu workqueue, so that handler will be executed from worker threads. There is no iret anymore. Signed-off-by: Mathieu Desnoyers LKML-Reference: <20110303160137.GB1590@Krystal> Reviewed-by: Masami Hiramatsu Cc: Cc: Arjan van de Ven Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Andrew Morton Cc: Andi Kleen Cc: Frederic Weisbecker Signed-off-by: H. Peter Anvin commit d1dcfbbb9f57a1f380e824caddc2c77b48a3a96b Author: Anatolij Gustschin Date: Sat Jan 8 16:51:16 2011 +0100 powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable Commit da3ed89e7ce272ebcc918487e2a28736ca0dd6bb added 'fsl,qoriq-gpio' compatiable searching in the old way using for_each_compatible_node(). But the driver have previously been changed to use a struct of_device_id compatible list passed to for_each_matching_node(). Add 'fsl,qoriq-gpio' compatiable to the existing compatible list instead of adding another for_each_compatible_node() loop. Signed-off-by: Anatolij Gustschin Signed-off-by: Kumar Gala commit 60d97a840175d3becb2e6de36537a5cdfc0ec3a9 Author: Sergei Shtylyov Date: Sun Mar 13 20:06:59 2011 +0000 davinci: DM644x EVM: register MUSB device earlier The MUSB driver doesn't see its platform device on DM644x EVM board anymore since commit 73b089b052a69020b953312a624a6e1eb5b81fab (usb: musb: split davinci to its own platform_driver) because the new probe is called as subsys_initcall() now, and the device is registered later than that by the board code. Move the registration to davinci_evm_init() -- it's safe to do so because the MUSB core device still gets initialized as fs_initcall() -- which is late enough for the I2C GPIO expander (which controls VBUS) to be initialized. Signed-off-by: Sergei Shtylyov Acked-by: Felipe Balbi Tested-by: Sekhar Nori Signed-off-by: Kevin Hilman commit f6e5306ecf269cac52cb06a2f356431f63640595 Author: Cyril Chemparathy Date: Tue Jan 18 19:21:41 2011 +0000 davinci: add spi devices on tnetv107x evm This patch adds definitions for spi devices on the tnetv107x evm platform. Signed-off-by: Cyril Chemparathy Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 08e0e1d5aec4d02153654eb7e54ba621b71d9c5a Author: Cyril Chemparathy Date: Tue Jan 18 19:21:40 2011 +0000 davinci: add ssp config for tnetv107x evm board This patch adds SSP configuration and pin muxing info for tnetv107x evm boards. Signed-off-by: Cyril Chemparathy Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 24981753dd7427f14324e45b659aeba8c1c66b11 Author: Cyril Chemparathy Date: Tue Jan 18 19:21:39 2011 +0000 davinci: add tnetv107x ssp platform device This patch adds an SSP platform device definition for the tnetv107x soc family. The clock lookup entry has also been updated to match. Signed-off-by: Cyril Chemparathy Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit a72aeefebe6545ad5c9c699e1121019c1709ca77 Author: Cyril Chemparathy Date: Tue Jan 18 19:21:36 2011 +0000 spi: add ti-ssp spi master driver This patch adds an SPI master implementation that operates on top of an underlying TI-SSP port. Acked-by: Grant Likely Signed-off-by: Cyril Chemparathy Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 03df0f629483f941f83ee2fbb180a4425e99dd23 Author: Cyril Chemparathy Date: Tue Jan 18 19:21:35 2011 +0000 mfd: add driver for sequencer serial port TI's sequencer serial port (TI-SSP) is a jack-of-all-trades type of serial port device. It has a built-in programmable execution engine that can be programmed to operate as almost any serial bus (I2C, SPI, EasyScale, and others). This patch adds a driver for this controller device. The driver does not expose a user-land interface. Protocol drivers built on top of this layer are expected to remain in-kernel. Signed-off-by: Cyril Chemparathy Acked-by: Samuel Ortiz Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 3cc5a0f09e7e454a2f2000dac749d07fea9fc004 Author: Holger Brunck Date: Thu Jan 13 13:11:27 2011 +0100 powerpc/8xx: remove obsolete mgsuvd board The MPC852 based mgsuvd board from Keymile was initially ported, but later on not developed further. This patch removes the respective files to decrease merging conflicts and unneeded maintenance. Signed-off-by: Holger Brunck Acked-by: Heiko Schocher Cc: Vitaly Bordug Cc: Marcelo Tosatti Signed-off-by: Kumar Gala commit c513e7c9f7df989124d3b668245df419e9141ca9 Author: Holger Brunck Date: Thu Mar 10 12:52:45 2011 +0100 powerpc/82xx: rename and update mgcoge board support The mgcoge board from keymile is now base for some other similar boards. Therefore the board specific name mgcoge was renamed to a generic name km82xx. Additionally some enhancements were made: - rework partition table in dts file - add cpm2_pio_c gpio controller in dts file - update defconfig - add pin description for SCC1 - add pin description and configuration for USB Signed-off-by: Holger Brunck Acked-by: Heiko Schocher CC: Benjamin Herrenschmidt CC: Heiko Schocher Signed-off-by: Kumar Gala commit 93e2b95c81042da479656b213acc92f7542c6c39 Author: Holger Brunck Date: Fri Mar 11 08:02:44 2011 +0100 powerpc/83xx: rename and update kmeter1 Beside the MPC 8360 based board kmeter1 other km83xx boards from keymile will follow. Therefore the board specific naming kmeter1 for functions and files were replaced with km83xx. Additionally some updates were made: - update defconfig for 2.6.38 - rework flash partitioning in dts file - add gpio controller for qe_pio_c in dts Signed-off-by: Holger Brunck Acked-by: Heiko Schocher CC: Benjamin Herrenschmidt CC: Heiko Schocher Signed-off-by: Kumar Gala commit ac6f120369ffe66058518fabf90cdd53b2503a82 Author: Liu Yu Date: Tue Jan 25 14:02:13 2011 +0800 powerpc/85xx: Workaroudn e500 CPU erratum A005 This erratum can occur if a single-precision floating-point, double-precision floating-point or vector floating-point instruction on a mispredicted branch path signals one of the floating-point data interrupts which are enabled by the SPEFSCR (FINVE, FDBZE, FUNFE or FOVFE bits). This interrupt must be recorded in a one-cycle window when the misprediction is resolved. If this extremely rare event should occur, the result could be: The SPE Data Exception from the mispredicted path may be reported erroneously if a single-precision floating-point, double-precision floating-point or vector floating-point instruction is the second instruction on the correct branch path. According to errata description, some efp instructions which are not supposed to trigger SPE exceptions can trigger the exceptions in this case. However, as we haven't emulated these instructions here, a signal will send to userspace, and userspace application would exit. This patch re-issue the efp instruction that we haven't emulated, so that hardware can properly execute it again if this case happen. Signed-off-by: Liu Yu Signed-off-by: Kumar Gala commit 7c9e592e1f6a994d2903c9b055e488ec90f58159 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:11 2011 +0530 fs/9p: Make the writeback_fid owned by root Changes to make sure writeback fid is owned by root Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 3dc5436aa5719be029bbc2bef0e5cb0312e4ff88 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:11 2011 +0530 fs/9p: Writeback dirty data before setattr change file attribute can result in making the file readonly. So flush the dirty pages before that. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit f10fc50f1adaf40fdd5da6dd154ecb464b468e2f Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:10 2011 +0530 fs/9p: call vmtruncate before setattr 9p opeation We need to call vmtruncate before 9p setattr operation, otherwise we could write back some dirty pages between setattr with ATTR_SIZE and vmtruncate causing some truncated pages to be written back to server Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit c06c066a083aa0a336d6b2b1ed502dd0b8488ac7 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:09 2011 +0530 fs/9p: Properly update inode attributes on link With caching enabled, we need to make sure we don't update inode->i_size via stat2inode because we could have dirty data which is not yet written to the server Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit e0459f57b8b3bbabf6f11f73da4d17abb0c159de Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:09 2011 +0530 fs/9p: Prevent multiple inclusion of same header Add necessary #ifndef #endif blocks to avoid mulitple inclusion of same headers Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 23b08e97f2c0d68c2a46a11e4fd8a4686d7351ee Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:08 2011 +0530 fs/9p: Workaround vfs rename rehash bug This is similar to what ceph, ocfs2 and nfs does http://kerneltrap.org/mailarchive/linux-fsdevel/2008/4/18/1498534 May be we should get vfs fixed Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit d28c61f0e08aab9e3a2d3430e75f97937c5fe5fd Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:08 2011 +0530 fs/9p: Mark directory inode invalid for many directory inode operations One successfull directory operation we would have changed directory inode attribute. So mark them invalid Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 823fcfd42297acaf28892b3d2aabef2a121449c2 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:07 2011 +0530 fs/9p: Add . and .. dentry revalidation flag We need to revalidate . and .. entries also Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 3bc86de317f9e0edbbae142c9a5490a2eca517ce Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:07 2011 +0530 fs/9p: mark inode attribute invalid on rename, unlink and setattr rename, unlink and setattr can result in update of inode attribute. So mark the cached copy invalid Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit b3cbea03b4edbd6b625dbf813bf8c30c22213cb7 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:06 2011 +0530 fs/9p: Add support for marking inode attribute invalid With cached mode some of the file system operation result in updating inode attributes (ctime). Add support for marking inode attribute invalid in such cases so that we fetch the updated inode attribute on dentry revalidation. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 0e432703aac3b187dd88d81ac23282f7b1c71002 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:06 2011 +0530 fs/9p: Initialize root inode number for dotl Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit b271ec47bc11deacb6a0373ee29965ab628e74b2 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:05 2011 +0530 fs/9p: Update link count correctly on different file system operations Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit edd73cf544849c10e0fbc294ca2171f6c28b4093 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:05 2011 +0530 fs/9p: Add drop_inode 9p callback We want to immediately drop the inode in non cached mode Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit e959b54901e835f062ac8d44107bc543b66f0364 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:04 2011 +0530 fs/9p: Add direct IO support in cached mode Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit fa6ea16160c72c448e2728dab4b6b0a133fdfc98 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:04 2011 +0530 fs/9p: Fix inode i_size update in file_write Only update inode i_size when we write towards end of file. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 6b365604ca8c1b67f0d5a816cf5acf2dc3edc229 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:03 2011 +0530 fs/9p: set default readahead pages in cached mode We want to enable readahead in cached mode Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 6b39f6d22fbf67cf795c105b4d67c64e9c352ca4 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:03 2011 +0530 fs/9p: Move writeback fid to v9fs_inode Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit a78ce05d5d342297b66122eda8add4eefa21f8a8 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:02 2011 +0530 fs/9p: Add v9fs_inode Switch to the fscache code to v9fs_inode. We will later use v9fs_inode in cache=loose mode to track the inode cache validity timeout. Ie if we find an inode in cache older that a specific jiffie range we will consider it stale Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit a12119087bd803d3fa0b067ee18497e2e5d064cd Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:01 2011 +0530 fs/9p: Don't set stat.st_blocks based on nrpages simple_getattr does set stat.st_blocks to a value derived from nrpages. That is not correct with 9p Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 5ffc0cb308f69cea36058d308d911f26ee59316e Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:01 2011 +0530 fs/9p: Add inode hashing We didn't add the inode to inode hash in 9p. We need to do that to get sync to work, otherwise __mark_inode_dirty will not add the inode to super block's dirty list. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 62d810b424e434a38ad6b17fb93cd5748692a026 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:00 2011 +0530 fs/9p: We need not writeback dirty pages during close Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 00ea2df43e0a68a90bb6055cc48965b2c970228d Author: Aneesh Kumar K.V Date: Mon Feb 28 17:04:00 2011 +0530 fs/9p: Implement syncfs call back for 9Pfs FIXME!! what about dotu ? Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit c0aa4caf4c8b87fa85c67538974a14b07e81a23f Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:59 2011 +0530 net/9p: Implement syncfs 9P operation Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit db5841d4a505d1ecb087dc37462926a80511ae8b Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:59 2011 +0530 fs/9p: Mark file system with MS_SYNCHRONOUS only if it is not cached mode We should not mark file system synchronous if mounted cache=* option Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit a950a65264ab9e9b96e7093e3358ffa84799f99c Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:58 2011 +0530 fs/9p: Clarify cached dentry delete operation Update the comment to indicate that we don't want to cache negative dentries. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 7263cebed9fadad719063fdc8bba7085cf2c080d Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:58 2011 +0530 fs/9p: Add buffered write support for v9fs. We can now support writeable mmaps. Based on the original patch from Badari Pulavarty Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 3cf387d780944305839f5b27c51f225444ba4d27 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:57 2011 +0530 fs/9p: Add fid to inode in cached mode The fid attached to inode will be opened O_RDWR mode and is used for dirty page writeback only. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 17311779ac3dcd06f8ef727a06969c439e116a20 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:56 2011 +0530 fs/9p: Add read write helper function We add read write helper function here which will be used later by the mmap patch Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 2efda7998bbc50589d28f18fddfb0c44d412128e Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:56 2011 +0530 fs/9p: [fscache] wait for page write in cached mode We need to call fscache_wait_on_page_write in launder_page for fscache Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 20656a49ef37d8f44ed1e0b47d132197f9628adc Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:55 2011 +0530 fs/9p: increment inode->i_count in cached mode. We need to ihold even in cached mode Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 46848de0249470e50d87af6d7f9d41cdff3e43f5 Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:55 2011 +0530 fs/9p: set fs cache cookie in create path also We need to call v9fs_cache_inode_set_cookie in create path also Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 29236f4e18dde0c772968b6ce965d0365fe3fe4e Author: Aneesh Kumar K.V Date: Mon Feb 28 17:03:54 2011 +0530 fs/9p: set the cached file_operations struct during inode init With the old code we were not setting the file->f_op with cached file operations during creat. (format correction by jvrao@linux.vnet.ibm.com) Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit f735195d51e10b2550097f7b0ac12219060e962b Author: Venkateswararao Jujjuri (JV) Date: Wed Feb 16 12:54:22 2011 -0800 [net/9p] Small non-IO PDUs for zero-copy supporting transports. If a transport prefers payload to be sent separate from the PDU (P9_TRANS_PREF_PAYLOAD_SEP), there is no need to allocate msize PDU buffers(struct p9_fcall). This patch allocates only upto 4k buffers for this kind of transports and there won't be any change to the legacy transports. Hence, this patch on top of zero copy changes allows user to specify higher msizes through the mount option without hogging the kernel heap. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit ca41bb3e21d7b3cb2079e225e3a7e62e6c776518 Author: Venkateswararao Jujjuri (JV) Date: Tue Feb 1 20:04:59 2011 -0800 [net/9p] Handle Zero Copy TREAD/RERROR case in !dotl case. This takes care of copying out error buffers from user buffer payloads when we are using zero copy. This happens because the only payload buffer the server has to respond to the request is the user buffer given for the zero copy read. Because we only use zerocopy when the amount of data to transfer is greater than a certain size (currently 4K) and error strings are limited to ERRMAX (currently 128) we don't need to worry about there being sufficient space for the error to fit in the payload. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 2c66523fd290edeea26cbe8cedd0af167d0f7e5f Author: Venkateswararao Jujjuri (JV) Date: Wed Feb 16 18:43:20 2011 -0800 [net/9p] readdir zerocopy changes for 9P2000.L protocol. Modify p9_client_readdir() to check the transport preference and act according If the preference is P9_TRANS_PREF_PAYLOAD_SEP, send the payload separately instead of putting it directly on PDU. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 1fc52481c2b886c445bb167dfd16ee6de6922ef7 Author: Venkateswararao Jujjuri (JV) Date: Sun Feb 13 16:23:59 2011 -0800 [net/9p] Write side zerocopy changes for 9P2000.L protocol. Modify p9_client_write() to check the transport preference and act accordingly. If the preference is P9_TRANS_PREF_PAYLOAD_SEP, send the payload separately instead of putting it directly on PDU. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit bb2f8a55153ec58e66a496224504ac9be919c8f1 Author: Venkateswararao Jujjuri (JV) Date: Fri Jan 28 17:05:59 2011 -0800 [net/9p] Read side zerocopy changes for 9P2000.L protocol. Modify p9_client_read() to check the transport preference and act accordingly. If the preference is P9_TRANS_PREF_PAYLOAD_SEP, send the payload separately instead of putting it directly on PDU. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 6f69c395cefb26ebba2c9bb725296a3a4a9200ec Author: Venkateswararao Jujjuri (JV) Date: Sun Feb 6 12:08:01 2011 -0800 [net/9p] Add preferences to transport layer. This patch adds preferences field to the p9_trans_module. Through this, now transport layer can express its preference about the payload. i.e if payload neds to be part of the PDU or it prefers it to be sent sepearetly so that the transport layer can handle it in a better way. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 4038866dab4e461e0ef144458bad9d70ce0c98c1 Author: Venkateswararao Jujjuri (JV) Date: Fri Jan 28 15:22:36 2011 -0800 [net/9p] Add gup/zero_copy support to VirtIO transport layer. Modify p9_virtio_request() and req_done() functions to support additional payload sent down to the transport layer through tc->pubuf and tc->pkbuf. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 9bb6c10a4ed48aef49a7243a6f798694722cf380 Author: Venkateswararao Jujjuri (JV) Date: Wed Feb 2 17:52:46 2011 -0800 [net/9p] Assign type of transaction to tc->pdu->id which is otherwise unsed. This will be used by the transport layer to determine the out going request type. Transport layer uses this information to correctly place the mapped pages in the PDU. Patches following this will make use of this to achieve zero copy. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 022cae36551ba805bf82084047945b2901d75f36 Author: Venkateswararao Jujjuri (JV) Date: Fri Jan 28 14:11:13 2011 -0800 [net/9p] Preparation and helper functions for zero copy This patch prepares p9_fcall structure for zero copy. Added fields send the payload buffer information to the transport layer. In addition it adds a 'private' field for the transport layer to store mapped/pinned page information so that it can be freed/unpinned during req_done. This patch also creates trans_common.[ch] to house helper functions. It adds the following helper functions. p9_release_req_pages - Release pages after the transaction. p9_nr_pages - Return number of pages needed to accomodate the payload. payload_gup - Translates user buffer into kernel pages. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 6752a1ebd13f69b9d5ff08914fe29ee2813cbeea Author: Venkateswararao Jujjuri (JV) Date: Wed Jan 26 16:20:35 2011 -0800 [fs/9p] Make access=client default in 9p2000.L protocol Current code sets access=user as default for all protocol versions. This patch chagnes it to "client" only for dotl. User can always specify particular access mode with -o access= option. No change there. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit e782ef71097e832f62256370a2fe231b9fba96cf Author: Venkateswararao Jujjuri (JV) Date: Tue Jan 25 15:40:54 2011 -0800 [fs/9P] Add posixacl mount option The mount option access=client is overloaded as it assumes acl too. Adding posixacl option to enable POSIX ACLs makes it explicit and clear. Also it is convenient in the future to add other types of acls like richacls. Ideally, the access mode 'client' should be just like V9FS_ACCESS_USER except it underscores the location of access check. Traditional 9P protocol lets the server perform access checks but with this mode, all the access checks will be performed on the client itself. Server just follows the client's directive. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 9332685dffed3b402816c3564342f3e2df0c83ef Author: Venkateswararao Jujjuri (JV) Date: Fri Jan 14 15:24:59 2011 -0800 [fs/9p] Ignore acl mount option when CONFIG_9P_FS_POSIX_ACL is not defined. If the kernel is not compiled with CONFIG_9P_FS_POSIX_ACL and the mount option is specified to enable ACLs current code fails the mount. This patch brings the behavior inline with other filesystems like ext3 by proceeding with the mount and log a warning to syslog. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit d344b0fb72e00339625464c5a29711906fa70b8b Author: Venkateswararao Jujjuri (JV) Date: Thu Jan 13 16:33:00 2011 -0800 [fs/9p] Initialze cached acls both in cached/uncached mode. With create/mkdir/mknod in non cached mode we initialize the inode using v9fs_get_inode. v9fs_get_inode doesn't initialize the cache inode value to NULL. This is causing to trip on BUG_ON in v9fs_get_cached_acl. Fix is to initialize acls to NULL and not to leave them in ACL_NOT_CACHED state. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen Reviewed-by: Aneesh Kumar K.V commit c61fa0d6d9d466356ffa89fa1c1a9a1cd726fab4 Author: Venkateswararao Jujjuri (JV) Date: Thu Jan 13 15:28:39 2011 -0800 [fs/9p] Plug potential acl leak In v9fs_get_acl() if __v9fs_get_acl() gets only one of the dacl/pacl we are not releasing it. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen Reviewed-by: Aneesh Kumar K.V commit 61c29f5b1856f90bf0a87d83cfa035a11986d2c5 Author: Stefan Achatz Date: Mon Mar 14 21:43:07 2011 +0100 HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor' Mode of sysfs attribute 'sensor' was wrongly set to writeonly. Corrected this to readwrite. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit f4154e160aa2a40dccc963110768b63ce004fed9 Author: Prabhakar Kushwaha Date: Thu Feb 24 15:05:04 2011 +0530 powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x FSL PCIe controller v2.1: - New MSI inbound window - Same Inbound windows address as PCIe controller v1.x Added new pit_t member(pmit) to struct ccsr_pci for MSI inbound window FSL PCIe controller v2.2 and v2.3: - Different addresses for PCIe inbound window 3,2,1 - Exposed PCIe inbound window 0 - New PCIe interrupt status register Added new config and interrupt Status register to struct ccsr_pci & updated pit_t array size to reflect the 4 inbound windows. Device tree is used to maintain backward compatibility i.e. update inbound window 1 index depending upon "compatible" field witin PCIE node. Signed-off-by: Prabhakar Kushwaha Acked-by: Roy Zang Signed-off-by: Kumar Gala commit decbb280bb8e3bceebcf5defb4f61dfbfdb23e18 Author: Kumar Gala Date: Mon Feb 14 22:45:48 2011 -0600 powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e If the spin table is located in the linear mapping (which can happen if we have 4G or more of memory) we need to access the spin table via a cacheable coherent mapping like we do on ppc32 (and do explicit cache flush). See the following commit for the ppc32 version of this issue: commit d1d47ec6e62ab08d2ebb925fd9203abfad3adfbf Author: Peter Tyser Date: Fri Dec 18 16:50:37 2009 -0600 powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem Signed-off-by: Kumar Gala commit 43adec955edd116c3e98c6e2f85fbd63281f5221 Author: Arnaldo Carvalho de Melo Date: Tue Mar 15 11:04:13 2011 -0300 perf evlist: New command to list the names of events present in a perf.data file [root@emilia ~]# perf record -a -e sched:* -e timer:timer* sleep 5 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.172 MB perf.data (~7530 samples) ] [root@emilia ~]# perf evlist sched:sched_kthread_stop sched:sched_kthread_stop_ret sched:sched_wakeup sched:sched_wakeup_new sched:sched_switch sched:sched_migrate_task sched:sched_process_free sched:sched_process_exit sched:sched_wait_task sched:sched_process_wait sched:sched_process_fork sched:sched_stat_wait sched:sched_stat_sleep sched:sched_stat_iowait sched:sched_stat_runtime sched:sched_pi_setprio timer:timer_init timer:timer_start timer:timer_expire_entry timer:timer_expire_exit timer:timer_cancel [root@emilia ~]# Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a49fb4c3d035ab516507b31ec3bd49263caee14d Author: Boaz Harrosh Date: Mon Feb 7 18:12:15 2011 +0200 exofs: deprecate the commands pending counter One leftover from the days of IBM's original code, is an SB counter that counts in-flight asynchronous commands. And a piece of code that waits for the counter to reach zero at unmount. I guess it might have been needed then, cause of some reference missing or something. I'm not removing it yet but am putting a warning message if ever this counter triggers at unmount. If I'll never see it triggers or reported I'll remove the counter for good. (I had this print as a debug output for a long time and never had it trigger) Signed-off-by: Boaz Harrosh commit 1cea312ad49d9cb964179a784fedb1fcfe396283 Author: Boaz Harrosh Date: Thu Feb 3 17:53:25 2011 +0200 exofs: Write sbi->s_nextid as part of the Create command Before when creating a new inode, we'd set the sb->s_dirt flag, and sometime later the system would write out s_nextid as part of the sb_info. Also on inode sync we would force the sb sync as well. Define the s_nextid as a new partition attribute and set it every time we create a new object. At mount we read it from it's new place. We now never set sb->s_dirt anywhere in exofs. write_super is actually never called. The call to exofs_write_super from exofs_put_super is also removed because the VFS always calls ->sync_fs before calling ->put_super twice. To stay backward-and-forward compatible we also write the old s_nextid in the super_block object at unmount, and support zero length attribute on mount. This also fixes a BUG where in layouts when group_width was not a divisor of EXOFS_SUPER_ID (0x10000) the s_nextid was not read from the device it was written to. Because of the sliding window layout trick, and because the read was always done from the 0 device but the write was done via the raid engine that might slide the device view. Now we read and write through the raid engine. Signed-off-by: Boaz Harrosh commit 9ed96484311b89360b80a4181d856cbdb21630fd Author: Boaz Harrosh Date: Mon Jan 31 14:32:14 2011 +0200 exofs: Add option to mount by osdname If /dev/osd* devices are shuffled because more devices where added, and/or login order has changed. It is hard to mount the FS you want. Add an option to mount by osdname. osdname is any osd-device's osdname as specified to the mkfs.exofs command when formatting the osd-devices. The new mount format is: OPT="osdname=$UUID0,pid=$PID,_netdev" mount -t exofs -o $OPT $DEV_OSD0 $MOUNTDIR if "osdname=" is specified in options above $DEV_OSD0 is ignored and can be empty. Also while at it: Removed some old unused Opt_* enums. Signed-off-by: Boaz Harrosh commit 66cd6cad4919f980dd21307d0150ff251762a264 Author: bharrosh@panasas.com Date: Thu Oct 7 14:28:18 2010 -0400 exofs: Override read-ahead to align on stripe_size * Set all inode->i_mapping->backing_dev_info to point to the per super-block sb->s_bdi. * Calculating a read_ahead that is: - preferable 2 stripes long (Future patch will add a mount option to override this) - Minimum 128K aligned up to stripe-size - Caped to maximum-IO-sizes round down to stripe_size. (Max sizes are governed by max bio-size that fits in a page times number-of-devices) CC: Marc Dionne Signed-off-by: Boaz Harrosh commit 97178b7b6c84bd14660b89474d27931a1ea65c66 Author: Nick Piggin Date: Thu Nov 25 12:47:15 2010 +0200 exofs: simple fsync race fix It is incorrect to test inode dirty bits without participating in the inode writeback protocol. Inode writeback sets I_SYNC and clears I_DIRTY_?, then writes out the particular bits, then clears I_SYNC when it is done. BTW. it may not completely write all pages out, so I_DIRTY_PAGES would get set again. This is a standard pattern used throughout the kernel's writeback caches (I_SYNC ~= I_WRITEBACK, if that makes it clearer). And so it is not possible to determine an inode's dirty status just by checking I_DIRTY bits. Especially not for the purpose of data integrity syncs. Missing the check for these bits means that fsync can complete while writeback to the inode is underway. Inode writeback functions get this right, so call into them rather than try to shortcut things by testing dirty state improperly. Signed-off-by: Nick Piggin Signed-off-by: Boaz Harrosh commit a8f1418f9e9bd4c487a7b703ff26c5dd5ceb2bf3 Author: Boaz Harrosh Date: Mon Nov 22 18:02:45 2010 +0200 exofs: Optimize read_4_write Don't attempt a read passed i_size, just zero the page and be done with it. Signed-off-by: Boaz Harrosh commit 0a935519cca83f26dc15e7577fa6c2b39606a4ac Author: Boaz Harrosh Date: Tue Oct 26 17:52:41 2010 +0200 exofs: Trivial: fix some indentation and debug prints I stumbled on some of these prints in log files so, might just submit the fixes. * All i_ino prints in exofs should be hex * All OSD_ERR prints should end with a "\n" Signed-off-by: Boaz Harrosh commit 8f68cd42d85f31fb58dd2cabf3ff4aad0a2bafd9 Author: Stephen Rothwell Date: Tue Mar 15 18:37:09 2011 +1100 nfs: BKL is no longer needed, so remove the include Signed-off-by: Stephen Rothwell Signed-off-by: Trond Myklebust commit b0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5 Author: KyongHo Cho Date: Mon Mar 7 09:10:24 2011 +0900 ARM: EXYNOS4: Implement Clock gating for System MMU This patch includes the implementation of the clock gating for System MMU. Initially, all System MMUs are not asserted the system clock. Asserting the system clock to a System MMU is enabled only when s5p_sysmmu_enable() is called. Likewise, it is disabled only when s5p_sysmmu_disable() is called. Therefore, clock gating on System MMUs are still invisible to the outside of the System MMU driver. Signed-off-by: KyongHo Cho Signed-off-by: Kukjin Kim commit b34f003f271d477f61a980d280afc77929047440 Author: KyongHo Cho Date: Mon Mar 7 08:56:48 2011 +0900 ARM: EXYNOS4: Enhancement of System MMU driver This patch includes the following enhancements for System MMU: - Enhanced readability - Removal of unused data structures or their members - Simplified function definitions - Corrections of some logical errors - Full compliance with Linux coding style - Simpler way of registering callback functions of System MMU faults Signed-off-by: KyongHo Cho Signed-off-by: Kukjin Kim commit 6a8ab060779779de8aea92ce3337ca348f973f54 Author: Vasiliy Kulikov Date: Tue Mar 15 13:37:13 2011 +0100 ipv6: netfilter: ip6_tables: fix infoleak to userspace Structures ip6t_replace, compat_ip6t_replace, and xt_get_revision are copied from userspace. Fields of these structs that are zero-terminated strings are not checked. When they are used as argument to a format string containing "%s" in request_module(), some sensitive information is leaked to userspace via argument of spawned modprobe process. The first bug was introduced before the git epoch; the second was introduced in 3bc3fe5e (v2.6.25-rc1); the third is introduced by 6b7d31fc (v2.6.15-rc1). To trigger the bug one should have CAP_NET_ADMIN. Signed-off-by: Vasiliy Kulikov Signed-off-by: Patrick McHardy commit 78b79876761b86653df89c48a7010b5cbd41a84a Author: Vasiliy Kulikov Date: Tue Mar 15 13:36:05 2011 +0100 netfilter: ip_tables: fix infoleak to userspace Structures ipt_replace, compat_ipt_replace, and xt_get_revision are copied from userspace. Fields of these structs that are zero-terminated strings are not checked. When they are used as argument to a format string containing "%s" in request_module(), some sensitive information is leaked to userspace via argument of spawned modprobe process. The first and the third bugs were introduced before the git epoch; the second was introduced in 2722971c (v2.6.17-rc1). To trigger the bug one should have CAP_NET_ADMIN. Signed-off-by: Vasiliy Kulikov Signed-off-by: Patrick McHardy commit 42eab94fff18cb1091d3501cd284d6bd6cc9c143 Author: Vasiliy Kulikov Date: Tue Mar 15 13:35:21 2011 +0100 netfilter: arp_tables: fix infoleak to userspace Structures ipt_replace, compat_ipt_replace, and xt_get_revision are copied from userspace. Fields of these structs that are zero-terminated strings are not checked. When they are used as argument to a format string containing "%s" in request_module(), some sensitive information is leaked to userspace via argument of spawned modprobe process. The first bug was introduced before the git epoch; the second is introduced by 6b7d31fc (v2.6.15-rc1); the third is introduced by 6b7d31fc (v2.6.15-rc1). To trigger the bug one should have CAP_NET_ADMIN. Signed-off-by: Vasiliy Kulikov Signed-off-by: Patrick McHardy commit 4656c4d61adb8dc3ee04c08f57a5cc7598814420 Author: Changli Gao Date: Tue Mar 15 13:26:32 2011 +0100 netfilter: xt_connlimit: remove connlimit_rnd_inited A potential race condition when generating connlimit_rnd is also fixed. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit 3e0d5149e6dcbe7111a63773a07c5b33f7ca7236 Author: Changli Gao Date: Tue Mar 15 13:25:42 2011 +0100 netfilter: xt_connlimit: use hlist instead The header of hlist is smaller than list. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit 0e23ca14f8e76091b402c01e2b169aba3d187b98 Author: Changli Gao Date: Tue Mar 15 13:24:56 2011 +0100 netfilter: xt_connlimit: use kmalloc() instead of kzalloc() All the members are initialized after kzalloc(). Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit 8183e3a88aced228ab9770762692be6cc3786e80 Author: Changli Gao Date: Tue Mar 15 13:23:28 2011 +0100 netfilter: xt_connlimit: fix daddr connlimit in SNAT scenario We use the reply tuples when limiting the connections by the destination addresses, however, in SNAT scenario, the final reply tuples won't be ready until SNAT is done in POSTROUING or INPUT chain, and the following nf_conntrack_find_get() in count_tem() will get nothing, so connlimit can't work as expected. In this patch, the original tuples are always used, and an additional member addr is appended to save the address in either end. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit 721bbd4a06e83995ac1679d9cdca19a608fb0122 Author: Marek Szyprowski Date: Tue Mar 15 21:17:43 2011 +0900 ARM: EXYNOS4: Add support for gpio interrupts This patch adds support for gpio interrupts on Samsung EXYNOS4 platform. Common s5p-gpioint.c code is used for handling gpio interrupts. Each gpio line that needs gpio interrupt support must be later registered with s5p_register_gpio_interrupt() function. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit a43efddc3bf8b143ff9352763cd39d425db14d27 Author: Marek Szyprowski Date: Tue Mar 15 21:17:43 2011 +0900 ARM: S5P: Add function to register gpio interrupt bank data This patch removes all global data from common s5p gpio interrupt handler code. This enables to reuse this code on EXYNOS4 platform. Instead of global data (IRQ_GPIOINT interrupt number, S5P_GPIOINT_GROUP_MAXNR groups count), a s5p_register_gpioint_bank() function is introduced. It is aimed to be called from gpiolib init. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 2de0926204b100409bcd51465404ae846c7f48fd Author: Marek Szyprowski Date: Tue Mar 15 21:17:43 2011 +0900 ARM: S5P: Cleanup S5P gpio interrupt code This patch performs a global cleanup in s5p gpio interrupt support code. The code is prepared for upcoming support for gpio interrupts on EXYNOS4 platform, which has 2 gpio banks (regions) instead of one (like on S5PC110 and S5PC100). Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 47a9c0ee79489a3bd4ed52f424b5e5c507768ce3 Author: Marek Szyprowski Date: Tue Mar 15 21:17:43 2011 +0900 ARM: EXYNOS4: Add missing GPYx banks This patch adds missing GPYx gpio banks on Samsung EXYNOS4 platform. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 6d0de1577eda1fad4be14f70021135ff7df95dcf Author: Mark Brown Date: Fri Mar 11 16:10:03 2011 +0900 ARM: S3C64XX: Fix section mismatch from cpufreq init The cpufreq init function is referenced from the driver structure and we don't appear to have annotations which allow us to mark that it'll never be called after system init, causing the linker consistency infrastructure to complain. Just remove the __init annotation to avoid noise from the build. Signed-off-by: Mark Brown Signed-off-by: Kukjin Kim commit be4c33be53d85dde787c4261b18b13850cb299f1 Author: Naveen Krishna Ch Date: Tue Feb 22 17:16:58 2011 +0900 ARM: EXYNOS4: Add keypad device to the SMDKV310 This patch is to support keypad device to the SMDKV310 board. Signed-off-by: Naveen Krishna Ch Signed-off-by: Kukjin Kim commit f9d7bcbc41f9b80928d7a46b5e547663f163dc8e Author: Naveen Krishna Ch Date: Tue Feb 22 17:13:42 2011 +0900 ARM: EXYNOS4: Update clocks for keypad The keypad IF on EXYNOS4 uses 100MHz from PERIR functional block for clocks, this patch updates the same. Signed-off-by: Naveen Krishna Ch Signed-off-by: Kukjin Kim commit 344021cb12d993ff61cd9760c023e6b400da4ff7 Author: Naveen Krishna Ch Date: Sat Mar 5 09:48:31 2011 +0900 ARM: EXYNOS4: Update keypad base address This patch updates the keypad IF base address in the memory map for EXYNOS4. Signed-off-by: Naveen Krishna Ch Signed-off-by: Kukjin Kim commit 8e97fb7945717db1773f723b99ab04f6ed1fa875 Author: Naveen Krishna Ch Date: Sat Mar 5 09:44:09 2011 +0900 ARM: EXYNOS4: Add keypad device helpers This patch adds the samsung_keypad_cfg_gpio() for EXYNOS4. Now, this helpers are only for keypad operating in PORT-0. Signed-off-by: Naveen Krishna Ch Signed-off-by: Kukjin Kim commit 47e0c7e128afb85cf4fb7792e6e7fcb91e2a5cc4 Author: Greg Ungerer Date: Fri Mar 11 22:25:44 2011 +1000 m68knommu: external interrupt support to ColdFire intc-simr controller The EDGE Port module of some ColdFire parts using the intc-simr interrupt controller provides support for 7 external interrupts. These interrupts go off-chip (that is they are not for internal peripherals). They need some special handling and have some extra setup registers. Add code to support them. Signed-off-by: Greg Ungerer commit 57b481436f2a5580054784af8f044d2e3f602b53 Author: Greg Ungerer Date: Fri Mar 11 17:06:58 2011 +1000 m68knommu: external interrupt support to ColdFire intc-2 controller The EDGE Port module of some ColdFire parts using the intc-2 interrupt controller provides support for 7 external interrupts. These interrupts go off-chip (that is they are not for internal peripherals). They need some special handling and have some extra setup registers. Add code to support them. Signed-off-by: Greg Ungerer commit ce3de78a1c9504dba1781e47613b397e4028ae2b Author: Greg Ungerer Date: Wed Mar 9 14:19:08 2011 +1000 m68knommu: remove ColdFire CLOCK_DIV config option The reality is that you do not need the abiltity to configure the clock divider for ColdFire CPUs. It is a fixed ratio on any given ColdFire family member. It is not the same for all ColdFire parts, but it is always the same in a model range. So hard define the divider for each supported ColdFire CPU type and remove the Kconfig option. Signed-off-by: Greg Ungerer commit 442ca465c0e775a0808e02d4fcddeddb2fcc882c Author: Greg Ungerer Date: Wed Mar 9 09:21:24 2011 +1000 m68knommu: fix gpio warnings for ColdFire 5407 targets Fix these compiler warnings: arch/m68knommu/platform/5407/gpio.c:35:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5407/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5407/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast Signed-off-by: Greg Ungerer commit 5d44b09610033d244cc157ac17fc7e6c6793b1d1 Author: Greg Ungerer Date: Wed Mar 9 09:19:50 2011 +1000 m68knommu: fix gpio warnings for ColdFire 532x targets Fix these compiler warnings: arch/m68knommu/platform/532x/gpio.c:35:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/532x/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/532x/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/532x/gpio.c:51:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/532x/gpio.c:52:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/532x/gpio.c:53:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/532x/gpio.c:54:3: warning: initialisation makes pointer from integer without a cast ... Signed-off-by: Greg Ungerer commit 2af36dc423fca37be9149329dff1635e4ff72ac4 Author: Greg Ungerer Date: Wed Mar 9 09:14:49 2011 +1000 m68knommu: fix gpio warnings for ColdFire 5307 targets Fix these compiler warnings: arch/m68knommu/platform/5307/gpio.c:35:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5307/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5307/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast Signed-off-by: Greg Ungerer commit d5dca1e09497c9477a30f1b9eb847c4c22f05a26 Author: Greg Ungerer Date: Wed Mar 9 09:13:16 2011 +1000 m68knommu: fix gpio warnings for ColdFire 527x targets Fix these compiler warnings: arch/m68knommu/platform/527x/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/527x/gpio.c:38:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/527x/gpio.c:39:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/527x/gpio.c:53:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/527x/gpio.c:54:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/527x/gpio.c:55:3: warning: initialisation makes pointer from integer without a cast ... Signed-off-by: Greg Ungerer commit 4d1f692f3002b580b1fd49fba74c1b7c5c123a9c Author: Greg Ungerer Date: Wed Mar 9 09:07:36 2011 +1000 m68knommu: fix gpio warnings for ColdFire 5272 targets Fix these compiler warnings: arch/m68knommu/platform/5272/gpio.c:35:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5272/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5272/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5272/gpio.c:51:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5272/gpio.c:52:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5272/gpio.c:53:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5272/gpio.c:67:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5272/gpio.c:68:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5272/gpio.c:69:3: warning: initialisation makes pointer from integer without a cast Signed-off-by: Greg Ungerer commit 2470758ae500a08d8d0e23b6c4024341ee2be4d7 Author: Greg Ungerer Date: Wed Mar 9 09:05:40 2011 +1000 m68knommu: fix gpio warnings for ColdFire 5249 targets Fix these compiler warnings: arch/m68knommu/platform/5249/gpio.c:35:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5249/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5249/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5249/gpio.c:51:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5249/gpio.c:52:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5249/gpio.c:53:3: warning: initialisation makes pointer from integer without a cast Signed-off-by: Greg Ungerer commit 2836827d7b47d40283424ee90aaa2f7922d4558a Author: Greg Ungerer Date: Wed Mar 9 09:03:47 2011 +1000 m68knommu: fix gpio warnings for ColdFire 523x targets Fix these compiler warnings: arch/m68knommu/platform/523x/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/523x/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/523x/gpio.c:38:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/523x/gpio.c:52:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/523x/gpio.c:53:3: warning: initialisation makes pointer from integer without a cast ... Signed-off-by: Greg Ungerer commit 9516de490ee2131020153df19d0588b65d938ccb Author: Greg Ungerer Date: Wed Mar 9 08:59:35 2011 +1000 m68knommu: fix gpio warnings for ColdFire 520x targets Fix these compiler warnings: rch/m68knommu/platform/520x/gpio.c:35:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/520x/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/520x/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/520x/gpio.c:51:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/520x/gpio.c:52:3: warning: initialisation makes pointer from integer without a cast ... Signed-off-by: Greg Ungerer commit d5365ca5aa65a4988a8c713f0f902f367ae7cdb3 Author: Greg Ungerer Date: Wed Mar 9 08:55:53 2011 +1000 m68knommu: fix gpio warnings for ColdFire 5206e targets Fix these compiler warnings: arch/m68knommu/platform/5206e/gpio.c:35:3: warning: initialisation makes pointer from integer without a cast CC kernel/panic.o arch/m68knommu/platform/5206e/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5206e/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast Signed-off-by: Greg Ungerer commit 0bb724af29fa56c0be94a4abf2ed33dbd414ddc0 Author: Greg Ungerer Date: Wed Mar 9 08:53:30 2011 +1000 m68knommu: fix gpio warnings for ColdFire 5206 targets Fix these compiler warnings: arch/m68knommu/platform/5206/gpio.c:35:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5206/gpio.c:36:3: warning: initialisation makes pointer from integer without a cast arch/m68knommu/platform/5206/gpio.c:37:3: warning: initialisation makes pointer from integer without a cast Signed-off-by: Greg Ungerer commit 62b323e263eb180a06daa4422ae12934024f4b5e Author: Alexander Kurz Date: Sun Feb 20 22:45:33 2011 +0100 m68knommu: fixing compiler warnings Signed-off-by: Alexander Kurz Signed-off-by: Greg Ungerer commit 745c061f98720e7be201dd2d2277e524ecf45d1c Author: Greg Ungerer Date: Mon Mar 7 23:00:04 2011 +1000 m68knommu: limit interrupts supported by ColdFire intc-simr driver The intc-simr interrupt controller on some ColdFire CPUs has a set range of interrupts its supports (64 through 128 or 192 depending on model). We shouldn't be setting this handler for every possible interrupt from 0 to 255. Set more appropriate limits, and this means we can drop the interrupt number check in the mask and unmask routines. Signed-off-by: Greg Ungerer commit 6d0f33fa80ed530168161fd2f226a3e5cf27cf81 Author: Greg Ungerer Date: Mon Mar 7 17:42:28 2011 +1000 m68knommu: move some init code out of unmask routine for ColdFire intc-2 Use a proper irq_startup() routine to intialize the interrupt priority and level register in the ColdFire intc-2 controller code. We shouldn't be checking if the priority/level has been set on every unmask operation. Signed-off-by: Greg Ungerer commit 49bc6deace5a0a774678212097474b27b27e44fb Author: Greg Ungerer Date: Mon Mar 7 17:21:43 2011 +1000 m68knommu: limit interrupts supported by ColdFire intc-2 driver The intc-2 interrupt controller on some ColdFire CPUs has a set range of interrupts its supports (64 through 128 or 192 depending on model). We shouldn't be setting this handler for every possible interrupt from 0 to 255. Set more appropriate limits, and this means we can drop the interrupt number check in the mask and unmask routines. Signed-off-by: Greg Ungerer commit 7badfabb3fcee4fc4a0fd7c0437706b91fef3fff Author: Greg Ungerer Date: Sun Mar 6 23:20:19 2011 +1000 m68knommu: add basic support for the ColdFire based FireBee board The FireBee is a ColdFire 5475 based board. Add a configuration option to support it, and the basic platform flash layout code. Signed-off-by: Greg Ungerer commit d4852a34e46679f0a36b7c8803eace2b9002cddc Author: Greg Ungerer Date: Sun Mar 6 21:53:28 2011 +1000 m68knommu: make ColdFire internal peripheral region configurable Most ColdFire CPUs have an internal peripheral set that can be mapped at a user selectable address. Different ColdFire parts either use an MBAR register of an IPSBAR register to map the peripheral region. Most boards use the Freescale default mappings - but not all. Make the setting of the MBAR or IPSBAR register configurable. And only make the selection available on the appropriate ColdFire CPU types. Signed-off-by: Greg Ungerer commit b195c47924ba3ff7434ab49412e5b2dab0a973fa Author: Greg Ungerer Date: Sun Mar 6 01:01:31 2011 +1000 m68knommu: clean up definitions of ColdFire peripheral base registers Different ColdFire CPUs have different ways of defining where their internal peripheral registers sit in their address space. Some use an MBAR register, some use and IPSBAR register, some have a fixed mapping. Now that most of the peripheral address definitions have been cleaned up we can clean up the setting of the MBAR and IPSBAR defines to limit them to just where they are needed (and where they actually exist). Signed-off-by: Greg Ungerer commit 6a92e1982d5c538d1cfafbe4b0cb16d49306854f Author: Greg Ungerer Date: Sun Mar 6 23:01:46 2011 +1000 m68knommu: clean up use of MBAR for DRAM registers on ColdFire start In some of the RAM size autodetection code on ColdFire CPU startup we reference DRAM registers relative to the MBAR register. Not all of the supported ColdFire CPUs have an MBAR, and currently this works because we fake an MBAR address on those registers. In an effort to clean this up, and eventually remove the fake MBAR setting make the DRAM register address definitions actually contain the MBAR (or IPSBAR as appropriate) value as required. Signed-off-by: Greg Ungerer commit 58f0ac98f386d2b335e5852e8feec828c43a0e13 Author: Greg Ungerer Date: Wed Mar 9 09:57:14 2011 +1000 m68knommu: remove use of MBAR in old-style ColdFire timer Not all ColdFire CPUs that use the old style timer hardware module use an MBAR set peripheral region. Move the TIMER base address defines to the per-CPU header files where we can set it correctly based on how the peripherals are mapped - instead of using a fake MBAR for some platforms. Signed-off-by: Greg Ungerer commit babc08b7e953cd23e10d175d546309dedadaabea Author: Greg Ungerer Date: Sun Mar 6 00:54:36 2011 +1000 m68knommu: move ColdFire DMA register addresses to per-cpu headers The base addresses of the ColdFire DMA unit registers belong with all the other address definitions in the per-cpu headers. The current definitions assume they are relative to an MBAR register. Not all ColdFire CPUs have an MBAR register. A clean address define can only be acheived in the per-cpu headers along with all the other chips peripheral base addresses. Signed-off-by: Greg Ungerer commit a0ba4332a2cb110d6ef7695e64887396ab7d09d6 Author: Greg Ungerer Date: Sun Mar 6 00:20:01 2011 +1000 m68knommu: remove use of MBAR value for ColdFire 528x peripheral addressing The ColdFire 528x family of CPUs does not have an MBAR register, so don't define its peripheral addresses relative to one. Its internal peripherals are relative to the IPSBAR register, so make sure to use that. Signed-off-by: Greg Ungerer commit 9a6b0c73afa702eee1803e664eae1b951faf895c Author: Greg Ungerer Date: Sun Mar 6 00:13:17 2011 +1000 m68knommu: remove use of MBAR value for ColdFire 527x peripheral addressing The ColdFire 527x family of CPUs does not have an MBAR register, so don't define its peripheral addresses relative to one. Its internal peripherals are relative to the IPSBAR register, so make sure to use that. Signed-off-by: Greg Ungerer commit b62384afddbe7173b08420c67e6cbb22aa1ba709 Author: Greg Ungerer Date: Sun Mar 6 00:05:29 2011 +1000 m68knommu: remove use of MBAR value for ColdFire 523x peripheral addressing The ColdFire 523x family of CPUs does not have an MBAR register, so don't define its peripheral addresses relative to one. Its internal peripherals are relative to the IPSBAR register, so make sure to use that. Signed-off-by: Greg Ungerer commit 571f0608e1a53d6d405c385cc9c11b7902b35b7f Author: Greg Ungerer Date: Sat Mar 5 23:50:37 2011 +1000 m68knommu: remove MBAR and IPSBAR hacks for the ColdFire 520x CPUs The ColdFire 5207 and 5208 CPUs have fixed peripheral addresses. They do not use the setable peripheral address registers like the MBAR and IPSBAR used on many other ColdFire parts. Don't use fake values of MBAR and IPSBAR when using peripheral addresses for them, there is no need to. Signed-off-by: Greg Ungerer commit f317c71a2f3dcdae26055e6dd390d06c5efe5795 Author: Greg Ungerer Date: Sat Mar 5 23:32:35 2011 +1000 m68knommu: move ColdFire PIT timer base addresses The PIT hardware timer module used in some ColdFire CPU's is not always addressed relative to an IPSBAR register. Parts like the ColdFire 5207 and 5208 have fixed peripheral addresses. So lets not define the register addresses of the PIT relative to an IPSBAR definition. Move the base address definitions into the per-part headers. This is a lot more consistent since all the other peripheral base addresses are defined in the per-part header files already. Signed-off-by: Greg Ungerer commit cdfc243e7df1b3abba2c6aa35eba89f59b46219e Author: Greg Ungerer Date: Sat Mar 5 22:48:52 2011 +1000 m68knommu: remove bogus definition of MBAR for ColdFire 532x family Remove the bogus definition of the MBAR register for the ColdFire 532x family. It doesn't have an MBAR register, its peripheral registers are at fixed addresses and are not relative to a settable base. All the code that relyed on this definition existing has been cleaned up. The register address definitions now include the base as required. Signed-off-by: Greg Ungerer commit 254eef7464f0704290af4b91021f512eb4c98d59 Author: Greg Ungerer Date: Sat Mar 5 22:17:17 2011 +1000 m68knommu: remove kludge seting of MCF_IPSBAR for ColdFire 54xx The ColdFire 54xx family shares the same interrupt controller used on the 523x, 527x and 528x ColdFire parts, but it isn't offset relative to the IPSBAR register. The 54xx doesn't have an IPSBAR register. By including the base address of the peripheral registers in the register definitions (MCFICM_INTC0 and MCFICM_INTC1 in this case) we can avoid having to define a fake IPSBAR for the 54xx. And this makes the register address definitions of these more consistent, the majority of the other register address defines include the peripheral base address already. Signed-off-by: Greg Ungerer commit f2ba710d17ae221e21a7cccddbbf5257fd93e9fa Author: Greg Ungerer Date: Sat Mar 5 21:43:50 2011 +1000 m68knommu: move ColdFire 5249 MBAR2 definition The MBAR2 register is only used on the ColdFire 5249 part, so move its definition out of the common coldfire.h and into the 5249 support header. Signed-off-by: Greg Ungerer commit d3ff2c22a5e5d0bb485f4474b67e0a0f2c426c65 Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: Select GENERIC_HARDIRQS_NO_DEPRECATED All chips converted and proper accessor functions used. Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit 5a7d29805ec26cda22904b4503bec010f5724f58 Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: Use proper irq_desc accessors in Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit e474563ebac1ece056024e2395673e6df04f6a7c Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: Convert 5249 intc irq_chip to new functions /me idly wonders what sets the handlers for this chip. Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit 2730158ab2dd5c5df863da8135c07bb10acac60f Author: Thomas Gleixner Date: Sun Feb 6 23:39:28 2011 +0000 m68knommu: Convert 5272 intc irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit be497ddfd0d8a0aa3a84c41bb84bf10d2cb7cb7d Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: Convert 68360 ints irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit 39a17940abc4d069cbb33865e967dcc7ef1bf452 Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: Convert 68328 ints irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit f80c353ce8670b1ef336bc1dd74429763cbd7358 Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: Convert coldfire intc-simr irq_chip to new Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit 0bc0f3aa1498e7ec0bb54f32b839e82319cb5fc1 Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: Convert coldfire intc-2 irq_chip to new Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit c2ff7c716a609dcc3b7f899a9052a6f6a93645b5 Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: Convert coldfire intc irq_chip to new Signed-off-by: Thomas Gleixner Signed-off-by: Greg Ungerer commit e6988f2f53ef0a686909702358e21ee0c62bfbca Author: Thomas Gleixner Date: Sun Feb 6 23:39:14 2011 +0000 m68knommu: 5772: Replace private irq flow handler That handler lacks the minimal checks for action being zero etc. Keep the weird flow - ack before handling - intact and call into handle_simple_irq which does the right thing. Signed-off-by: Thomas Gleixner Acked-by: Greg Ungerer LKML-Reference: <20110202212552.413849952@linutronix.de> Signed-off-by: Greg Ungerer commit 2c722c9a47d1369e2685b85288e78c469a081238 Author: Tobias Klauser Date: Thu Dec 9 15:55:21 2010 +0100 exofs: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser commit 0b9b0200b0922c29dc251b99700f96dade92214a Author: Michal Simek Date: Mon Nov 8 12:37:40 2010 +0100 microblaze: Do not copy reset vectors/manual reset vector setup Reset vector can be setup by bootloader and kernel doens't need to touch it. If you require to setup reset vector, please use CONFIG_MANUAL_RESET_VECTOR throught menuconfig. It is not possible to setup address 0x0 as reset address because make no sense to set it up at all. Signed-off-by: Michal Simek Signed-off-by: John Williams commit 7574349cee0b1cddc0aa1104d9b2fc5152d318d9 Author: Michal Simek Date: Thu Mar 10 10:56:21 2011 +0100 microblaze: Fix _reset function If soft reset falls through with no hardware assisted reset, the best we can do is jump to the reset vector and see what the bootloader left for us. Signed-off-by: Michal Simek Signed-off-by: John Williams commit 626afa35c1d39be43fc2b225d21973daf1c7e299 Author: Michal Simek Date: Thu Mar 10 10:51:27 2011 +0100 microblaze: Fix microblaze init vectors Microblaze vector table stores several vectors (reset, user exception, interrupt, debug exception and hardware exception). All these functions can be below address 0x10000. If they are, wrong vector table is genarated because jump is not setup from two instructions (imm upper 16bit and brai lower 16bit). Adding specific offset prevent problem if address is below 0x10000. For this case only brai instruction is used. Signed-off-by: Michal Simek commit 10a8c3839810ac9af1aec836d61b92e7a879f5fa Author: Will Deacon Date: Mon Mar 14 14:00:30 2011 +0100 ARM: 6806/1: irq: introduce entry and exit functions for chained handlers Some chained IRQ handlers are written to cope with primary chips of potentially different flow types. Whether this a sensible thing to do is a point of contention. This patch introduces entry/exit functions for chained handlers which infer the flow type of the primary chip as fasteoi or level-type by checking whether or not the ->irq_eoi function pointer is present and calling back to the primary chip as necessary. Other methods of flow control are not considered. Acked-by: Thomas Gleixner Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King commit 40360217fdbbb9afbbe23639dbc964fb2735a83f Author: Abhilash Kesavan Date: Tue Mar 15 18:35:24 2011 +0900 ARM: EXYNOS4: Add support for SATA on ARMLEX4210 Adds the device definitions, platform specific initialization and clocks for SATA on ARMLEX4210. Signed-off-by: Abhilash Kesavan Signed-off-by: Kukjin Kim commit 7e32d02613a72a39ba01638337c609a9a866c653 Author: Steven Whitehouse Date: Tue Mar 15 08:32:14 2011 +0000 GFS2: Don't use _raw version of RCU dereference As per RCU glock patch review comments, don't use the _raw version of this function here. Signed-off-by: Steven Whitehouse Cc: Paul E. McKenney Reviewed-by: Paul E. McKenney commit d80d499ed926e70b429d309360f5910d5ad54788 Author: Tomi Valkeinen Date: Wed Mar 2 15:53:07 2011 +0200 OMAP: DSS2: DSI: fix IRQ debug prints print_irq_status functions can be called with empty irq status when full irq debugging is enabled. This patch makes print_irq_status functions return immediately when given an empty irq status to lessen the debug spam slightly. Signed-off-by: Tomi Valkeinen commit 773b30b22f8c5ac4ccc52775c17809cc5826cb86 Author: Tomi Valkeinen Date: Fri Oct 8 16:15:25 2010 +0300 OMAP: DSS2: DSI: catch DSI errors in send_bta_sync dsi_vc_send_bta_sync() waits for BTA interrupt with a 500ms timeout. If a DSI error happens, no BTA is received and the timeout triggers. This could be handled much faster by listening to DSI errors also. This patch uses the ISR support to notice DSI errors while waiting for the BTA, thus speeding up the fail-path considerably. Signed-off-by: Tomi Valkeinen commit f34bd465cae57bcce11fb7f953cfcbb18222b99e Author: Tomi Valkeinen Date: Wed Mar 2 14:52:48 2011 +0200 OMAP: DSS2: DSI: use ISR for BTA in framedone Remove bta_callback from the interrupt handler, and use ISR support instead. Signed-off-by: Tomi Valkeinen commit f36a06e702ef804a99ce3a286514d84610a74db5 Author: Tomi Valkeinen Date: Wed Mar 2 14:48:41 2011 +0200 OMAP: DSS2: DSI: use ISR in send_bta_sync Remove bta_completion handling from the interrupt handler, and use ISR support instead. Signed-off-by: Tomi Valkeinen commit 4ae2ddddf44cd9f73def2dbdb68c6859072262ff Author: Tomi Valkeinen Date: Wed Mar 2 14:47:04 2011 +0200 OMAP: DSS2: DSI: Add ISR support Add generic ISR support for DSI interrupts. ISRs can be used instead of custom hooks in the interrupt handler. Signed-off-by: Tomi Valkeinen commit 69b281a61442f97e8df14babc9bb6a28624886b1 Author: Tomi Valkeinen Date: Wed Mar 2 14:44:27 2011 +0200 OMAP: DSS2: DSI: Restructure IRQ handler Clean up the IRQ handler a bit by separating collection of IRQ stats and handling of IRQ errors to separate functions. Signed-off-by: Tomi Valkeinen commit ec00f5e444706cb1902731655f3dcd04fc3df7b0 Author: Clemens Ladisch Date: Tue Mar 15 07:57:24 2011 +0100 ALSA: firewire-lib, firewire-speakers: handle packet queueing errors Add an AMDTP stream error state that occurs when we fail to queue another packet. In this case, the stream is stopped, and the error can be reported when the application tries to restart the PCM stream. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 5b2599a07eaee53d713fb68f5343eba88fa249c0 Author: Clemens Ladisch Date: Tue Mar 15 07:55:50 2011 +0100 ALSA: firewire-lib: allocate DMA buffer separately For correct cache coherency on some architectures, DMA buffers must be allocated in a different cache line than data that is concurrently used by the CPU. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit be454366324b31922a2460c63c65d5e3cebe9641 Author: Clemens Ladisch Date: Tue Mar 15 07:55:02 2011 +0100 ALSA: firewire-lib: use no-info SYT for packets without SYT sample In non-blocking mode, the SYT_INTERVAL is larger than the number of audio frames in each packet, so there are packets that do not contain any frame to which the SYT could be applied. For these packets, the SYT must not be the timestamp of the next valid SYT frame, but the special no-info SYT value. This fixes broken playback on the FireWave at 44.1 kHz. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 31ef9134eb52636d383a7d0626cbbd345cb94f2f Author: Clemens Ladisch Date: Tue Mar 15 07:53:21 2011 +0100 ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver Add a driver for two playback-only FireWire devices based on the OXFW970 chip. v2: better AMDTP API abstraction; fix fw_unit leak; small fixes v3: cache the iPCR value v4: FireWave constraints; fix fw_device reference counting; fix PCR caching; small changes and fixes v5: volume/mute support; fix crashing due to pcm stop races v6: fix build; one-channel volume for LaCie v7: use signed values to make volume (range checks) work; fix function block IDs for volume/mute; always use channel 0 for LaCie volume Signed-off-by: Clemens Ladisch Acked-by: Stefan Richter Tested-by: Jay Fenlason Signed-off-by: Takashi Iwai commit 25542c646afbf14c43fa7d2b443055cadb73b07a Author: Xiao Guangrong Date: Tue Mar 15 09:57:37 2011 +0800 x86, tlb, UV: Do small micro-optimization for native_flush_tlb_others() native_flush_tlb_others() is called from: flush_tlb_current_task() flush_tlb_mm() flush_tlb_page() All these functions disable preemption explicitly, so we can use smp_processor_id() instead of get_cpu() and put_cpu(). Signed-off-by: Xiao Guangrong Cc: Cliff Wickman LKML-Reference: <4D7EC791.4040003@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2 Merge: 56396e6 521cb40 Author: Ingo Molnar Date: Tue Mar 15 08:29:44 2011 +0100 Merge commit 'v2.6.38' into x86/mm Conflicts: arch/x86/mm/numa_64.c Merge reason: Resolve the conflict, update the branch to .38. Signed-off-by: Ingo Molnar commit 49641116392ad7522fa0efad53f7ed63f811bd88 Author: Taneja, Archit Date: Mon Mar 14 23:28:23 2011 -0500 OMAP: DSS2: FEATURES: DSI PLL parameter cleanup The DSI PLL parameters (regm, regn, regm_dispc, regm_dsi, fint) have different fields and also different Max values on OMAP3 and OMAP4. Use dss features to calculate the register fields and min/max values based on current OMAP revision. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 31ef82377f1e0f1bc7d308ae4312e6cc5a431885 Author: Taneja, Archit Date: Mon Mar 14 23:28:22 2011 -0500 OMAP: DSS2: FEATURES: Functions to return min and max values of parameters Create 2 functions dss_feat_get_param_min() and dss_feat_get_param_max() which return the minimum and maximum value of a parameter. Introduce a enum in dss_features called dss_range_param which contains parameters whose ranges we are interested in. Replace this with dss_feat_get_max_dss_fck() which is specific to the parameter DSS_FCK. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 50be5e3657cd2851a297dc0b3fd459f25829d29b Author: Tejun Heo Date: Mon Nov 29 15:57:14 2010 +0100 ahci: add another PCI ID for marvell 1b4b:91a3 seems to be another PCI ID for marvell ahci. Add it. Reported and tested in the following thread. http://thread.gmane.org/gmane.linux.kernel/1068354 Signed-off-by: Tejun Heo Reported-by: Borislav Petkov Reported-by: Alessandro Tagliapietra Signed-off-by: Jeff Garzik commit 4dce8ba94c751dd25f1d9b2d35c04312b046e5d6 Author: Hannes Reinecke Date: Mon Mar 14 08:54:20 2011 +0100 libata: Use 'bool' return value for ata_id_XXX Most ata_id_XXX inlines are simple tests, so we should set the return value to 'bool' here. Signed-off-by: Hannes Reinecke Signed-off-by: Jeff Garzik commit 235e7dba0264d4c6e56ee217fc7ef6d80da5eb67 Author: Taneja, Archit Date: Mon Mar 14 23:28:21 2011 -0500 OMAP2PLUS: DSS2: FEATURES: Fix usage of dss_reg_field and dss_clk_source_name The structures dss_reg_field and dss_clk_source_name have enum members which specify the register field and the clock source respectively. These members are not used to choose the correct result in the corresponding feature functions. Remove these members and change the features array declaration to incorporate these enums. The structure dss_clk_source_name without the enum member is just a pointer to an string. Remove the structure and use a character pointer directly. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 326be7b484843988afe57566b627fb7a70beac56 Author: Al Viro Date: Sun Mar 13 17:08:22 2011 -0400 Allow passing O_PATH descriptors via SCM_RIGHTS datagrams Just need to make sure that AF_UNIX garbage collector won't confuse O_PATHed socket on filesystem for real AF_UNIX opened socket. Signed-off-by: Al Viro commit 65cfc6722361570bfe255698d9cd4dccaf47570d Author: Al Viro Date: Sun Mar 13 15:56:26 2011 -0400 readlinkat(), fchownat() and fstatat() with empty relative pathnames For readlinkat() we simply allow empty pathname; it will fail unless we have dfd equal to O_PATH-opened symlink, so we are outside of POSIX scope here. For fchownat() and fstatat() we allow AT_EMPTY_PATH; let the caller explicitly ask for such behaviour. Signed-off-by: Al Viro commit bcda76524cd1fa32af748536f27f674a13e56700 Author: Al Viro Date: Sun Mar 13 16:42:14 2011 -0400 Allow O_PATH for symlinks At that point we can't do almost nothing with them. They can be opened with O_PATH, we can manipulate such descriptors with dup(), etc. and we can see them in /proc/*/{fd,fdinfo}/*. We can't (and won't be able to) follow /proc/*/fd/* symlinks for those; there's simply not enough information for pathname resolution to go on from such point - to resolve a symlink we need to know which directory does it live in. We will be able to do useful things with them after the next commit, though - readlinkat() and fchownat() will be possible to use with dfd being an O_PATH-opened symlink and empty relative pathname. Combined with open_by_handle() it'll give us a way to do realink-by-handle and lchown-by-handle without messing with more redundant syscalls. Signed-off-by: Al Viro commit 1abf0c718f15a56a0a435588d1b104c7a37dc9bd Author: Al Viro Date: Sun Mar 13 03:51:11 2011 -0400 New kind of open files - "location only". New flag for open(2) - O_PATH. Semantics: * pathname is resolved, but the file itself is _NOT_ opened as far as filesystem is concerned. * almost all operations on the resulting descriptors shall fail with -EBADF. Exceptions are: 1) operations on descriptors themselves (i.e. close(), dup(), dup2(), dup3(), fcntl(fd, F_DUPFD), fcntl(fd, F_DUPFD_CLOEXEC, ...), fcntl(fd, F_GETFD), fcntl(fd, F_SETFD, ...)) 2) fcntl(fd, F_GETFL), for a common non-destructive way to check if descriptor is open 3) "dfd" arguments of ...at(2) syscalls, i.e. the starting points of pathname resolution * closing such descriptor does *NOT* affect dnotify or posix locks. * permissions are checked as usual along the way to file; no permission checks are applied to the file itself. Of course, giving such thing to syscall will result in permission checks (at the moment it means checking that starting point of ....at() is a directory and caller has exec permissions on it). fget() and fget_light() return NULL on such descriptors; use of fget_raw() and fget_raw_light() is needed to get them. That protects existing code from dealing with those things. There are two things still missing (they come in the next commits): one is handling of symlinks (right now we refuse to open them that way; see the next commit for semantics related to those) and another is descriptor passing via SCM_RIGHTS datagrams. Signed-off-by: Al Viro commit f2fa2ffc2046fdc35f96366d1ec8675f4d578522 Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:40 2011 +0530 ext4: Copy fs UUID to superblock File system UUID is made available to application via /proc//mountinfo Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit 03cb5f03dcb26846fcad345d8c15aae91579a53d Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:39 2011 +0530 ext3: Copy fs UUID to superblock. File system UUID is made available to application via /proc//mountinfo Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit 93f1c20bc8cdb757be50566eff88d65c3b26881f Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:38 2011 +0530 vfs: Export file system uuid via /proc//mountinfo We add a per superblock uuid field. File systems should update the uuid in the fill_super callback Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit a51571ccb8be1b88aea502ebba8350519682c16d Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:38 2011 +0530 unistd.h: Add new syscalls numbers to asm-generic Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit 6aae5f2b2085c5c90964bb78676ea8a6a336e037 Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:37 2011 +0530 x86: Add new syscalls for x86_64 This patch add new syscalls to x86_64 Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit 7dadb755b082c259f7dd4a95a3a6eb21646a28d5 Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:35 2011 +0530 x86: Add new syscalls for x86_32 This patch adds new syscalls to x86_32 Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit f17b6042073e7000a90063f7edbca59a5bd1caa2 Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:30 2011 +0530 fs: Remove i_nlink check from file system link callback Now that VFS check for inode->i_nlink == 0 and returns proper error, remove similar check from file system Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit aae8a97d3ec30788790d1720b71d76fd8eb44b73 Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:27 2011 +0530 fs: Don't allow to create hardlink for deleted file Add inode->i_nlink == 0 check in VFS. Some of the file systems do this internally. A followup patch will remove those instance. This is needed to ensure that with link by handle we don't allow to create hardlink of an unlinked file. The check also prevent a race between unlink and link Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit becfd1f37544798cbdfd788f32c827160fab98c1 Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:26 2011 +0530 vfs: Add open by file handle support [AV: duplicate of open() guts removed; file_open_root() used instead] Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit 990d6c2d7aee921e3bce22b2d6a750fd552262be Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:26 2011 +0530 vfs: Add name to file handle conversion support The syscall also return mount id which can be used to lookup file system specific information such as uuid in /proc//mountinfo Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit e5e713cbe812e8b9ef2099694be7c587c51438c4 Author: Hans de Goede Date: Thu Mar 10 08:54:02 2011 +0100 hwmon/f71882fg: Add support for f71808e Signed-off-by: Hans de Goede Tested-by: Jonathan Michalon Signed-off-by: Guenter Roeck commit c11bb993629078264f72f8de8d48d7c3286c4c3e Author: Hans de Goede Date: Wed Mar 9 20:57:15 2011 +0100 hwmon/f71882fg: Add support for f71869f and f71869e Note that these 2 are register compatible and report the same superio id, but they are 2 distinct chips / models! Signed-off-by: Hans de Goede Tested-by: Thomas Faber Tested-by: Alexey Sychev Tested-by: Dieter Bloms Signed-off-by: Guenter Roeck commit 3cad402281607d4db0d99d88fbd67cabb7c5b9f1 Author: Hans de Goede Date: Wed Mar 9 20:57:14 2011 +0100 hwmon/f71882fg: Add support for f71889ed Note that this patch also makes 2 changes to the code paths for the f71889fg to keep the code unified between the 2 (for simplicities sake). Both of these are harmless for then f71889fg: 1) The first change is to always set the FAN_PROG_SEL bit to 0. This influences accesses to some banked fan / pwm registers. On the f71889fg no registers which we use are banked. On the f71889ed however some more fan registers have been banked including one which we use, by making the FAN_PROG_SEL bit 0, address 0x96 will point to the right register. 2) The second change is to see a FANx_TEMP_SEL value of 0 as pointing to a PECI / AMDSI value, and thus disable our pwm related sysfs attr. This is correct for the f71889ed and on the f71889fg 0 is a reserved value, so we should never see it and if we do, disabling the pwm related sysfs attr is a sane thing to do. Signed-off-by: Hans de Goede Tested-by: Thomas Greve Tested-by: Sander Eikelenboom Signed-off-by: Guenter Roeck commit e48a7f1a719b258ee8bd2e809205d6d0f9d66aed Author: Hans de Goede Date: Wed Mar 9 20:57:13 2011 +0100 hwmon/f71882fg: Break out test for auto pwm's controlled by digital readings Putting this check in its own switch case rather then in the switch case for adding pwm auto point sysfs attr is cleaner. This is a preparation patch for adding support for more different models. Signed-off-by: Hans de Goede Signed-off-by: Guenter Roeck commit 78aa4f72b30e4f2c631f6f550a911aad24769cfd Author: Hans de Goede Date: Wed Mar 9 20:57:12 2011 +0100 hwmon/f71882fg: Separate temp beep sysfs attr from the other temp sysfs attr This is a preparation patch for adding support for more different models. Signed-off-by: Hans de Goede Signed-off-by: Guenter Roeck commit 2a91946ac94765d22ebdc4afdeb2bf7028bfe623 Author: Hans de Goede Date: Wed Mar 9 20:57:08 2011 +0100 hwmon/f71882fg: Remove bogus temp2_type for certain models Remove the temp2_type sysfs files for f8000 / f71858fg models, this got in accidentally and is wrong as these models don't have a Temperature Sensor Type Register at all. Signed-off-by: Hans de Goede Signed-off-by: Guenter Roeck commit 60d2b378bb7ad1624d1332821da750d1eec50c53 Author: Hans de Goede Date: Wed Mar 9 20:57:11 2011 +0100 hwmon/f71882fg: Make number of temps configurable Make the temp sysattr array for the standard models a 2d array, which allows to use it for models with less temperatures too. This is a preparation patch for adding support for more different models. Signed-off-by: Hans de Goede Signed-off-by: Guenter Roeck commit 0bae640088b5bd6c7a2a691ad20543d69c2b9b2c Author: Hans de Goede Date: Wed Mar 9 20:57:10 2011 +0100 hwmon/f71882fg: Make creation of in sysfs attributes more generic This is a preparation patch for adding support for more different models, some of which have a sparse list of used voltage pins. Signed-off-by: Hans de Goede Signed-off-by: Guenter Roeck commit 98f7ba197f9ef366856b5cc9ef4f46e852f3d1c8 Author: Hans de Goede Date: Wed Mar 9 20:57:09 2011 +0100 hwmon/f71882fg: Only allow negative auto point temps if fan_neg_temp is enabled Signed-off-by: Hans de Goede Signed-off-by: Guenter Roeck commit 44c4dc521e99c0b2946973090b27c9bd4eb81b63 Author: Hans de Goede Date: Wed Mar 9 20:57:07 2011 +0100 hwmon/f71882fg: Fix temp1 sensor type reporting The code for determining a sensort type for temp1 was based on me misreading the datasheet, the tested registers do not determine what kind of sensor is actually reported as temp1. Instead the enable / disable certain additional digital sensor readouts throug PECI / AMDSI, etc. Independent of these settings temp1 is still reading an external BJT or thermistor as configured by the Temperature Sensor Type Register (0x6b). Signed-off-by: Hans de Goede Signed-off-by: Guenter Roeck commit 02309ad2b8cbcf45260dd9bb5a527799a612c161 Author: Guenter Roeck Date: Thu Mar 10 15:47:14 2011 -0800 hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F Systems with NCT6775F reported temperature sensor labels for systems with NCT6776F. This patch fixes the problem. Signed-off-by: Guenter Roeck commit d42e869acf0da4502c452b786dee35f0ecf4cbc8 Author: Ian Dobson Date: Mon Mar 7 14:21:12 2011 -0800 hwmon: (w83627ehf) Add fan debounce support for NCT6775F and NCT6776F NCT6776F and NCT6775F support debouncing the fan RPM signal. This can help improve the stability of th RPM signal for some fans (Arctic cooling fans for example). This patch adds a module parameter fan_debounce, which when set to 1 enables debounce for all fans that the chip supports. Signed-off-by: Ian Dobson Signed-off-by: Guenter Roeck commit 2dd59c26e9336db676956589320f1bc71dc1b2e7 Author: Guenter Roeck Date: Tue Feb 22 08:20:51 2011 -0800 hwmon: (w83627ehf) Update Kconfig for W83677HG-B, NCT6775F and NCT6776F Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit 3382a918da968318a4284a14b3dee4a38f8a6749 Author: Guenter Roeck Date: Sun Feb 13 13:08:23 2011 -0800 hwmon: (w83627ehf) Store rpm instead of raw fan speed data Since the fan speed value can be above 0xff, we can no longer use that value to determine if the fan speed reading is valid. This makes it difficult to manipulate the stored fan speed register value. If we store rpm instead of the fan speed register value, we do not need to correct it if the fan divisor value is changed, and the above mentioned problem no longer exists. Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit 26bc440e3f14df5daff4d1ff0f37de5e260cea18 Author: Guenter Roeck Date: Fri Feb 11 08:00:58 2011 -0800 hwmon: (w83627ehf) Use 16 bit fan count registers if supported Some of the chips supported by this driver have 13 bit or 16 bit fan count registers. This patch improves support for those registers, specifically for NCT6775F. With the changes in this patch, fan speed is reported correctly even if the fan divider is set to a low value, which results in a fan speed reading above 0xff. With this patch, the width of fan count registers is no longer used to determine if the chip has fan divider register(s) or not. A dedicated flag is used instead to determine if this is the case. Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit ec3e5a16446fef1891611fe3bdfa5954d1ddf5e4 Author: Guenter Roeck Date: Wed Feb 2 08:46:49 2011 -0800 hwmon: (w83627ehf) Add support for Nuvoton NCT6775F and NCT6776F This patch adds support for NCT6775F and NCT6776F to the w83627ehf driver. Signed-off-by: Guenter Roeck Tested-by: Ian Dobson (NCT6776F) Tested-by: Zachary Marzec (ASUS P8P67 PRO/NCT6776F) Acked-by: Ian Dobson commit b84bb5186297d181075d917e9049da3a3b78d10d Author: Guenter Roeck Date: Sun Feb 13 23:01:25 2011 -0800 hwmon: (w83627ehf) Permit enabling SmartFan IV mode if configured at startup If SmartFan IV mode was configured at startup, it should be possible to re-enable it later on. Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit 279af1a91a041070e17cb41900151cb724e1b32a Author: Guenter Roeck Date: Sun Feb 13 22:34:47 2011 -0800 hwmon: (w83627ehf) Convert register arrays to 16 bit, and convert access to pointers For newer chips, several registers are banked and thus need to be 16 bit. Also, register addresses change. To prepare for those chips, convert affected register arrays to 16 bit, and change access to those registers to array pointers in struct w83627ehf_data. Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit 96d1eac97b57c47855ada526d4e206ee13c31726 Author: Guenter Roeck Date: Fri Feb 11 08:10:53 2011 -0800 hwmon: (w83627ehf) Remove references to datasheets which no longer exist Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit d36cf32c9a6c4ffea8f2108a05defb55800f9215 Author: Guenter Roeck Date: Mon Feb 7 15:08:54 2011 -0800 hwmon: (w83627ehf) Improve support for W83667HG-B Add support for 4th temperature sensor on W83677HG-B. Display temperature labels on W83677HG-B to report temperature sources. Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit 83cc8985b82dff2ef85987a8481a92aab1b33323 Author: Guenter Roeck Date: Sun Feb 6 08:10:15 2011 -0800 hwmon: (w83627ehf) Optimize multi-bank register access Assume that each register is banked, and set the bank for each access. Cache the bank number so it only needs to be set if it changes. Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit e7e1ca6ef4f331c66392d3548cead7f1205f9278 Author: Guenter Roeck Date: Fri Feb 4 13:24:30 2011 -0800 hwmon: (w83627ehf) Fixed most checkpatch warnings and errors This cleanup fixes most of the checkpatch warnings and errors in the w83627ehf driver. Remaining warnings and errors are left untouched on purpose to avoid making the code less readable. Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit bce26c58df86599c9570cee83eac58bdaae760e4 Author: Guenter Roeck Date: Fri Feb 4 12:54:14 2011 -0800 hwmon: (w83627ehf) Unify temperature register access, and use strict string conversions This patch unifies temperature register access, and replaces simple_strtoXXX with strict_strtoXXX throughout the driver. Signed-off-by: Guenter Roeck Acked-by: Ian Dobson commit 2d2e148a237f790a19e2faa6d8387cf254010358 Author: Guenter Roeck Date: Wed Mar 2 15:19:35 2011 -0800 hwmon: Add tachometer pulses per fan revolution to sysfs ABI Some fan control chips support a configuration register to set the number of tachometer pulses per fan revolution. Add an ABI attribute to support this configuration register. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare commit de7790155f745d30d58ed131ed112b8735413ab7 Author: per.dalen@appeartv.com Date: Thu Mar 3 14:13:21 2011 -0500 hwmon: Add support for LTC4151 LTC4151 is High Voltage I2C Current and Voltage Monitor from Linear Technology. Signed-off-by: Per Dalen Signed-off-by: Guenter Roeck commit 9f6ad1ce6484a92ef864e00611a8ef3daf9c986d Author: Guenter Roeck Date: Mon Mar 7 18:34:50 2011 -0800 hwmon: (pmbus) Fix LINEAR16 data format LINEAR16 data format is unsigned, not signed. Impact is that affected attributes report negative values in the upper half of the supported value range. Signed-off-by: Guenter Roeck commit 8677011a5d8e0358ce5ae26d82dfcddcad073c47 Author: Guenter Roeck Date: Sun Mar 6 12:28:24 2011 -0800 hwmon: (pmbus) Continuously update temperature limit registers PMBus only has one set of limit registers for up to three temperature sensors. Thus, changing a limit for one of the temperature sensors affects limits for other temperature sensors in the same page (and potentially multiple pages depending on the chip implementation). To handle this situation, re-read all temperature limit registers when updating sensor data. This way, all affected temperature limits are updated whenever the limit for a single sensor is changed. Signed-off-by: Guenter Roeck commit b49547a5df96bc755d6f96abb8503678af49d91c Author: Guenter Roeck Date: Sun Mar 6 10:56:52 2011 -0800 hwmon: (pmbus) Improve support for paged temperature sensors Assumption so far was that PMBus devices would support TEMP2 and TEMP3 registers only on page 0, and that only the TEMP1 register would be used/supported on other pages. Turns out that is not correct. UCD92xx devices support TEMP1 and TEMP2 on page 0, and TEMP2 on other pages. So it is necessary to change the core code such that it does not make a page based assumptions about temperature register support. Signed-off-by: Guenter Roeck commit 954df6763cd84551a565a0c341d3401cf30b9d2d Author: Guenter Roeck Date: Sat Mar 5 07:55:10 2011 -0800 hwmon: (pmbus) Improve support for paged fans So far, it seemed like fans would either all be in page 0, or that there would be one page per fan. Turns out this was a wrong assumption. There is at least one PMBus fan controller which supports three pages with four fans each. Update code to handle this situation. Reported-by: Greg Schnorr Tested-by: Greg Schnorr Signed-off-by: Guenter Roeck Acked-by: Greg Schnorr commit 83274c68a34094bbb465589e61f91a3714f8d026 Author: Guenter Roeck Date: Tue Mar 1 13:49:18 2011 -0800 hwmon: (pmbus) More stringent checking of VOUT_MODE register Some PMBus chips do not support the VOUT_MODE register. To make matters worse, such chips may not return an error when reading the register either, but instead return 0xff. Check if the register exists using pmbus_check_byte_register() before reading its value. In addition, validate the returned value and ignore it if it is 0xff (which is invalid). Reported-by: Greg Schnorr Tested-by: Greg Schnorr Signed-off-by: Guenter Roeck Acked-by: Greg Schnorr commit a3eeb453539d7ad9c0d8cced1e0883a6a8ed18f3 Author: Guenter Roeck Date: Wed Jan 26 20:15:27 2011 -0800 hwmon: (pmbus) Add support for Maxim MAX34440/MAX34441 Signed-off-by: Guenter Roeck Acked-by: Jonathan Cameron commit dcb7d0668b178deec81db128b9fbab29190063c4 Author: Guenter Roeck Date: Wed Jan 26 20:14:26 2011 -0800 hwmon: (pmbus) Add support for Maxim MAX16064 Signed-off-by: Guenter Roeck Acked-by: Jonathan Cameron commit 8ea3238ba16fbf06ff20b2979f894dc88383584a Author: Guenter Roeck Date: Wed Jan 26 20:11:04 2011 -0800 hwmon: (pmbus) Add support for Maxim MAX8688 Signed-off-by: Guenter Roeck Acked-by: Jonathan Cameron commit 44f5a408ba0dd873784fbb07815db8edb5e00d20 Author: Guenter Roeck Date: Mon Jun 28 14:29:03 2010 -0700 hwmon: PMBus driver documentation Signed-off-by: Guenter Roeck Acked-by: Jonathan Cameron commit 442aba78728e77e03172ba83e905b9aff96febcf Author: Guenter Roeck Date: Wed Jan 26 20:09:02 2011 -0800 hwmon: PMBus device driver This driver adds support for hardware monitoring features of various PMBus devices. Signed-off-by: Guenter Roeck Acked-by: Jonathan Cameron commit 06923f84422371a6fb10b3efcd05b80ab48715c0 Author: Guenter Roeck Date: Sat Feb 19 08:27:47 2011 -0800 hwmon: (lm85) Add support for EMC6D103S EMC6D103S is similar to EMC6D103, only it does not support registers 62[5:7], 6D[0:7], and 6E[0:7]. Register respective sysfs attributes and update affected registers for all other chips only. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare commit 4f8ab430fa5dc338ce3012c91a3c7a2685d708de Author: Guenter Roeck Date: Fri Feb 25 08:29:51 2011 -0800 hwmon: (lm85) Do not update hysteresis and temp_auto_off if auto_temp_min is changed So far, the driver updates temp_auto_hyst and temp_auto_off if temp_auto_min changes. This may cause problems if temp_auto_off was not configured before configuring temp_auto_min, because one of the variables used (off_desired) is not initialized in this case. To simplify the code, and for consistency with other drivers, no longer update the delta between "min" and "off" until the user sets the "off" value again. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare commit bc6db2b5ce79b1d5c4ba2763948fa6e731d60295 Author: Guenter Roeck Date: Fri Feb 25 08:26:47 2011 -0800 hwmon: (lm85) Use function to remove sysfs attribute files Signed-off-by: Guenter Roeck Acked-by: Jean Delvare commit de24880586b28f1dc4cf91f5db962f0083baab2a Author: Guenter Roeck Date: Fri Feb 25 08:19:42 2011 -0800 hwmon: (lm85) Use boolean to determine if VID5 is configured ADT7463 and ADT7468 optionally support VID5 instead of the standard +12V measurement input. Use a boolean to identify the chip configuration instead of hardcoding it several times. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare commit 502b5a0199209001b34b623132ea313790acbd5d Author: Guenter Roeck Date: Wed Sep 29 20:12:08 2010 -0700 hwmon: Add support for Lineage Compact Power Line PEM devices This patch adds support for hardware monitoring of Lineage Compact Power Line Power Entry Modules. Reviewed-by: Tom Grennan Signed-off-by: Guenter Roeck commit 4e9be650597bffec5885a8c1abad1e4ffb0bcca3 Author: Mark Brown Date: Thu Jan 20 21:27:56 2011 +0000 hwmon: (lis3lv02d) Convert SPI to dev_pm_ops There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the lis3lv02d SPI driver. Signed-off-by: Mark Brown Signed-off-by: Guenter Roeck commit 177f3b920cf6d1ab6d97f0978f866a8a711918e6 Author: stigge@antcom.de Date: Sat Jan 29 17:04:01 2011 +0100 hwmon: (max6639) Set reasonable default PWM frequency This patch initializes register CONFIG3 to a reasonable default PWM frequency of 25kHz, to prevent audible sound in fan. Signed-off-by: Roland Stigge Signed-off-by: Guenter Roeck commit a5b79d62f2e6d1b0d44bcdafce46f47bf355b9fe Author: stigge@antcom.de Date: Thu Jan 20 18:42:55 2011 +0100 hwmon: Driver for Maxim MAX6639 2-Channel Temperature Monitor with Dual PWM Fan-Speed Controller Signed-off-by: Roland Stigge Signed-off-by: Guenter Roeck commit 7ef5ed1ce96c3f9a95b7327279f94b0700c689ef Author: Carolyn Wyborny Date: Sat Mar 12 08:59:47 2011 +0000 igb: Add messaging for thermal sensor events on i350 devices This feature adds messaging to the link status change to notify the user if the device returned from a downshift or power off event due to the Thermal Sensor feature in i350 parts. Feature is only available on internal copper ports. Signed-off-by: Carolyn Wyborny Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher commit 673b8b70cfae2cd0428a8ab5647571521348549a Author: Anders Berggren Date: Fri Feb 4 07:32:32 2011 +0000 igb: fix hw timestamping Hardware timestamping for Intel 82580 didn't work in either 2.6.36 or 2.6.37. Comparing it to Intel's igb-2.4.12 I found that the timecounter_init clock/counter initialization was done too early. Signed-off-by: Anders Berggren Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher commit 4c75de32eb9fcaa14925e2e444748f8b71e4f6fc Author: Joonyoung Shim Date: Mon Mar 14 21:41:40 2011 -0700 Input: atmel_mxt_ts - add objects of mXT1386 chip Atmel mXT1386 chip is operated by atmel_mxt_ts driver and it has some different objects. Signed-off-by: Joonyoung Shim Signed-off-by: Dmitry Torokhov commit 979a72dad9c6649486e35a84324af8e81936af03 Author: Joonyoung Shim Date: Mon Mar 14 21:41:34 2011 -0700 Input: atmel_mxt_ts - remove firmware version check Atmel touchscreen chips have different firmware version with each chip, so we cannot distinguish attribute of chip by firmware version. Signed-off-by: Joonyoung Shim Signed-off-by: Dmitry Torokhov commit e7cbb90ad244b9d3ba5c6d57aec05d6c73df0a98 Author: Mark Brown Date: Mon Mar 14 21:39:09 2011 -0700 Input: wm831x-ts - ensure the controller is in a known state on open Explicitly set all the enable bits when opening the device just in case something left the device in an unexpected state. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 48f26d514ed14f717ebd49439894a9637e0353a9 Author: Eric Dumazet Date: Mon Mar 14 21:05:40 2011 -0700 xen: netfront: fix xennet_get_ethtool_stats() commit e9a799ea4a5551d2 (xen: netfront: ethtool stats fields should be unsigned long) made rx_gso_checksum_fixup an unsigned long. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 0a5e5f122c756d1c1a6ca712eda76ea8664e5fd9 Author: J. Bruce Fields Date: Mon Mar 14 20:57:44 2011 -0400 nfsd: fix compile error "fs/built-in.o: In function `supported_enctypes_show': nfsctl.c:(.text+0x7beb0): undefined reference to `gss_mech_get_by_name' nfsctl.c:(.text+0x7bebc): undefined reference to `gss_mech_put' " Reported-by: Guennadi Liakhovetski Signed-off-by: J. Bruce Fields commit f2247fbdc41372d64c89505280419ceb45d80a31 Author: Simon Horman Date: Fri Feb 4 18:33:02 2011 +0900 IPVS: Conditionally include sysctl members of struct netns_ipvs There is now no need to include sysctl members of struct netns_ipvs unless CONFIG_SYSCTL is defined. Signed-off-by: Simon Horman commit 14e405461e664b777e2a5636e10b2ebf36a686ec Author: Simon Horman Date: Fri Feb 4 18:33:02 2011 +0900 IPVS: Add __ip_vs_control_{init,cleanup}_sysctl() Break out the portions of __ip_vs_control_init() and __ip_vs_control_cleanup() where aren't necessary when CONFIG_SYSCTL is undefined. Signed-off-by: Simon Horman commit fb1de432c1c7c26afb2e86d166fc37888b6a4423 Author: Simon Horman Date: Fri Feb 4 18:33:02 2011 +0900 IPVS: Conditionally define and use ip_vs_lblc{r}_table ip_vs_lblc_table and ip_vs_lblcr_table, and code that uses them are unnecessary when CONFIG_SYSCTL is undefined. Signed-off-by: Simon Horman commit a7a86b8616bc1595c4f5f109b7c39d4eb5d55e32 Author: Simon Horman Date: Fri Feb 4 18:33:02 2011 +0900 IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefined Much of ip_vs_leave() is unnecessary if CONFIG_SYSCTL is undefined. I tried an approach of breaking the now #ifdef'ed portions out into a separate function. However this appeared to grow the compiled code on x86_64 by about 200 bytes in the case where CONFIG_SYSCTL is defined. So I have gone with the simpler though less elegant #ifdef'ed solution for now. Signed-off-by: Simon Horman commit a4e2f5a700cb93448b2da0e158149d18dc5290ef Author: Simon Horman Date: Fri Feb 4 18:33:02 2011 +0900 IPVS: Conditional ip_vs_conntrack_enabled() ip_vs_conntrack_enabled() becomes a noop when CONFIG_SYSCTL is undefined. In preparation for not including sysctl_conntrack in struct netns_ipvs when CONFIG_SYCTL is not defined. Signed-off-by: Simon Horman commit 3a1bbf1885e94ecedf1deaaab1ace8409330aa7e Author: Simon Horman Date: Fri Feb 4 18:33:02 2011 +0900 IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefined Signed-off-by: Simon Horman commit b27d777ec54205eb56cf4e873d043a426881c629 Author: Simon Horman Date: Fri Feb 4 18:33:01 2011 +0900 IPVS: Conditinally use sysctl_lblc{r}_expiration In preparation for not including sysctl_lblc{r}_expiration in struct netns_ipvs when CONFIG_SYCTL is not defined. Signed-off-by: Simon Horman commit 8e1b0b1b560019cafebe45a7d9e6ec1122fedc7b Author: Simon Horman Date: Fri Feb 4 18:33:01 2011 +0900 IPVS: Add expire_quiescent_template() In preparation for not including sysctl_expire_quiescent_template in struct netns_ipvs when CONFIG_SYCTL is not defined. Signed-off-by: Simon Horman commit 71a8ab6cad63b4816711f2ea518755677a870f6f Author: Simon Horman Date: Fri Feb 4 18:33:01 2011 +0900 IPVS: Add sysctl_expire_nodest_conn() In preparation for not including sysctl_expire_nodest_conn in struct netns_ipvs when CONFIG_SYCTL is not defined. Signed-off-by: Simon Horman commit 7532e8d40ccfdde6667169eeac4fd7778d6eb462 Author: Simon Horman Date: Fri Feb 4 18:33:01 2011 +0900 IPVS: Add sysctl_sync_ver() In preparation for not including sysctl_sync_ver in struct netns_ipvs when CONFIG_SYCTL is not defined. Signed-off-by: Simon Horman commit 59e0350eada0516a810cb780db37746165f1d516 Author: Simon Horman Date: Fri Feb 4 18:33:01 2011 +0900 IPVS: Add {sysctl_sync_threshold,period}() In preparation for not including sysctl_sync_threshold in struct netns_ipvs when CONFIG_SYCTL is not defined. Signed-off-by: Simon Horman commit 0cfa558e2c21644a0dd6c21cfadd8bbeaf9fe1a0 Author: Simon Horman Date: Fri Feb 4 18:33:01 2011 +0900 IPVS: Add sysctl_nat_icmp_send() In preparation for not including sysctl_nat_icmp_send in struct netns_ipvs when CONFIG_SYCTL is not defined. Signed-off-by: Simon Horman commit 84b3cee39ff1ffc97f4f6fba8ad26786c1f6d8f5 Author: Simon Horman Date: Fri Feb 4 18:33:01 2011 +0900 IPVS: Add sysctl_snat_reroute() In preparation for not including sysctl_snat_reroute in struct netns_ipvs when CONFIG_SYCTL is not defined. Signed-off-by: Simon Horman commit ba4fd7e966fa837557a3ec846c5fd15328b212af Author: Simon Horman Date: Fri Feb 4 18:33:01 2011 +0900 IPVS: Add ip_vs_route_me_harder() Add ip_vs_route_me_harder() to avoid repeating the same code twice. Signed-off-by: Simon Horman commit 6ef757f965c9133e82116475eab7f30df391c7fa Author: Julian Anastasov Date: Mon Mar 14 01:44:28 2011 +0200 ipvs: rename estimator functions Rename ip_vs_new_estimator to ip_vs_start_estimator and ip_vs_kill_estimator to ip_vs_stop_estimator to better match their logic. Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman commit ea9f22cce9c2530d659f9122819940b69506b2d9 Author: Julian Anastasov Date: Mon Mar 14 01:41:54 2011 +0200 ipvs: optimize rates reading Move the estimator reading from estimation_timer to user context. ip_vs_read_estimator() will be used to decode the rate values. As the decoded rates are not set by estimation timer there is no need to reset them in ip_vs_zero_stats. There is no need ip_vs_new_estimator() to encode stats to rates, if the destination is in trash both the stats and the rates are inactive. Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman commit 87d68a15e2d5a6bd08e59ec80c7a5073bcabb7c3 Author: Julian Anastasov Date: Mon Mar 14 01:39:18 2011 +0200 ipvs: remove unused seqcount stats Remove ustats_seq, IPVS_STAT_INC and IPVS_STAT_ADD because they are not used. They were replaced with u64_stats. Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman commit 55a3d4e15c7c953ecc55b96b83d2679abf8a7899 Author: Julian Anastasov Date: Mon Mar 14 01:37:49 2011 +0200 ipvs: properly zero stats and rates Currently, the new percpu counters are not zeroed and the zero commands do not work as expected, we still show the old sum of percpu values. OTOH, we can not reset the percpu counters from user context without causing the incrementing to use old and bogus values. So, as Eric Dumazet suggested fix that by moving all overhead to stats reading in user context. Do not introduce overhead in timer context (estimator) and incrementing (packet handling in softirqs). The new ustats0 field holds the zero point for all counter values, the rates always use 0 as base value as before. When showing the values to user space just give the difference between counters and the base values. The only drawback is that percpu stats are not zeroed, they are accessible only from /proc and are new interface, so it should not be a compatibility problem as long as the sum stats are correct after zeroing. Signed-off-by: Julian Anastasov Acked-by: Eric Dumazet Signed-off-by: Simon Horman commit 2a0751af09c3099cf2837c623ca5d0436317d02d Author: Julian Anastasov Date: Fri Mar 4 12:20:35 2011 +0200 ipvs: reorganize tot_stats The global tot_stats contains cpustats field just like the stats for dest and svc, so better use it to simplify the usage in estimation_timer. As tot_stats is registered as estimator we can remove the special ip_vs_read_cpu_stats call for tot_stats. Fix ip_vs_read_cpu_stats to be called under stats lock because it is still used as synchronization between estimation timer and user context (the stats readers). Also, make sure ip_vs_stats_percpu_show reads properly the u64 stats from user context. Signed-off-by: Julian Anastasov Eric Dumazet Signed-off-by: Simon Horman commit 2553d064ff4bf999f369c8c3dfacaa797dbef1d9 Author: Julian Anastasov Date: Fri Mar 4 12:18:07 2011 +0200 ipvs: move struct netns_ipvs Remove include/net/netns/ip_vs.h because it depends on structures from include/net/ip_vs.h. As ipvs is pointer in struct net it is better to move struct netns_ipvs into include/net/ip_vs.h, so that we can easily use other structures in struct netns_ipvs. Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman commit 06b69390a652bfe4fa7e18e27c938e75ffe86ba0 Author: Jesper Juhl Date: Wed Mar 9 22:55:05 2011 +0100 IPVS: Fix variable assignment in ip_vs_notrack There's no sense to 'ct = ct = ' in ip_vs_notrack(). Just assign nf_ct_get()'s return value directly to the pointer variable 'ct' once. Signed-off-by: Jesper Juhl Signed-off-by: Simon Horman commit 6060c74a3de8ed142c78133e2829e74711f77387 Author: Shan Wei Date: Mon Mar 7 10:11:34 2011 +0800 netfilter:ipvs: use kmemdup The semantic patch that makes this output is available in scripts/coccinelle/api/memdup.cocci. More information about semantic patching is available at http://coccinelle.lip6.fr/ Signed-off-by: Shan Wei Signed-off-by: Simon Horman commit 4a569c0c0f833adace1e3aadaa38780ec2fcdf9e Author: Julian Anastasov Date: Fri Mar 4 12:28:20 2011 +0200 ipvs: remove _bh from percpu stats reading ip_vs_read_cpu_stats is called only from timer, so no need for _bh locks. Signed-off-by: Julian Anastasov Signed-off-by: Hans Schillstrom Signed-off-by: Simon Horman commit 097fc76a0805bdca17baf12cad9d3bcb215716a9 Author: Julian Anastasov Date: Fri Mar 4 12:26:17 2011 +0200 ipvs: avoid lookup for fwmark 0 Restore the previous behaviour to lookup for fwmark service only when fwmark is non-null. This saves only CPU. Signed-off-by: Julian Anastasov Signed-off-by: Hans Schillstrom Signed-off-by: Simon Horman commit bc898c97f7ba24def788d9f80786cf028a197122 Author: Yanqing_Liu@Dell.com Date: Fri Mar 11 09:47:11 2011 -0600 [SCSI] scsi_dh_rdac: Add MD36xxf into device list This patch is to add Dell MD36xxf array into the RDAC handler device list. Singed-off-by: Yanqing Liu Signed-off-by: James Bottomley commit 0c0217b016ba8a970a6f6ab62ad0d858f39881ca Author: Mark Rustad Date: Mon Mar 14 09:01:15 2011 +0000 net: dcbnl: Add IEEE app selector value definitions This adds defines for the app selector values currently defined in the IEEE 802.1Qaz specification. Signed-off-by: Mark Rustad Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 171f20e93b9d44a846bd5a41a583fdae13d26cd7 Author: Mark Rustad Date: Mon Mar 14 09:01:08 2011 +0000 net: dcbnl: Fix misspellings Fix a few spelling errors in dcbnl.h. Signed-off-by: Mark Rustad Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 698e1d23cfc15312be2e7665014afd98c49ae9a1 Author: Mark Rustad Date: Mon Mar 14 09:01:02 2011 +0000 net: dcbnl: Update copyright dates Signed-off-by: Mark Rustad Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 32f7ef73585a8773914661e1a8e477e7a0bfa8b4 Author: Douglas Gilbert Date: Fri Mar 11 10:43:35 2011 -0500 [SCSI] scsi_debug: add consecutive medium errors A useful test case for error recovery is multiple, consecutive medium errors. When scsi_debug is started with "opts=2" a MEDIUM ERROR is generated when block 0x1234 (4660) is read. The patch extends that to 10 consecutive blocks from 0x1234 (i.e. blocks 4660 to 4669 inclusive). [0:0:0:0] disk ATA INTEL SSD 2CV1 /dev/sda /dev/sg0 80.0GB [10:0:0:0] disk Linux scsi_debug 0004 /dev/sdb /dev/sg1 1.09TB Output file not specified so no copy, just reading input >> unrecovered read error at blk=4660, substitute zeros ... >> unrecovered read error at blk=4669, substitute zeros 4670+10 records in 0+0 records out 10 unrecovered read errors lowest unrecovered read lba=4660, highest unrecovered lba=4669 time to read data: 0.047943 secs at 49.87 MB/sec BTW Change /dev/sg1 (bsg device works just as well) to /dev/sdb to see why, with faulty media, you do not want to use the block layer interface. Reason: time block layer takes to do useless retries and collateral damage to data in its 4 KB blocks (O_DIRECT mitigates the latter). ChangeLog: - extend opts=2 medium error generation at block 0x1234 to 10 consecutive blocks (i.e. blocks 0x1234 to 0x123d). Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 235b87afbcadf46e5ca042b2e7a977a41ebce9dd Merge: bcd5023 bd35fe5 Author: Dave Airlie Date: Tue Mar 15 09:59:31 2011 +1000 Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core-next * 'nouveau/drm-nouveau-next' of ../drm-nouveau-next: drm/nouveau: fix __nouveau_fence_wait performance drm/nv40: attempt to reserve just enough vram for all 32 channels drm/nv50: check for vm traps on every gr irq drm/nv50: decode vm faults some more drm/nouveau: add nouveau_enum_find() util function drm/nouveau: properly handle pushbuffer check failures drm/nvc0: remove vm hack forcing large/small pages to not share a PDE commit 12a2856b604476c27d85a5f9a57ae1661fc46019 Author: Daniel Lezcano Date: Mon Mar 14 06:08:07 2011 +0000 macvlan : fix checksums error when we are in bridge mode When the lower device has offloading capabilities, the packets checksums are not computed. That leads to have any macvlan port in bridge mode to not work because the packets are dropped due to a bad checksum. If the macvlan is in bridge mode, the packet is forwarded to another macvlan port and reach the network stack where it looks for a checksum but this one was not computed due to the offloading of the lower device. In this case, we have to set the packet with CHECKSUM_UNNECESSARY when it is forwarded to a bridged port and restore the previous value of ip_summed when the packet goes to the lowerdev. Signed-off-by: Daniel Lezcano Cc: Patrick McHardy Cc: Andrian Nord Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit cc8bdf062318e76277dd76970ed58930d49888b0 Author: Jiri Pirko Date: Tue Mar 1 20:05:35 2011 +0000 fcoe: correct checking for bonding Check for bonding master and refuse to use that. Signed-off-by: Jiri Pirko Acked-by: Robert Love Acked-by: James Bottomley Signed-off-by: David S. Miller commit 2ce8c07d63cf860d6869eb4948522a0fef5ccc19 Author: Domenico Andreoli Date: Mon Mar 14 03:47:07 2011 +0000 CS89x0: Add networking support for QQ2440 QQ2440 is only another non-ISA board using CS89x0. This patch adds the minimum bits required to make QQ2440 work with CS89x0. Signed-off-by: Domenico Andreoli Signed-off-by: David S. Miller commit d181a6171ec84a6139dd11d3dd546748c640dcaa Author: Domenico Andreoli Date: Mon Mar 14 03:46:53 2011 +0000 CS89x0: Finish transition to CS89x0_NONISA_IRQ CS89x0_NONISA_IRQ is selected by all those non-ISA boards which use CS89x0. This patch only cleans the last bits left after its introduction. Signed-off-by: Domenico Andreoli Signed-off-by: David S. Miller commit a82058a730c2bd01c43beb8a4847526a2998cc1a Author: James Bottomley Date: Thu Mar 10 17:13:18 2011 -0600 [SCSI] libsas: fix ata list corruption issue I think this stems from a misunderstanding of how the ata error handler works. ata_scsi_cmd_error_handler() gets called with a passed in list of commands to handle. However, that list may still not be empty when it exits. The command ata_scsi_port_error_handler() must be called (which takes no list) before the list will be completely emptied. This bites the sas error handler because the two are called from different functions and the original list has gone out of scope before ata_scsi_port_error_handler() is called. leading to some commands dangling on bare stack, which is a potential memory corruption issue. Fix this by manually deleting all outstanding commands from the on-stack list before it goes out of scope. Signed-off-by: James Bottomley commit bea3864fb627d110933cfb8babe048b63c4fc76e Author: Rafael J. Wysocki Date: Tue Mar 15 00:45:46 2011 +0100 PM / Hibernate: Reduce autotuned default image size The hibernate image size autotuning mechanism sets the default image size to 5/2 of the total system RAM, but it is reported that on some systems device drivers allocate substantial amounts of memory during suspend and the creation of the image fails as a result (too little memory is preallocated). Modify the autotuning mechanism to use 1/3 instead of 2/5 of RAM as the default image size, which is reported to be sufficient for the affected systems. References: https://bugzilla.kernel.org/show_bug.cgi?id=30482 Reported-and-tested-by: Martin Steigerwald Signed-off-by: Rafael J. Wysocki commit 941b1cdae83039c99fc5c1884a98d2afd39760e5 Author: Stephen M. Cameron Date: Wed Mar 9 17:00:06 2011 -0600 [SCSI] hpsa: export resettable host attribute This attribute, requested by Redhat, allows kexec-tools to know whether the controller can honor the reset_devices kernel parameter and actually reset the controller. For kdump to work properly it is necessary that the reset_devices parameter be honored. This attribute enables kexec-tools to warn the user if they attempt to designate a non-resettable controller as the dump device. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 40dc166cb5dddbd36aa4ad11c03915ea538f5a61 Author: Rafael J. Wysocki Date: Tue Mar 15 00:43:46 2011 +0100 PM / Core: Introduce struct syscore_ops for core subsystems PM Some subsystems need to carry out suspend/resume and shutdown operations with one CPU on-line and interrupts disabled. The only way to register such operations is to define a sysdev class and a sysdev specifically for this purpose which is cumbersome and inefficient. Moreover, the arguments taken by sysdev suspend, resume and shutdown callbacks are practically never necessary. For this reason, introduce a simpler interface allowing subsystems to register operations to be executed very late during system suspend and shutdown and very early during resume in the form of strcut syscore_ops objects. Signed-off-by: Rafael J. Wysocki Acked-by: Greg Kroah-Hartman commit f9b9e806ae0ede772cbb9916d9ac7354a123d044 Author: Thomas Renninger Date: Mon Feb 28 22:06:34 2011 +0100 PM QoS: Make pm_qos settings readable I have a machine where entering deep C-states broke. pm_qos was a hot candidate, but I couldn't find any way to double check without the need of recompiling. While in this case it was a driver bug (ath9k): https://bugzilla.kernel.org/show_bug.cgi?id=27532 powertop or others may want to read out cpu_dma_latency restrictions which could be the cause of preventing a machine entering deeper C-states. Output with this patch: # default value of 2000 * USEC_PER_SEC (0x77359400) cat /dev/network_latency |hexdump 0000000 9400 7735 0000004 # value of 55 us which is the reason for not entering C2 cat /dev/cpu_dma_latency |hexdump 0000000 0037 0000 0000004 There is no reason to hide this info -> make pm_qos files readable. Signed-off-by: Thomas Renninger Signed-off-by: Rafael J. Wysocki commit 7ae496187876d264c712d7c102c45edb8eb41363 Author: Nishanth Menon Date: Fri Feb 25 23:46:18 2011 +0100 PM / OPP: opp_find_freq_exact() documentation fix opp_find_freq_exact() documentation has is_available instead of available. This also fixes warning with the kernel-doc: scripts/kernel-doc drivers/base/power/opp.c >/dev/null Warning(drivers/base/power/opp.c:246): No description found for parameter 'available' Warning(drivers/base/power/opp.c:246): Excess function parameter 'is_available' description in 'opp_find_freq_exact' Signed-off-by: Nishanth Menon Signed-off-by: Rafael J. Wysocki commit a8b7228cdce9937ebc302a28db8599035e7b3c86 Author: Alexandre Courbot Date: Thu Feb 24 20:48:56 2011 +0100 PM: Documentation/power/states.txt: fix repetition Remove repetition of "called swsusp". Signed-off-by: Alexandre Courbot Signed-off-by: Rafael J. Wysocki commit 9659cc0678b954f187290c6e8b247a673c5d37e1 Author: Rafael J. Wysocki Date: Fri Feb 18 23:20:21 2011 +0100 PM: Make system-wide PM and runtime PM treat subsystems consistently The code handling system-wide power transitions (eg. suspend-to-RAM) can in theory execute callbacks provided by the device's bus type, device type and class in each phase of the power transition. In turn, the runtime PM core code only calls one of those callbacks at a time, preferring bus type callbacks to device type or class callbacks and device type callbacks to class callbacks. It seems reasonable to make them both behave in the same way in that respect. Moreover, even though a device may belong to two subsystems (eg. bus type and device class) simultaneously, in practice power management callbacks for system-wide power transitions are always provided by only one of them (ie. if the bus type callbacks are defined, the device class ones are not and vice versa). Thus it is possible to modify the code handling system-wide power transitions so that it follows the core runtime PM code (ie. treats the subsystem callbacks as mutually exclusive). On the other hand, the core runtime PM code will choose to execute, for example, a runtime suspend callback provided by the device type even if the bus type's struct dev_pm_ops object exists, but the runtime_suspend pointer in it happens to be NULL. This is confusing, because it may lead to the execution of callbacks from different subsystems during different operations (eg. the bus type suspend callback may be executed during runtime suspend of the device, while the device type callback will be executed during system suspend). Make all of the power management code treat subsystem callbacks in a consistent way, such that: (1) If the device's type is defined (eg. dev->type is not NULL) and its pm pointer is not NULL, the callbacks from dev->type->pm will be used. (2) If dev->type is NULL or dev->type->pm is NULL, but the device's class is defined (eg. dev->class is not NULL) and its pm pointer is not NULL, the callbacks from dev->class->pm will be used. (3) If dev->type is NULL or dev->type->pm is NULL and dev->class is NULL or dev->class->pm is NULL, the callbacks from dev->bus->pm will be used provided that both dev->bus and dev->bus->pm are not NULL. Signed-off-by: Rafael J. Wysocki Acked-by: Kevin Hilman Reasoning-sounds-sane-to: Grant Likely Acked-by: Greg Kroah-Hartman commit cf4fb80ca3d591cae366ae8364e3c3f7a68bd249 Author: Jan Beulich Date: Fri Feb 18 01:05:36 2011 +0100 PM: Simplify kernel/power/Kconfig 'n' defaults are pretty pointless and actually bogus when used with prompt-less config options. The "bool"/"default y" pair with no prompt can be expressed more compactly using def_bool. [rjw: Rebased on top of earlier patches modifying this file.] Signed-off-by: Jan Beulich Signed-off-by: Rafael J. Wysocki commit 7538e3db6e015e890825fbd9f8659952896ddd5b Author: Rafael J. Wysocki Date: Wed Feb 16 21:53:17 2011 +0100 PM: Add support for device power domains The platform bus type is often used to handle Systems-on-a-Chip (SoC) where all devices are represented by objects of type struct platform_device. In those cases the same "platform" device driver may be used with multiple different system configurations, but the actions needed to put the devices it handles into a low-power state and back into the full-power state may depend on the design of the given SoC. The driver, however, cannot possibly include all the information necessary for the power management of its device on all the systems it is used with. Moreover, the device hierarchy in its current form also is not suitable for representing this kind of information. The patch below attempts to address this problem by introducing objects of type struct dev_power_domain that can be used for representing power domains within a SoC. Every struct dev_power_domain object provides a sets of device power management callbacks that can be used to perform what's needed for device power management in addition to the operations carried out by the device's driver and subsystem. Namely, if a struct dev_power_domain object is pointed to by the pwr_domain field in a struct device, the callbacks provided by its ops member will be executed in addition to the corresponding callbacks provided by the device's subsystem and driver during all power transitions. Signed-off-by: Rafael J. Wysocki Tested-and-acked-by: Kevin Hilman commit 6831c6edc7b272a08dd2a6c71bb183a48fe98ae6 Author: Rafael J. Wysocki Date: Tue Feb 15 21:22:24 2011 +0100 PM: Drop pm_flags that is not necessary The variable pm_flags is used to prevent APM from being enabled along with ACPI, which would lead to problems. However, acpi_init() is always called before apm_init() and after acpi_init() has returned, it is known whether or not ACPI will be used. Namely, if acpi_disabled is not set after acpi_init() has returned, this means that ACPI is enabled. Thus, it is sufficient to check acpi_disabled in apm_init() to prevent APM from being enabled in parallel with ACPI. Signed-off-by: Rafael J. Wysocki Acked-by: Len Brown commit e8665002477f0278f84f898145b1f141ba26ee26 Author: Rafael J. Wysocki Date: Sat Feb 12 01:42:41 2011 +0100 PM: Allow pm_runtime_suspend() to succeed during system suspend The dpm_prepare() function increments the runtime PM reference counters of all devices to prevent pm_runtime_suspend() from executing subsystem-level callbacks. However, this was supposed to guard against a specific race condition that cannot happen, because the power management workqueue is freezable, so pm_runtime_suspend() can only be called synchronously during system suspend and we can rely on subsystems and device drivers to avoid doing that unnecessarily. Make dpm_prepare() drop the runtime PM reference to each device after making sure that runtime resume is not pending for it. Signed-off-by: Rafael J. Wysocki Acked-by: Kevin Hilman commit 88a6f33e4d7143f94f8e787fa4065ac873507984 Author: Rafael J. Wysocki Date: Fri Feb 11 20:31:11 2011 +0100 PM: Clean up PM_TRACE dependencies and drop unnecessary Kconfig option CONFIG_PM_SLEEP_ADVANCED_DEBUG is not used any more, so drop it and CONFIG_CAN_PM_TRACE need not depend on EXPERIMENTAL, so remove that dependency. Signed-off-by: Rafael J. Wysocki commit aa33860158114d0df3c7997bc1dd41c0168e1c2a Author: Rafael J. Wysocki Date: Fri Feb 11 00:06:54 2011 +0100 PM: Remove CONFIG_PM_OPS After redefining CONFIG_PM to depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME) the CONFIG_PM_OPS option is redundant and can be replaced with CONFIG_PM. Signed-off-by: Rafael J. Wysocki commit 196ec243224bb38fc5c41d9fa4050f70708b7fb4 Author: Rafael J. Wysocki Date: Fri Feb 11 00:06:42 2011 +0100 PM: Reorder power management Kconfig options Reorder configuration options in kernel/power/Kconfig so that the options depended on are at the top of the list. This patch doesn't introduce any functional changes. Signed-off-by: Rafael J. Wysocki commit 1eb208aea3179dd2fc0cdeea45ef869d75b4fe70 Author: Rafael J. Wysocki Date: Fri Feb 11 00:06:30 2011 +0100 PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME) From the users' point of view CONFIG_PM is really only used for making it possible to set CONFIG_SUSPEND, CONFIG_HIBERNATION, CONFIG_PM_RUNTIME and (surprisingly enough) CONFIG_XEN_SAVE_RESTORE (CONFIG_PM_OPP also depends on CONFIG_PM, but quite artificially). However, both CONFIG_SUSPEND and CONFIG_HIBERNATION require platform support (independent of CONFIG_PM) and it is not quite obvious that CONFIG_PM has to be set for CONFIG_XEN_SAVE_RESTORE to be available. Thus, from the users' point of view, it would be more logical to automatically select CONFIG_PM if any of the above options depending on it are set. Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME), which will cause it to be selected when any of CONFIG_SUSPEND, CONFIG_HIBERNATION, CONFIG_PM_RUNTIME, CONFIG_XEN_SAVE_RESTORE is set and will clarify its meaning. Signed-off-by: Rafael J. Wysocki commit cd51e61cf4e8b220da37dc35e9c2dc2dc258b4de Author: Rafael J. Wysocki Date: Fri Feb 11 00:04:52 2011 +0100 PM / ACPI: Remove references to pm_flags from bus.c If direct references to pm_flags are removed from drivers/acpi/bus.c, CONFIG_ACPI will not need to depend on CONFIG_PM any more. Make that happen. Signed-off-by: Rafael J. Wysocki Acked-by: Len Brown commit cb8f51bdadb7969139c2e39c2defd4cde98c1ea8 Author: Rafael J. Wysocki Date: Tue Feb 8 23:26:02 2011 +0100 PM: Do not create wakeup sysfs files for devices that cannot wake up Currently, wakeup sysfs attributes are created for all devices, regardless of whether or not they are wakeup-capable. This is excessive and complicates wakeup device identification from user space (i.e. to identify wakeup-capable devices user space has to read /sys/devices/.../power/wakeup for all devices and see if they are not empty). Fix this issue by avoiding to create wakeup sysfs files for devices that cannot wake up the system from sleep states (i.e. whose power.can_wakeup flags are unset during registration) and modify device_set_wakeup_capable() so that it adds (or removes) the relevant sysfs attributes if a device's wakeup capability status is changed. Signed-off-by: Rafael J. Wysocki commit 4681b17154b3fd81f898802262985f662344e6ed Author: Rafael J. Wysocki Date: Tue Feb 8 23:25:48 2011 +0100 USB / Hub: Do not call device_set_wakeup_capable() under spinlock A subsequent patch will modify device_set_wakeup_capable() in such a way that it will call functions which may sleep and therefore it shouldn't be called under spinlocks. In preparation to that, modify usb_set_device_state() to avoid calling device_set_wakeup_capable() under device_state_lock. Tested-by: Minchan Kim Signed-off-by: Rafael J. Wysocki Acked-by: Greg Kroah-Hartman commit 0295a34d61f14522fddb26856191520d2e1d7e77 Author: Mandeep Singh Baines Date: Mon Jan 31 11:07:14 2011 +0100 PM: Use appropriate printk() priority level in trace.c printk()s without a priority level default to KERN_WARNING. To reduce noise at KERN_WARNING, this patch sets the priority level appriopriately for unleveled printks()s. This should be useful to folks that look at dmesg warnings closely. Changed these messages to pr_info(). Signed-off-by: Mandeep Singh Baines Signed-off-by: Rafael J. Wysocki commit 790c7885a4b2105e41f7a80b035fdb78e406154f Author: Rafael J. Wysocki Date: Mon Jan 31 11:07:01 2011 +0100 PM / Wakeup: Don't update events_check_enabled in pm_get_wakeup_count() Since pm_save_wakeup_count() has just been changed to clear events_check_enabled unconditionally before checking if there are any new wakeup events registered since the last read from /sys/power/wakeup_count, the detection of wakeup events during suspend may be disabled, after it's been enabled, by writing a "wrong" value back to /sys/power/wakeup_count. For this reason, it is not necessary to update events_check_enabled in pm_get_wakeup_count() any more. Signed-off-by: Rafael J. Wysocki commit 378eef99ad45700aabfba2bd962516e5608b259a Author: Rafael J. Wysocki Date: Mon Jan 31 11:06:50 2011 +0100 PM / Wakeup: Make pm_save_wakeup_count() work as documented According to Documentation/ABI/testing/sysfs-power, the /sys/power/wakeup_count interface should only make the kernel react to wakeup events during suspend if the last write to it has been successful. However, if /sys/power/wakeup_count is written to two times in a row, where the first write is successful and the second is not, the kernel will still react to wakeup events during suspend due to a bug in pm_save_wakeup_count(). Fix the bug by making pm_save_wakeup_count() clear events_check_enabled unconditionally before checking if there are any new wakeup events registered since the previous read from /sys/power/wakeup_count. Signed-off-by: Rafael J. Wysocki commit 023d3779145ec6b7a0f38f19672a347b92feb74e Author: Rafael J. Wysocki Date: Mon Jan 31 11:06:39 2011 +0100 PM / Wakeup: Combine atomic counters to avoid reordering issues The memory barrier in wakeup_source_deactivate() is supposed to prevent the callers of pm_wakeup_pending() and pm_get_wakeup_count() from seeing the new value of events_in_progress (0, in particular) and the old value of event_count at the same time. However, if wakeup_source_deactivate() is executed by CPU0 and, for instance, pm_wakeup_pending() is executed by CPU1, where both processors can reorder operations, the memory barrier in wakeup_source_deactivate() doesn't affect CPU1 which can reorder reads. In that case CPU1 may very well decide to fetch event_count before it's modified and events_in_progress after it's been updated, so pm_wakeup_pending() may fail to detect a wakeup event. This issue can be addressed by using a single atomic variable to store both events_in_progress and event_count, so that they can be updated together in a single atomic operation. Signed-off-by: Rafael J. Wysocki commit 3f5eac3a040a2ea61a575f713aabedecdd23c3f8 Author: Stephen M. Cameron Date: Wed Mar 9 17:00:01 2011 -0600 [SCSI] hpsa: move device attributes to avoid forward declarations Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 5b94e23292dec213e5bb0240894b597d93744e2a Author: Martin K. Petersen Date: Tue Mar 8 02:08:11 2011 -0500 [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26) Update scsi_debug to support the Logical Block Provisioning commands and bits as defined in SBC3r26. The old tp* parameters have been transitioned to the new lbp* scheme found in the draft standard. The old tpu option to enable UNMAP is now called lbpu. tpws to signal support for WRITE SAME(16) with the UNMAP bit set is now lbpws. Support for WRITE SAME(10) with the UNMAP bit set is also available using the lpuws10 parameter. Limiting the maximum number of blocks per WRITE SAME command has been implemented and is available via the write_same_length module parameter. As part of the renaming process the parameter lists have been sorted alphabetically (request from Doug). Signed-off-by: Martin K. Petersen Acked-by: Douglas Gilbert Signed-off-by: James Bottomley commit c98a0eb0e90d1caa8a92913cd45462102cbd5eaf Author: Martin K. Petersen Date: Tue Mar 8 02:07:15 2011 -0500 [SCSI] sd: Logical Block Provisioning update SBC3r26 contains many changes to the Logical Block Provisioning interfaces (formerly known as Thin Provisioning ditto). This patch implements support for both the old and new schemes using the same heuristic as before (whether the LBP VPD page is present). The new code also allows the provisioning mode (i.e. choice of command) to be overridden on a per-device basis via sysfs. Two additional modes are supported in this version: - WRITE SAME(10) with the UNMAP bit set - WRITE SAME(10) without the UNMAP bit set. This allows us to support devices that predate the TP/LBP enhancements in SBC3 and which work by way zero-detection Switching between modes has been consolidated in a helper function that also updates the block layer topology according to the limitations of the chosen command. I experimented with trying WRITE SAME(16) if UNMAP fails, WRITE SAME(10) if WRITE SAME(16) fails, etc. but found several devices that got cranky. So for now we'll disable discard if one of the commands fail. The user still has the option of selecting a different mode in sysfs. Signed-off-by: Martin K. Petersen Signed-off-by: James Bottomley commit 72f7d322fd60ce1a0579136dec7b26b0801ded4b Author: Martin K. Petersen Date: Tue Mar 8 02:03:59 2011 -0500 [SCSI] Include protection operation in SCSI command trace When debugging DIF/DIX it is very helpful to be able to see which DIX operation is associated with the scsi_cmnd. Include the protection op in the SCSI command trace. Signed-off-by: Martin K. Petersen Signed-off-by: James Bottomley commit 9143a9612277abc6e4ddced2bc54a120734834c6 Author: scameron@beardog.cce.hp.com Date: Mon Mar 7 10:44:16 2011 -0600 [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try) My first attempt was botched, got the wrong PCI Device ID (used PCI_DEVICE_ID_HP_CISSE, should have been PCI_DEVICE_ID_HP_CISSF) Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 904f0bc482201fa86e75c330d79dfd11be494cf8 Author: Nicholas Bellinger Date: Wed Mar 2 15:52:51 2011 -0800 [SCSI] target: Fix volume size misreporting for volumes > 2TB the target infrastructure fails to send the correct conventional size to READ_CAPACITY that force a retry with READ_CAPACITY_16, which reads the capacity for devices > 2TB. Fix by adding the correct return to trigger RC(16). Reported-by: Ben Jarvis Signed-off-by: Signed-off-by: Nicholas A. Bellinger Cc: stable@kernel.org Signed-off-by: James Bottomley commit 6ae705b23be8da52d3163be9d81e9b767876aaf9 Author: Denis Turischev Date: Thu Mar 10 15:14:00 2011 +0200 pch_uart: reference clock on CM-iTC Default clock source for UARTs on Topcliff is external UART_CLK. On CM-iTC USB_48MHz is used instead. After VCO2PLL and DIV manipulations UARTs will receive 192 MHz. Clock manipulations on Topcliff are controlled in pch_phub.c v2: redone against the linux-next tree v3: redone against linux/kernel/git/next/linux-next.git snapshot Signed-off-by: Denis Turischev Signed-off-by: Greg Kroah-Hartman commit 1a738dcf6dac74a0ce10853a068d822f66f73268 Author: Tomoya MORINAGA Date: Wed Dec 22 21:04:11 2010 +0900 pch_phub: add new device ML7213 Add ML7213 device information. ML7213 is companion chip of Intel Atom E6xx series for IVI(In-Vehicle Infotainment). ML7213 is completely compatible for Intel EG20T PCH. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit f52e0c11305aa09ed56cad97ffc8f0cdc3d78b5d Author: Al Viro Date: Mon Mar 14 18:56:51 2011 -0400 New AT_... flag: AT_EMPTY_PATH For name_to_handle_at(2) we'll want both ...at()-style syscall that would be usable for non-directory descriptors (with empty relative pathname). Introduce new flag (AT_EMPTY_PATH) to deal with that and corresponding LOOKUP_EMPTY; teach user_path_at() and path_init() to deal with the latter. Signed-off-by: Al Viro commit b5ccd07337489fa9c9d32e0b628a2168b7953adf Author: Sangtae Ha Date: Mon Mar 14 07:52:18 2011 +0000 tcp_cubic: fix low utilization of CUBIC with HyStart HyStart sets the initial exit point of slow start. Suppose that HyStart exits at 0.5BDP in a BDP network and no history exists. If the BDP of a network is large, CUBIC's initial cwnd growth may be too conservative to utilize the link. CUBIC increases the cwnd 20% per RTT in this case. Signed-off-by: Sangtae Ha Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2b4636a5f8ca547000f6aba24ec1c58f31f4a91d Author: Sangtae Ha Date: Mon Mar 14 07:52:17 2011 +0000 tcp_cubic: make the delay threshold of HyStart less sensitive Make HyStart less sensitive to abrupt delay variations due to buffer bloat. Signed-off-by: Sangtae Ha Acked-by: Stephen Hemminger Reported-by: Lucas Nussbaum Signed-off-by: David S. Miller commit 3b585b34493ec9db382d6c325d4ed77b9eb2d2a5 Author: stephen hemminger Date: Mon Mar 14 07:52:16 2011 +0000 tcp_cubic: enable high resolution ack time if needed This is a refined version of an earlier patch by Lucas Nussbaum. Cubic needs RTT values in milliseconds. If HZ < 1000 then the values will be too coarse. Signed-off-by: Stephen Hemminger Reported-by: Lucas Nussbaum Signed-off-by: David S. Miller commit 17a6e9f1aa9ba07ca13a1eaf1e631e743af50cca Author: stephen hemminger Date: Mon Mar 14 07:52:15 2011 +0000 tcp_cubic: fix clock dependency The hystart code was written with assumption that HZ=1000. Replace the use of jiffies with bictcp_clock as a millisecond real time clock. Signed-off-by: Stephen Hemminger Reported-by: Lucas Nussbaum Signed-off-by: David S. Miller commit aac46324e12a2bf2e9e0855ad6a287945e34ad39 Author: stephen hemminger Date: Mon Mar 14 07:52:14 2011 +0000 tcp_cubic: make ack train delta value a parameter Make the spacing between ACK's that indicates a train a tuneable value like other hystart values. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c54b4b7655447c1f24f6d50779c22eba9ee0fd24 Author: stephen hemminger Date: Mon Mar 14 07:52:13 2011 +0000 tcp_cubic: fix comparison of jiffies Jiffies wraps around therefore the correct way to compare is to use cast to signed value. Note: cubic is not using full jiffies value on 64 bit arch because using full unsigned long makes struct bictcp grow too large for the available ca_priv area. Includes correction from Sangtae Ha to improve ack train detection. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit febf081987ec445f071ed10b73e9707a88cc5cc4 Author: stephen hemminger Date: Mon Mar 14 07:52:12 2011 +0000 tcp: fix RTT for quick packets in congestion control In the congestion control interface, the callback for each ACK includes an estimated round trip time in microseconds. Some algorithms need high resolution (Vegas style) but most only need jiffie resolution. If RTT is not accurate (like a retransmission) -1 is used as a flag value. When doing coarse resolution if RTT is less than a a jiffie then 0 should be returned rather than no estimate. Otherwise algorithms that expect good ack's to trigger slow start (like CUBIC Hystart) will be confused. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c05e7ac99c32d4e5d8be272c0ba95b0fdcab431b Author: Eric Dumazet Date: Mon Mar 14 15:40:39 2011 -0700 ftmac100: use GFP_ATOMIC allocations where needed When running in softirq context, we should use GFP_ATOMIC allocations instead of GFP_KERNEL ones. Signed-off-by: Eric Dumazet Tested-by: Po-Yu Chuang Acked-by: Po-Yu Chuang Signed-off-by: David S. Miller commit dcf4ae2dba541eed96afb0ba13e562defb8543e6 Author: Frank Blaschka Date: Mon Mar 14 15:39:47 2011 -0700 qeth: change some configurations defaults This patch turns on RX checksum and GRO by default. To improve receiving performance and reduce congestion in case of network bursts we also increase the default number of inbound buffers. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit a23c37f1110d8912d4d0a66e78197e9195bb36d4 Author: Nicolas de Pesloüan Date: Sun Mar 13 10:34:22 2011 +0000 bonding: documentation update: mailing lists. In commit a6c36ee677607b02d8ecc88e8a12785418b88107 ("bonding: change list contact to netdev@vger.kernel.org"), the mailing list for bonding developpement was changed from bonding-devel to netdev. Update the bonding documentation to reflect this change: - bonding-devel is used for usage discussions (despite the name). - netdev is used for developpement discussions. Also remove the reference to the sourceforge bonding page, which is deprecated. Signed-off-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit d838d2c09af0820e306e3e9e31f97e873823b0b4 Author: Oleg Drokin Date: Fri Mar 11 04:17:27 2011 +0300 firewire: ohci: Misleading kfree in ohci.c::pci_probe/remove It seems drivers/firewire/ohci.c is making some optimistic assumptions about struct fw_ohci and that member "card" will always remain the first member of the struct. Plus it's probably going to confuse a lot of static code analyzers too. So I wonder if there is a good reason not to free the ohci struct just like it was allocated instead of the tricky &ohci->card way? Signed-off-by: Oleg Drokin It is perhaps just a rudiment from before mainline submission of the driver. Signed-off-by: Stefan Richter commit b6258fc1feabda868694ad5fdc7ca8edf3ef30ec Author: Stefan Richter Date: Sat Feb 26 15:08:35 2011 +0100 firewire: ohci: omit IntEvent.busReset check rom AT queueing Since commit 82b662dc4102 "flush AT contexts after bus reset for OHCI 1.2", the driver takes care of any AT packets that were enqueued during a bus reset phase. The check from commit 76f73ca1b291 is therefore no longer necessary and the MMIO read can be avoided. Signed-off-by: Stefan Richter commit 4c4070a3097fe9ef57af9ebca6f57a2c57bc6ff1 Merge: 5821c95 b9df468 Author: Russell King Date: Mon Mar 14 22:27:03 2011 +0000 Merge branch 'for-rmk-devel-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable commit 5821c95ffbfd368194927a4f7803125c5af8857c Merge: 8688a1a 9a9fb12 Author: Russell King Date: Mon Mar 14 22:26:30 2011 +0000 Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable commit e0dca7a05df4e23a8f5b07742e99e2a6f7d67db1 Author: Trond Myklebust Date: Mon Mar 14 18:20:01 2011 -0400 NFS: Fix a warning in fs/nfs/idmap.c Commit 45a52a02072b2a7e265f024cfdb00127e08dd9f2 (NFS move nfs_client initialization into nfs_get_client) introduces a new warning in fs/nfs/idmap.c: ‘struct rpc_timeout’ declared inside parameter list Fix it by adding a forward declaration for the struct rpc_timeout in include/linux/nfs_xdr.h Signed-off-by: Trond Myklebust commit e5537bfc98f01561fbdfbd8a78f0dc3e2360491d Author: Daniel Baluta Date: Mon Mar 14 15:25:33 2011 -0700 af_unix: update locking comment We latch our state using a spinlock not a r/w kind of lock. Signed-off-by: Daniel Baluta Signed-off-by: David S. Miller commit 468c3f924f043cad7a04f4f4d5224a2c9bc886c1 Author: Jiri Slaby Date: Sun Mar 13 06:54:31 2011 +0000 NET: cdc-phonet, handle empty phonet header Currently, for N 5800 XM I get: cdc_phonet: probe of 1-6:1.10 failed with error -22 It's because phonet_header is empty. Extra altsetting looks like there: E 05 24 00 01 10 03 24 ab 05 24 06 0a 0b 04 24 fd .$....$..$....$. E 00 . I don't see the header used anywhere so just check if the phonet descriptor is there, not the structure itself. Signed-off-by: Jiri Slaby Cc: Rémi Denis-Courmont Cc: David S. Miller Acked-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit ac90fa63432b3c03c189c39e62211d3b80418c30 Author: Jiri Slaby Date: Sun Mar 13 06:54:30 2011 +0000 NET: cdc-phonet, fix stop-queue handling Currently there is a warning emitted by the cdc-phonet driver: WARNING: at include/linux/netdevice.h:1557 usbpn_probe+0x3bb/0x3f0 [cdc_phonet]() Modules linked in: ... Pid: 5877, comm: insmod Not tainted 2.6.37.3-16-desktop #1 Call Trace: [] dump_trace+0x79/0x340 [] dump_stack+0x69/0x6f [] warn_slowpath_common+0x7b/0xc0 [] usbpn_probe+0x3bb/0x3f0 [cdc_phonet] ... ---[ end trace f5d3e02908603ab4 ]--- netif_stop_queue() cannot be called before register_netdev() So remove netif_stop_queue from the probe funtction to avoid that. Signed-off-by: Jiri Slaby Cc: Rémi Denis-Courmont Cc: David S. Miller Acked-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 2e588f84f254cca0fc3b9f01297d06799b8c85d3 Author: Sathya Perla Date: Fri Mar 11 02:49:26 2011 +0000 be2net: changes for BE3 native mode support So far be2net has been using BE3 in legacy mode. It now checks for native mode capability and if available it sets it. In native mode, the RX_COMPL structure is different from that in legacy mode. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit d478af0d6bb38c971d1172e99c5046025a9167c9 Author: Sony Chacko Date: Thu Mar 10 23:50:02 2011 +0000 netxen: Notify firmware of Flex-10 interface down Notify firmware when a Flex-10 interface is brought down so that virtual connect manager can display the correct link status. Signed-off-by: Sony Chacko Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit e9a799ea4a5551d20e458a45b541df0bbf8f1804 Author: Ian Campbell Date: Thu Mar 10 07:04:18 2011 +0000 xen: netfront: ethtool stats fields should be unsigned long Fixup the rx_gso_checksum_fixup field added in e0ce4af920eb to be unsigned long as suggested by Ben Hutchings in <1298919198.2569.14.camel@bwh-desktop> Signed-off-by: Ian Campbell Cc: Ben Hutchings Signed-off-by: David S. Miller commit a461c0297f2e80c78eaa03fc5141bf57a814ff4f Author: stephen hemminger Date: Thu Mar 10 05:57:04 2011 +0000 bridge: skip forwarding delay if not using STP If Spanning Tree Protocol is not enabled, there is no good reason for the bridge code to wait for the forwarding delay period before enabling the link. The purpose of the forwarding delay is to allow STP to learn about other bridges before nominating itself. The only possible impact is that when starting up a new port the bridge may flood a packet now, where previously it might have seen traffic from the other host and preseeded the forwarding table. Includes change for local variable br already available in that func. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 60aeba23101f34a690a0b0a048ffde3d023d4f3b Author: Thomas Lange Date: Wed Mar 9 04:41:16 2011 +0000 Davinci: Do not reset EMAC TX overruns counter on read Don't reset tx_fifo_errors when reading out current EMAC stats. (tx_fifo_errors shows up as TX overruns in netdev stats.) Without this correction, the old counter value is lost every time stats are read out. Signed-off-by: Thomas Lange Signed-off-by: David S. Miller commit af1dc13e607c1d1a909e21ee87aafbe7b9d4ae81 Author: Peter Korsgaard Date: Thu Mar 10 06:52:13 2011 +0000 phylib: SIOCGMIIREG/SIOCSMIIREG: allow access to all mdio addresses phylib would silently ignore the phy_id argument to these ioctls and perform the read/write with the active phydev address, whereas most non-phylib drivers seem to allow access to all mdio addresses (E.G. pcnet_cs). Signed-off-by: Peter Korsgaard Signed-off-by: David S. Miller commit dc187cb381f1bceb30498861ece510245c43ed9f Author: Michael Chan Date: Mon Mar 14 15:00:12 2011 -0700 bnx2: Update firmware and version Update 5709 mips firmware to 6.2.1a to fix iSCSI performance regression. There was an unnecessary context read in the fast path affecting performance. Update bnx2 to 2.1.6. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ea0f0d8bc6d13c2580d668ecf95297d5105a57fc Author: Vasanthy Kolluri Date: Tue Mar 8 15:35:30 2011 +0000 enic: Support newer version of firmware devcmd CMD_MCPU_FW_INFO This patch provides support to the newer version of firmware devcmd CMD_MCPU_FW_INFO that returns additional information (ASIC type and revision) about the underlying hardware. This knowledge is required by the driver to implement any hardware specific features. Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit 0b32211164da2b100553cb45e4e862f09c5cab11 Author: roel kluin Date: Tue Mar 8 09:52:55 2011 +0000 can: wrong index used in inner loop Index i was already used in the outer loop. Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit 1faa4356a3bd89ea11fb92752d897cff3a20ec0e Author: stephen hemminger Date: Mon Mar 7 08:34:06 2011 +0000 bridge: control carrier based on ports online This makes the bridge device behave like a physical device. In earlier releases the bridge always asserted carrier. This changes the behavior so that bridge device carrier is on only if one or more ports are in the forwarding state. This should help IPv6 autoconfiguration, DHCP, and routing daemons. I did brief testing with Network and Virt manager and they seem fine, but since this changes behavior of bridge, it should wait until net-next (2.6.39). Signed-off-by: Stephen Hemminger Reviewed-by: Nicolas de Pesloüan Tested-By: Adam Majer Signed-off-by: David S. Miller commit 2a543904ddcb463db9d56d1efcb2f80884ea55f3 Author: Nicolas Kaiser Date: Tue Oct 26 15:47:52 2010 +0000 IB/ipath: Don't reset disabled devices The comment some lines above states that disabled devices must not reset. Signed-off-by: Nicolas Kaiser commit 942527634e201883b39fe0c97a1e47db7a026f91 Author: Michel Lespinasse Date: Sun Mar 6 16:14:50 2011 +0000 drivers/net: fix build warnings with CONFIG_PM_SLEEP disabled This fixes a couple of build warnings when CONFIG_PM is enabled but CONFIG_PM_SLEEP is disabled. Applies on top of v2.6.38-rc7 - I know it's late, but it would be great if v2.6.38 could compile without warnings! Signed-off-by: Michel Lespinasse Signed-off-by: David S. Miller commit b3017e6a03d261778ad9450b5510460c4d462203 Author: Yoshihiro Shimoda Date: Mon Mar 7 21:59:55 2011 +0000 net: sh_eth: add set_mdio_gate in bb_info The SH7757's ETHER and GETHER use common MDIO pin. The MDIO pin is selected by specific register. So this patch adds new interface in bb_info, and when the sh_eth driver use the mdio, the register can be changed by the function. Signed-off-by: Yoshihiro Shimoda Signed-off-by: David S. Miller commit 8fcd496151b4354569283056076339239b86fabe Author: Yoshihiro Shimoda Date: Mon Mar 7 21:59:49 2011 +0000 net: sh_eth: add support for SH7757's GETHER The SH7757 have GETHER and ETHER both. This patch supports them. Signed-off-by: Yoshihiro Shimoda Signed-off-by: David S. Miller commit e47c90523484518aac30498150e427d824ace705 Author: Yoshihiro Shimoda Date: Mon Mar 7 21:59:45 2011 +0000 net: sh_eth: modify the PHY_INTERFACE_MODE The previous code had hardcoded the PHY_INTERFACE_MODE_MII of phy_connect. So some Gigabit PHYs will not behave correctly. The patch adds the phy_interface in sh_eth_plat_data, so we can select the phy interface. Signed-off-by: Yoshihiro Shimoda Signed-off-by: David S. Miller commit c5ed53687b39c195b4730de8c0355c1b78054ba6 Author: Yoshihiro Shimoda Date: Mon Mar 7 21:59:38 2011 +0000 net: sh_eth: remove almost #ifdef of SH7763 The SH7763 has GETHER. So the specification of some registers differs than other CPUs. This patch removes almost #ifdef of CONFIG_CPU_SUBTYPE_SH7763. Then we are able to add other CPU's GETHER easily. Signed-off-by: Yoshihiro Shimoda Signed-off-by: David S. Miller commit 4986b996882d82c68ab54b822d7cfdd7dd35f19a Author: Yoshihiro Shimoda Date: Mon Mar 7 21:59:34 2011 +0000 net: sh_eth: remove the SH_TSU_ADDR The defination is hardcoded in this driver for some CPUs. This patch modifies to get resource of TSU address from platform_device. Signed-off-by: Yoshihiro Shimoda Signed-off-by: David S. Miller commit 4a55530f38e4eeee3afb06093e81309138fe8360 Author: Yoshihiro Shimoda Date: Mon Mar 7 21:59:26 2011 +0000 net: sh_eth: modify the definitions of register The previous code cannot handle the ETHER and GETHER both as same time because the definitions of register was hardcoded. Signed-off-by: Yoshihiro Shimoda Signed-off-by: David S. Miller commit 201a11c1db82247143f0fbe29b4a97f16fa3a591 Merge: 05aebe2 1fa0738 Author: David S. Miller Date: Mon Mar 14 13:49:53 2011 -0700 Merge branch 'tipc-Mar14-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6 commit 05aebe2e5d009314a1d9b47ad9cda59ccb57d76d Author: Daniel Turull Date: Mon Mar 14 13:47:40 2011 -0700 pktgen: bug fix in transmission headers with frags=0 (bug introduced by commit 26ad787962ef84677a48c560 (pktgen: speedup fragmented skbs) The headers of pktgen were incorrectly added in a pktgen packet without frags (frags=0). There was an offset in the pktgen headers. The cause was in reusing the pgh variable as a return variable in skb_put when adding the payload to the skb. Signed-off-by: Daniel Turull Signed-off-by: David S. Miller Signed-off-by: Eric Dumazet commit 423cfa7e1fe68974b3b25fe8233ea57a5c2e5f02 Author: Ariel Elior Date: Mon Mar 14 13:43:22 2011 -0700 bnx2x: fix swap of rx-ticks and tx-ticks parameters in interrupt coalescing flow Signed-off-by: Ariel Elior Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 07d5ecae2940ddd77746e2fb597dcf57d3c2e277 Author: Thomas Gleixner Date: Mon Mar 14 20:00:30 2011 +0100 arm: Remove bogus comment in futex_atomic_cmpxchg_inatomic() commit 522d7dec(futex: Remove redundant pagefault_disable in futex_atomic_cmpxchg_inatomic()) added a bogus comment. /* Note that preemption is disabled by futex_atomic_cmpxchg_inatomic * call sites. */ Bogus in two aspects: 1) pagefault_disable != preempt_disable even if the mechanism we use is the same 2) we have a call site which deliberately does not disable pagefaults as it wants the possible fault to be handled - though that has been changed for consistency reasons now. Sigh. I really should have seen that when committing the above. :( Catched-by-and-rightfully-ranted-at-by: Linus Torvalds Signed-off-by: Thomas Gleixner LKML-Reference: Cc: Michel Lespinasse Cc: Darren Hart commit 6e0aa9f8a8190e0879a29bd67aa606b51734a122 Author: Thomas Gleixner Date: Mon Mar 14 10:34:35 2011 +0100 futex: Deobfuscate handle_futex_death() handle_futex_death() uses futex_atomic_cmpxchg_inatomic() without disabling page faults. That's ok, but totally non obvious. We don't hold locks so we actually can and want to fault here, because the get_user() before futex_atomic_cmpxchg_inatomic() does not guarantee a R/W mapping. We could just add a big fat comment to explain this, but actually changing the code so that the functionality is entirely clear is better. Use the helper function which disables page faults around the futex_atomic_cmpxchg_inatomic() and handle a fault with a call to fault_in_user_writeable() as all other places in the futex code do as well. Pointed-out-by: Linus Torvalds Signed-off-by: Thomas Gleixner Acked-by: Darren Hart Cc: Michel Lespinasse Cc: Peter Zijlstra Cc: Matt Turner Cc: Russell King Cc: David Howells Cc: Tony Luck Cc: Michal Simek Cc: Ralf Baechle Cc: "James E.J. Bottomley" Cc: Benjamin Herrenschmidt Cc: Martin Schwidefsky Cc: Paul Mundt Cc: "David S. Miller" Cc: Chris Metcalf LKML-Reference: Signed-off-by: Thomas Gleixner commit 1424dc96807909438282663079adc7f27c10b4a5 Author: David Ahern Date: Wed Mar 9 22:23:28 2011 -0700 perf script: Add support for H/W and S/W events Custom fields set for each type by prepending field argument with type. For file with multiple event types (e.g., trace and S/W) display of an event type suppressed by setting output fields to "". e.g., perf record -ga -e sched:sched_switch -e cpu-clock -c 10000000 -R -- sleep 1 perf script openssl 11496 [000] 9711.807107: cpu-clock-msecs: ffffffff810c22dc arch_local_irq_restore ([kernel.kallsyms]) ffffffff810c518c __alloc_pages_nodemask ([kernel.kallsyms]) ffffffff810297b2 pte_alloc_one ([kernel.kallsyms]) ffffffff810d8b98 __pte_alloc ([kernel.kallsyms]) ffffffff810daf07 handle_mm_fault ([kernel.kallsyms]) ffffffff8138763a do_page_fault ([kernel.kallsyms]) ffffffff81384a65 page_fault ([kernel.kallsyms]) 7f6130507d70 asn1_check_tlen (/lib64/libcrypto.so.1.0.0c) 0 () openssl 11496 [000] 9711.808042: sched_switch: prev_comm=openssl ... kworker/0:0 4 [000] 9711.808067: sched_switch: prev_comm=kworker/... swapper 0 [001] 9711.808090: sched_switch: prev_comm=kworker/... sshd 11451 [001] 9711.808185: sched_switch: prev_comm=sshd pre... swapper 0 [001] 9711.816155: cpu-clock-msecs: ffffffff81023609 native_safe_halt ([kernel.kallsyms]) ffffffff8100132a cpu_idle ([kernel.kallsyms]) ffffffff8137cf9b start_secondary ([kernel.kallsyms]) openssl 11496 [000] 9711.817104: cpu-clock-msecs: 7f61304ad723 AES_cbc_encrypt (/lib64/libcrypto.so.1.0.0c) 7fff3402f950 () 12f0debc9a785634 () swapper 0 [001] 9711.826155: cpu-clock-msecs: ffffffff81023609 native_safe_halt ([kernel.kallsyms]) ffffffff8100132a cpu_idle ([kernel.kallsyms]) ffffffff8137cf9b start_secondary ([kernel.kallsyms]) To suppress trace events within the file and use default output for S/W events: perf script -f trace: or to suppress S/W events and do default display for trace events: perf script -f sw: Custom field selections: perf script -f sw:comm,tid,time -f trace:time,trace openssl 11496 9711.797162: swapper 0 9711.807071: openssl 11496 9711.807107: 9711.808042: prev_comm=openssl prev_pid=11496 prev_prio=120 prev_state=R ... 9711.808067: prev_comm=kworker/0:0 prev_pid=4 prev_prio=120 prev_state=S ... 9711.808090: prev_comm=kworker/0:0 prev_pid=0 prev_prio=120 prev_state=R ... 9711.808185: prev_comm=sshd prev_pid=11451 prev_prio=120 prev_state=S ==>... swapper 0 9711.816155: openssl 11496 9711.817104: swapper 0 9711.826155: Acked-by: Frederic Weisbecker Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1299734608-5223-7-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit c0230b2bfbd16e42d937c34aed99e5d6493eb5e4 Author: David Ahern Date: Wed Mar 9 22:23:27 2011 -0700 perf script: Add support for dumping symbols Add option to dump symbols found in events. e.g., perf script -f comm,pid,tid,time,trace,sym swapper 0/0 537.037184: prev_comm=swapper prev_pid=0 prev_prio=120... ffffffff81030350 perf_trace_sched_switch ([kernel.kallsyms]) ffffffff81382ac5 schedule ([kernel.kallsyms]) ffffffff8100134a cpu_idle ([kernel.kallsyms]) ffffffff81370b39 rest_init ([kernel.kallsyms]) ffffffff81696c23 start_kernel ([kernel.kallsyms].init.text) ffffffff816962af x86_64_start_reservations ([kernel.kallsyms].init.text) ffffffff816963b9 x86_64_start_kernel ([kernel.kallsyms].init.text) sshd 1675/1675 537.037309: prev_comm=sshd prev_pid=1675 prev_prio=120... ffffffff81030350 perf_trace_sched_switch ([kernel.kallsyms]) ffffffff81382ac5 schedule ([kernel.kallsyms]) ffffffff813837aa schedule_hrtimeout_range_clock ([kernel.kallsyms]) ffffffff81383886 schedule_hrtimeout_range ([kernel.kallsyms]) ffffffff8110c4f9 poll_schedule_timeout ([kernel.kallsyms]) ffffffff8110cd20 do_select ([kernel.kallsyms]) ffffffff8110ced8 core_sys_select ([kernel.kallsyms]) ffffffff8110d00d sys_select ([kernel.kallsyms]) ffffffff81002bc2 system_call ([kernel.kallsyms]) 7f1647e56e93 __GI_select (/lib64/libc-2.12.90.so) netstat 1692/1692 537.038664: prev_comm=netstat prev_pid=1692 prev_prio=... ffffffff81030350 perf_trace_sched_switch ([kernel.kallsyms]) ffffffff81382ac5 schedule ([kernel.kallsyms]) ffffffff81002c3a sysret_careful ([kernel.kallsyms]) 7f7a6cd1b210 __GI___libc_read (/lib64/libc-2.12.90.so) Acked-by: Frederic Weisbecker Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1299734608-5223-6-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit 745f43e3433a7939bd9c351c8106e0c1db2044c6 Author: David Ahern Date: Wed Mar 9 22:23:26 2011 -0700 perf script: Support custom field selection for output Allow a user to select which fields to print to stdout for event data. Options include comm (command name), tid (thread id), pid (process id), time (perf timestamp), cpu, event (for event name), and trace (for trace data). Default is set to maintain compatibility with current output; this feature does alter output format slightly -- no '-' between command and pid/tid. Thanks to Frederic Weisbecker for detailed suggestions on this approach. Examples (output compressed) 1. trace, default format perf record -ga -e sched:sched_switch perf script swapper 0 [000] 537.037184: sched_switch: prev_comm=swapper prev_pid=0... sshd 1675 [000] 537.037309: sched_switch: prev_comm=sshd prev_pid=1675... netstat 1692 [001] 537.038664: sched_switch: prev_comm=netstat prev_pid=1692... 2. trace, custom format perf record -ga -e sched:sched_switch perf script -f comm,pid,time,trace <--- omitting cpu and event name swapper 0 537.037184: prev_comm=swapper prev_pid=0 prev_prio=120 ... sshd 1675 537.037309: prev_comm=sshd prev_pid=1675 prev_prio=120 ... netstat 1692 537.038664: prev_comm=netstat prev_pid=1692 prev_prio=120 ... Acked-by: Frederic Weisbecker Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1299734608-5223-5-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit c70c94b47405d2c94df19c16273daf1f5fb9193d Author: David Ahern Date: Wed Mar 9 22:23:25 2011 -0700 perf script: Move printing of 'common' data from print_event and rename This change does impact output: latency data is trace specific and is now printed after the common data - comm, tid, cpu, time and event name. Acked-by: Frederic Weisbecker Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1299734608-5223-4-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit 2ee7a49f935b19f7daf0a110800488acd2479cba Author: David Ahern Date: Wed Mar 9 22:23:24 2011 -0700 perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse Next patch moves printing of 'common' data into perf-script which removes the need for these functions. Acked-by: Frederic Weisbecker Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1299734608-5223-3-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit be6d842a65babc54e2b204b382df2529e304be48 Author: David Ahern Date: Wed Mar 9 22:23:23 2011 -0700 perf script: Change process_event prototype Prepare for handling of samples for any event type. Acked-by: Frederic Weisbecker Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1299734608-5223-2-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit 12bb12fac06d6212be9a5ed282c5670d4e90747f Author: Alexander Beregalov Date: Sun Mar 13 21:58:49 2011 +0300 staging: hv: fix memory leaks Free resources before exit. Signed-off-by: Alexander Beregalov Cc: K. Y. Srinivasan Cc: Haiyang Zhang Cc: Mike Sterling Cc: Abhishek Kane Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit dd9b15dc03075993f63a8a69667a3a8989aedfa1 Author: Ilia Mirkin Date: Sun Mar 13 00:29:00 2011 -0500 staging: hv: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Cc: K. Y. Srinivasan Cc: Haiyang Zhang Cc: Mike Sterling Cc: Abhishek Kane Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit e13a0b5a4b2ca9e318896a1c8c4b45d62477c956 Author: K. Y. Srinivasan Date: Thu Mar 10 14:07:44 2011 -0800 Staging: hv: Get rid of vmbus_child_dev_add() The function vmbus_child_dev_add() is a wrapper that can be eliminated; get rid of it. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 3ca07cb06d3176b3eb1bfd49fdc8c8fbe649fa5b Author: K. Y. Srinivasan Date: Thu Mar 10 14:07:21 2011 -0800 Staging: hv: Change the signature for vmbus_child_device_register() In preparation for getting rid of the vmbus_child_dev_add() function, modify the signature of vmbus_child_device_register(). Note that the root device is a global variable. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit ece0e32fd2870f7d2b2f28a99f8e63bef3c01686 Author: K. Y. Srinivasan Date: Thu Mar 10 14:06:55 2011 -0800 Staging: hv: Get rid of vmbus_cleanup() function Get rid of the vmbus_cleanup() function by inlining the necessary code. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit f51b3593bbea8b403117212588bda87429545fa7 Author: K. Y. Srinivasan Date: Thu Mar 10 14:06:31 2011 -0800 Staging: hv: Get rid of vmbus_dev_rm() function Get rid of the vmbus_dev_rm() function by inlining the necessary code. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 480ae58db525e57cc18611eec7ae24633d2e7efc Author: K. Y. Srinivasan Date: Thu Mar 10 14:06:06 2011 -0800 Staging: hv: Change the signature for vmbus_on_isr() As part of getting getting rid of the hv_driver object from vmbus_driver_context, change the signature for vmbus_on_isr. Note that the argument to vmbus_on_isr() is not used. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 6de3d6aa9ad455726eb7b689e2d3e57d89374e55 Author: K. Y. Srinivasan Date: Thu Mar 10 14:05:16 2011 -0800 Staging: hv: Eliminate vmbus_event_dpc() vmbus_event_dpc() was a wrapper function not adding any value; get rid of it. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 62c1059d6e20fe23e9e36cd1e79fafb778c86627 Author: K. Y. Srinivasan Date: Thu Mar 10 14:04:53 2011 -0800 Staging: hv: Get rid of the function vmbus_msg_dpc() vmbus_msg_dpc() was a wrapper adding no additional value; get rid of this function. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 21ec2de26a418e8a5839f2d260876b952a61b9ac Author: K. Y. Srinivasan Date: Thu Mar 10 14:04:29 2011 -0800 Staging: hv: Change the signature for vmbus_cleanup() As part of geting rid of hv_driver object from vmbus_driver_context, change the signature of vmbus_cleanup() function. Note that while vmbus_cleanup() was passed a pointer to hv_driver, this argument was unused. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit a6e4d8e3fee3cb49c4a0f696c26f1c7b1e4d7a1b Author: K. Y. Srinivasan Date: Thu Mar 10 14:03:51 2011 -0800 Staging: hv: Simplify root device management As part of simplifying root device management, get rid of the hv_driver object from vmbus_driver_context. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit f0dee9f26c31363f43a643a36f1de70a073bca0e Author: Mike McCormack Date: Thu Mar 10 22:41:06 2011 +0900 staging: rtl8192e: Don't copy dev pointer to skb Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 83970d9ba1768f1b9ad6c154872cbc08f89da062 Author: Mike McCormack Date: Thu Mar 10 22:40:53 2011 +0900 staging: rtl8192e: Pass priv to cmdpkt functions Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit ef8efe5b2dd70f48efcb5b34b0d5cf73df99b32b Author: Mike McCormack Date: Thu Mar 10 22:40:36 2011 +0900 staging: rtl8192e: Pass priv to firmware download functions Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 4368607df103e218a0fe3656f88daf49bb35f8cc Author: Mike McCormack Date: Thu Mar 10 22:40:15 2011 +0900 staging: rtl8192e: Pass priv to rtl8192_interrupt Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit eea7205027cdeaafe97ccf3c6df10b7f253af7c3 Author: Mike McCormack Date: Thu Mar 10 22:40:06 2011 +0900 staging: rtl8192e: Pass rtl8192_priv to dm functions Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 1e04ca7adf56e90c3dd3cbbf94936edb94f44d72 Author: Mike McCormack Date: Thu Mar 10 22:39:50 2011 +0900 staging: rtl8192e: Pass ieee80211_device to callbacks Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit ad44d2a1c57d45e8f0f74f69c02bd59eb46c0656 Author: Mike McCormack Date: Thu Mar 10 22:34:06 2011 +0900 staging: rtl8192e: Pass ieee80211_device to callbacks Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 7c186cff26eea4a7e2f1c0df9feb3f20aff7c71c Author: Mike McCormack Date: Thu Mar 10 22:33:57 2011 +0900 staging: rtl8192e: Pass ieee80211_device to callbacks Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit d1c580aa706ad49a670af9c7188d1e13c319bd9a Author: Mike McCormack Date: Thu Mar 10 22:33:47 2011 +0900 staging: rtl8192e: Pass ieee80211_device to callbacks Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 09145962d6fdcecc229e685bc2321bd29fdc94c9 Author: Mike McCormack Date: Thu Mar 10 22:33:36 2011 +0900 staging: rtl8192e: Pass ieee80211_device to callbacks Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 45a43a84cdabc1918b9e59c829587fe1be7cee92 Author: Mike McCormack Date: Thu Mar 10 22:33:20 2011 +0900 staging: rtl8192e: Simplify rtl819x_ifcheck_resetornot Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 8031aecb2dc4a973792f147ece4e23771d5071d3 Author: Mike McCormack Date: Thu Mar 10 22:33:11 2011 +0900 staging: rtl8192e: Remove ifdefs and dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit de69ba32136a790ee6b4d009df4c0a0b9cc0f6cd Author: Mike McCormack Date: Thu Mar 10 22:33:01 2011 +0900 staging: rtl8192e: Pass priv pointer to proc Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 699d01570230f3830ddf299c5f932e7525c9647a Author: Mike McCormack Date: Thu Mar 10 22:32:46 2011 +0900 staging: rtl8192e: Delete dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit db386800613060757d511fa60e11fc5f3c7fd5d5 Author: Mike McCormack Date: Thu Mar 10 22:32:36 2011 +0900 staging: rtl8192e: Use better loop counter name Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit a78275349ceca6dea754ddaa0ef85ab636af57c1 Author: Mike McCormack Date: Thu Mar 10 22:32:26 2011 +0900 staging: rtl8192e: Delete unused struct members Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 9a77bd58f6bfe05df7ec807c22be40fb2dc62e23 Author: Mike McCormack Date: Thu Mar 10 22:32:16 2011 +0900 staging: rtl8192e: Store mem_start in priv struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit f19dbc0ca8aa8bac415857c14be4252c38b1d925 Author: Mike McCormack Date: Thu Mar 10 22:32:05 2011 +0900 staging: rtl8192e: Delete commented code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 28344f1a1b271d183e7aa9ab01c72c50c80e1b94 Author: Mike McCormack Date: Thu Mar 10 22:31:56 2011 +0900 staging: rtl8192e: Remove unused header Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit b4c77848600906055c66dd32074d23858e6e200d Author: Alexander Beregalov Date: Sun Mar 13 21:58:48 2011 +0300 staging: crystalhd: fix memory leaks Free resources before exit. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 819d4eb11605408e0267301d8853367ff82286a5 Author: Alexander Beregalov Date: Sun Mar 13 21:58:50 2011 +0300 staging: ste_rmi4: fix memory leaks Free resources before exit. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 570edd3b2337a94b4159aa9ff10e0b96c5a69ec2 Author: Alexander Beregalov Date: Sun Mar 13 21:58:47 2011 +0300 staging: brcm80211: fix memory leaks Free resources before exit. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit ab42abf33a3efdf754710a0a513c00c40854cd61 Author: Felipe Contreras Date: Fri Mar 11 18:29:06 2011 -0600 staging: tidspbridge: protect dmm_map properly We need to protect not only the dmm_map list, but the individual map_obj's, otherwise, we might be building the scatter-gather list with garbage. So, use the existing proc_lock for that. I observed race conditions which caused kernel panics while running stress tests, also, Tuomas Kulve found it happening quite often in Gumstix Over. This patch fixes those. Cc: Tuomas Kulve Signed-off-by: Felipe Contreras Signed-off-by: Omar Ramirez Luna Cc: stable Signed-off-by: Greg Kroah-Hartman commit 17e2a542032f3ab735352d1d4b5d2ca3c154158a Author: Michael Hennerich Date: Thu Mar 10 09:09:47 2011 +0100 Staging: IIO: DAC: AD5624R: Consistency cleanup - no functional changes Consistently use indio_dev and access macro for devdata Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit b1178b21c6b9721a07fbd50762067a7c0ffa5a50 Author: Michael Williamson Date: Mon Mar 14 11:49:02 2011 -0400 spi/davinci: Support DMA transfers larger than 65535 words The current davinci SPI driver, in DMA mode, is limited to 65535 words for a single transfer. Modify the driver by configuring a 3 dimensional EDMA transfer to support up to 65535x65535 words. Signed-off-by: Michael Williamson Tested-by: Stefano Babic Signed-off-by: Grant Likely commit d09519e41a67eab22cc4566670431f9252b6786a Author: Michael Williamson Date: Sun Mar 13 10:34:21 2011 -0400 spi/davinci: Use correct length parameter to dma_map_single calls The davinci spi driver provides an option to use DMA transfers for data. In the dma_map_single() call, the driver is passing the number of words to be transfered for the mapping size. It should be the number of bytes. Signed-off-by: Michael Williamson Signed-off-by: Grant Likely commit 36b87b419c7616a8aaa9889566d9a9b50689dee1 Author: Mitko Haralanov Date: Fri Mar 4 18:53:17 2011 +0000 IB/qib: Fix M_Key field in SubnGet and SubnGetResp MADs Set the M_Key field in SubnGet and SugnGetResp MADs based on correctly interpreting the protection level specified in the M_KeyProtBits field. Signed-off-by: Mitko Haralanov Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 4634b7945cf0d6a66036ad10c3d658ae4eb39fa0 Author: Mitko Haralanov Date: Mon Feb 28 13:39:49 2011 +0000 IB/qib: Set default LE2 value for active cables to 0 For active and far-EQ cables use an LE2 value of 0 for improved SI. Signed-off-by: Mitko Haralanov Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit db5d040d7b2d15539d2c84932f93621d9bd482f7 Author: Steve Wise Date: Fri Mar 11 22:29:50 2011 +0000 RDMA/cxgb4: Debugfs dump_qp() updates - Show whether the SQ is in onchip memory or not. - Dump both SQ and RQ QIDs. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 767fbe8151d1a7cc8a69e52e354e4220a5e804fb Author: Steve Wise Date: Fri Mar 11 22:30:53 2011 +0000 RDMA/cxgb4: Dispatch FATAL event on EEH errors This at least kicks the user mode applications that are watching for device events. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit b48f3b9c10d731160f0af5c3028ad57d9c66673b Author: Steve Wise Date: Fri Mar 11 22:30:21 2011 +0000 RDMA/cxgb4: Use ULP_MODE_TCPDDP Set the ULP mode for initial RDMA connection setup to the proper DDP mode. This avoids wasting some HW resources while in streaming mode. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit a9c7719800ac513b2df14e267d062ec84dc9313e Author: Steve Wise Date: Fri Mar 11 22:30:11 2011 +0000 RDMA/cxgb4: Enable on-chip SQ support by default Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit ffc3f7487ff0b32500b319c770475383f6f6efab Author: Steve Wise Date: Fri Mar 11 22:30:42 2011 +0000 RDMA/cxgb4: Do CIDX_INC updates every 1/16 CQ depth CQE reaps This avoids the CIDX_INC overflow issue with T4A2 when running kernel RDMA applications. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 294281373999e7fff393c04eb16092a8f00ad5aa Author: Steve Wise Date: Fri Mar 11 22:30:32 2011 +0000 RDMA/cxgb4: Remove db_drop_task Unloading iw_cxgb4 can crash due to the unload code trying to use db_drop_task, which is uninitialized. So remove this dead code. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit b52fe09e3309c3d7069cd0e5a3bdb5b4ba45e01f Author: Steve Wise Date: Fri Mar 11 22:30:01 2011 +0000 RDMA/cxgb4: Turn on delayed ACK Set the default to on. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 9dabb7224ffcbdcb493f82859a0f19dd9a55e693 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:12 2011 -0700 ath6kl: remove-typedef HIF_DEVICE remove-typedef -s HIF_DEVICE \ "struct hif_device" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit a71f0bf684bc1d1ae74ede5639d376d45a64ba7e Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:11 2011 -0700 ath6kl: remove-typedef AR_SOFTC_T remove-typedef -s AR_SOFTC_T \ "struct ar6_softc" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit b2bad0874006d504a887468f0ce40f4de326e8e8 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:10 2011 -0700 ath6kl: remove-typedef WINDOW_SNAPSHOT remove-typedef -s WINDOW_SNAPSHOT \ "struct window_snapshot" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 1982f05de1d572a048c4acf584fc4b5294f487e3 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:09 2011 -0700 ath6kl: remove-typedef ST_READ_STATUS remove-typedef -s ST_READ_STATUS \ "struct st_read_status" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 5f801f7f44805269ff750568a146c38b3367d7f0 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:08 2011 -0700 ath6kl: remove-typedef ST_PS_DATA_FORMAT remove-typedef -s ST_PS_DATA_FORMAT \ "struct st_ps_data_format" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 9da9daf274002d240f5b72dd4d2e18e1f629ac26 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:07 2011 -0700 ath6kl: remove-typedef RXTID_STATS remove-typedef -s RXTID_STATS \ "struct rxtid_stats" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit ebb3aa52edeb6a05ccb690738259943023afcce9 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:06 2011 -0700 ath6kl: remove-typedef RXTID remove-typedef -s RXTID \ "struct rxtid" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit a541306e81c531d85e052315dc47dac91adb50c9 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:05 2011 -0700 ath6kl: remove-typedef PSCmdPacket remove-typedef -s PSCmdPacket \ "struct ps_cmd_packet" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 628608591f4d3dfb4ce14793c23e188cc708cb3f Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:04 2011 -0700 ath6kl: remove-typedef OSBUF_HOLD_Q remove-typedef -s OSBUF_HOLD_Q \ "struct osbuf_hold_q" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit fc5f36239385784ecd122392ac15f8a59df3bb82 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:03 2011 -0700 ath6kl: remove-typedef HTC_TX_PACKET_INFO remove-typedef -s HTC_TX_PACKET_INFO \ "struct htc_tx_packet_info" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit c1ebe36136bc06117b74d2a3be76e234f4e4b6c8 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:02 2011 -0700 ath6kl: remove-typedef HTC_TARGET This required two passes: remove-typedef -s _HTC_TARGET \ "struct htc_target" drivers/staging/ath6kl/ remove-typedef -s HTC_TARGET \ "struct htc_target" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit cb3ea094c9cb3b1a904ccc025fe19150d5a34d6b Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:01 2011 -0700 ath6kl: remove-typedef HTC_SERVICE_CONNECT_RESP remove-typedef -s HTC_SERVICE_CONNECT_RESP \ "struct htc_service_connect_resp" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 3d82b15e9f42ac6d9b350ebfb04c56ae8cc06966 Author: Luis R. Rodriguez Date: Mon Mar 14 10:59:00 2011 -0700 ath6kl: remove-typedef HTC_SERVICE_CONNECT_REQ remove-typedef -s HTC_SERVICE_CONNECT_REQ \ "struct htc_service_connect_req" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit cfc854728ff2a7549b7572eb11dd4665f2809461 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:59 2011 -0700 ath6kl: remove-typedef HTC_RX_PACKET_INFO remove-typedef -s HTC_RX_PACKET_INFO \ "struct htc_rx_packet_info" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 6ca0f664e18f967dad2ff47c4de447b1d37fbdfc Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:58 2011 -0700 ath6kl: remove-typedef HTC_PACKET_QUEUE remove-typedef -s HTC_PACKET_QUEUE \ "struct htc_packet_queue" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit c6528e2f0dca96ee2c4bf7f1600d9537fad88197 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:57 2011 -0700 ath6kl: remove-typedef HTC_PACKET This required two passes: remove-typedef -s HTC_PACKET \ "struct htc_packet" drivers/staging/ath6kl/ remove-typedef -s _HTC_PACKET \ "struct htc_packet" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 4f0cce96a1c40e3874ac7d3794ad0d36c79fb995 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:56 2011 -0700 ath6kl: remove-typedef HTC_INIT_INFO remove-typedef -s HTC_INIT_INFO \ "struct htc_init_info" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit af26f25c84a8340eae1362727ee0584870b2948d Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:55 2011 -0700 ath6kl: remove-typedef HTC_FRAME_HDR remove-typedef -s HTC_FRAME_HDR \ "struct htc_frame_hdr" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 80ab2899c223599450ec5d0c188c0783b6806057 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:54 2011 -0700 ath6kl: remove-typedef HTC_EP_CALLBACKS remove-typedef -s HTC_EP_CALLBACKS \ "struct htc_ep_callbacks" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 84efc7ff1c55a5f27cbd9b55cdcf31facb7bf9b2 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:53 2011 -0700 ath6kl: remove-typedef HTC_ENDPOINT_STATS remove-typedef -s HTC_ENDPOINT_STATS \ "struct htc_endpoint_stats" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 57c9d5b3304ab84fcc26851dd02b453e1cf3b191 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:52 2011 -0700 ath6kl: remove-typedef HTC_ENDPOINT_CREDIT_DIST This required two passes: remove-typedef -s HTC_ENDPOINT_CREDIT_DIST \ "struct htc_endpoint_credit_dist" drivers/staging/ath6kl/ remove-typedef -s _HTC_ENDPOINT_CREDIT_DIST \ "struct htc_endpoint_credit_dist" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit df5a718f0f868659224015e6f71930e507262b22 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:51 2011 -0700 ath6kl: remove-typedef HTC_ENDPOINT remove-typedef -s HTC_ENDPOINT \ "struct htc_endpoint" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 3e5074e94f69038904101c203d62a7dbbb53e399 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:50 2011 -0700 ath6kl: remove-typedef HTC_CONTROL_BUFFER remove-typedef -s HTC_CONTROL_BUFFER \ "struct htc_control_buffer" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 0aaabb8e9ca2478d7ce44f715c60fef4826d1f39 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:49 2011 -0700 ath6kl: remove-typedef HIF_SCATTER_REQ This requird two passes: remove-typedef -s HIF_SCATTER_REQ \ "struct hif_scatter_req" drivers/staging/ath6kl/ remove-typedef -s _HIF_SCATTER_REQ \ "struct hif_scatter_req" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 7038aac1165d4dcbf02fcfb9ee91ac6dc46645a2 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:48 2011 -0700 ath6kl: remove-typedef HIF_SCATTER_REQ_PRIV remove-typedef -s HIF_SCATTER_REQ_PRIV \ "struct hif_scatter_req_priv" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit f88902c01ba58bad05e485aaff608cdbe65c3d7f Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:47 2011 -0700 ath6kl: remove-typedef HIF_SCATTER_ITEM remove-typedef -s HIF_SCATTER_ITEM \ "struct hif_scatter_item" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 03210b8fbc85127a3a5097e7ce71370c8f0eb31a Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:46 2011 -0700 ath6kl: remove-typedef HIF_PENDING_EVENTS_INFO remove-typedef -s HIF_PENDING_EVENTS_INFO \ "struct hif_pending_events_info" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit d45f742841a27af7ad2ea16e9ddda7473fb2b795 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:45 2011 -0700 ath6kl: remove-typedef HIF_MBOX_PROPERTIES remove-typedef -s HIF_MBOX_PROPERTIES \ "struct hif_mbox_properties" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 031a71c77427904367583762b91470bbf161b78c Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:44 2011 -0700 ath6kl: remove-typedef HIF_DEVICE_SCATTER_SUPPORT_INFO remove-typedef -s HIF_DEVICE_SCATTER_SUPPORT_INFO \ "struct hif_device_scatter_support_info" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit e6b5260ee8d2e682ef90caac902124ca884f7386 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:43 2011 -0700 ath6kl: remove-typedef HIF_DEVICE_OS_DEVICE_INFO remove-typedef -s HIF_DEVICE_OS_DEVICE_INFO \ "struct hif_device_os_device_info" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 02e12e08f4e94973c3bae9f3f6445680a120bebc Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:42 2011 -0700 ath6kl: remove-typedef HIF_DEVICE_MBOX_INFO remove-typedef -s HIF_DEVICE_MBOX_INFO \ "struct hif_device_mbox_info" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 4386ee312e413a33b9e5f406388c9488e6237c7c Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:41 2011 -0700 ath6kl: remove-typedef HIF_DEVICE_IRQ_YIELD_PARAMS remove-typedef -s HIF_DEVICE_IRQ_YIELD_PARAMS \ "struct hif_device_irq_yield_params" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit f1ab30823feddb533ad5840e873c79698b77abf0 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:40 2011 -0700 ath6kl: remove-typedef HCI_TRANSPORT_PROPERTIES remove-typedef -s HCI_TRANSPORT_PROPERTIES \ "struct hci_transport_properties" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit e83750e79169e860aa1eb9077084e67b7ce5d86b Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:39 2011 -0700 ath6kl: remove-typedef HCI_TRANSPORT_MISC_HANDLES remove-typedef -s HCI_TRANSPORT_MISC_HANDLES \ "struct hci_transport_misc_handles" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit c9478eaf5e78c6379fab320eac98f9a878efd579 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:38 2011 -0700 ath6kl: remove-typedef HCI_TRANSPORT_CONFIG_INFO remove-typedef -s HCI_TRANSPORT_CONFIG_INFO \ "struct hci_transport_config_info" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit ed8b361d88c23e2ee01ceb3ab00ab57e3b0d8233 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:37 2011 -0700 ath6kl: remove-typedef HCI_TRANSPORT_CALLBACKS remove-typedef -s HCI_TRANSPORT_CALLBACKS \ "struct hci_transport_callbacks" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 55b0f0daa6f3f7225042ba67cfe5773c77efe425 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:36 2011 -0700 ath6kl: remove-typedef GMBOX_PROTO_HCI_UART remove-typedef -s GMBOX_PROTO_HCI_UART \ "struct gmbox_proto_hci_uart" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 01eb1da1aad93a36ab1254fc2d337ed0f6783156 Author: Luis R. Rodriguez Date: Mon Mar 14 10:58:35 2011 -0700 ath6kl: remove-tyepdef DL_LIST and PDL_LIST pointer This required two passes: remove-typedef -s DL_LIST "struct dl_list" \ drivers/staging/ath6kl/ remove-typedef -s PDL_LIST "struct dl_list *" \ drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit a6f9c48fdd566e09d437e104c5b5963133db1be4 Author: Ilia Mirkin Date: Sun Mar 13 00:29:17 2011 -0500 staging: wlan-ng: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 4d527a7adbc47bdc357ddab513861e6a7636755e Author: Ilia Mirkin Date: Sun Mar 13 00:29:16 2011 -0500 staging: winbond: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 1d5c536efeb9c109e330209867ae1242d42cdb7b Author: Ilia Mirkin Date: Sun Mar 13 00:29:15 2011 -0500 staging: vt6656: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 6403bb7dc1f6d77a93850935d9277a0d74783cf0 Author: Ilia Mirkin Date: Sun Mar 13 00:29:14 2011 -0500 staging: vt6655: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 794a8946ba2339af09dd1f39c8462c3611bebf77 Author: Ilia Mirkin Date: Sun Mar 13 00:29:13 2011 -0500 staging: vme: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 06dde506203147e8d245a505d491c40254561f17 Author: Ilia Mirkin Date: Sun Mar 13 00:29:12 2011 -0500 staging: usbip: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 9f7ff701ad7b7bdcab949aa0527fe7efb3882afa Author: Ilia Mirkin Date: Sun Mar 13 00:29:11 2011 -0500 staging: tidspbridge: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 39dd3e5d7b09b5a5010ed1aef512f2d58b65cb99 Author: Ilia Mirkin Date: Sun Mar 13 00:29:10 2011 -0500 staging: speakup: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit ef055f10000c5013d269cac9fc92c200bf314e40 Author: Ilia Mirkin Date: Sun Mar 13 00:29:09 2011 -0500 staging: serqt_usb2: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit b7977fa250c1732d1fc1b5832f257655fd7471a4 Author: Ilia Mirkin Date: Sun Mar 13 00:29:08 2011 -0500 staging: rtl8712: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit e72714fb20b2bac88e6bc06401a124243791ca08 Author: Ilia Mirkin Date: Sun Mar 13 00:29:07 2011 -0500 staging: rtl8192u: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 7e901dcd73d73230ad0e66e35fb6f1da244e41f7 Author: Ilia Mirkin Date: Sun Mar 13 00:29:06 2011 -0500 staging: rtl8192e: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 76be349c0045073bbed4f669f87e36b1d8fda256 Author: Ilia Mirkin Date: Sun Mar 13 00:29:05 2011 -0500 staging: rtl8187se: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit aea9d72f97218d45e993836bcb6c6e6fd49e0b90 Author: Ilia Mirkin Date: Sun Mar 13 00:29:04 2011 -0500 staging: rt2860: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 14910178fcdcca53230afd4155a6c48e230b2919 Author: Ilia Mirkin Date: Sun Mar 13 00:29:03 2011 -0500 staging: pohmelfs: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 43c04d42c3c5a23e2aff330d4d361c733118df80 Author: Ilia Mirkin Date: Sun Mar 13 00:29:02 2011 -0500 staging: line6: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 306be9e1c167dcd7d6635bd434ee8e63ab22a5d6 Author: Ilia Mirkin Date: Sun Mar 13 00:29:01 2011 -0500 staging: keucr: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 56d17639703b4683e3e9be36dff7c6d811f4cbf5 Author: Ilia Mirkin Date: Sun Mar 13 00:28:59 2011 -0500 staging: go7007: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit b00917802bda6eba09125e8b4d273339188f9bad Author: Ilia Mirkin Date: Sun Mar 13 00:28:58 2011 -0500 staging: cx25821: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit e4e1f289be88a75dc8b63d50ade1f9a2e6168021 Author: Ilia Mirkin Date: Sun Mar 13 00:28:57 2011 -0500 staging: comedi: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 46d994b1f5b481c7f0a77edece270cf253db84c9 Author: Ilia Mirkin Date: Sun Mar 13 00:28:56 2011 -0500 staging: brcm80211: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 23c32986870b4abb5b426d3399a4cbd43948e37c Author: Ilia Mirkin Date: Sun Mar 13 00:28:55 2011 -0500 staging: bcm: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Signed-off-by: Greg Kroah-Hartman commit 4dd53810912089380223c8fbddd83dcb642b6166 Author: Ilia Mirkin Date: Sun Mar 13 00:28:54 2011 -0500 staging: ath6kl: Remove NULL check before kfree This patch was generated by the following semantic patch: // @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // Signed-off-by: Ilia Mirkin Acked-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 459d2ea0b5547e55e22c5edff6760ab07c2b3fd1 Author: Aaro Koskinen Date: Sun Mar 13 12:26:28 2011 +0200 staging: xgifb: clean up register function variable names Eliminate mixed case from variable names. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit d0e23bdf3a73b1aff1fe51a71d5e05d89465e2aa Author: Aaro Koskinen Date: Sun Mar 13 12:26:27 2011 +0200 staging: xgifb: clean up register access types Make type usage consistent. Use u8 for HW registers and unsigned for bitmasks. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit dc50556bbbee6a2ec642aac4c4c46364cca191b3 Author: Aaro Koskinen Date: Sun Mar 13 12:26:26 2011 +0200 staging: xgifb: rename XGINew_SetRegAND() to xgifb_reg_and() Rename XGINew_SetRegAND() to xgifb_reg_and(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit ec9e5d3e73d675915ac572631ef0d5dcc03d2b6c Author: Aaro Koskinen Date: Sun Mar 13 12:26:25 2011 +0200 staging: xgifb: rename XGINew_SetRegANDOR() to xgifb_reg_and_or() Rename XGINew_SetRegANDOR() to xgifb_reg_and_or(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit b9bf6e4e62bd40a5867e4958d21a145536582875 Author: Aaro Koskinen Date: Sun Mar 13 12:26:24 2011 +0200 staging: xgifb: rename XGINew_SetRegOR() to xgifb_reg_or() Rename XGINew_SetRegOR() to xgifb_reg_or(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 58839b0194a44dfb9ab16fc097ef1f1f91f06b32 Author: Aaro Koskinen Date: Sun Mar 13 12:26:23 2011 +0200 staging: xgifb: rename XGINew_GetReg1() to xgifb_reg_get() Rename XGINew_GetReg1() to xgifb_reg_get(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 8104e32996be6099379176b5a7e2d99eecc2df64 Author: Aaro Koskinen Date: Sun Mar 13 12:26:22 2011 +0200 staging: xgifb: rename XGINew_SetReg1() to xgifb_reg_set() Rename XGINew_SetReg1() to xgifb_reg_set(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 3d2a60a29ed4c36a09955dddc27e503de5a5041a Author: Aaro Koskinen Date: Sun Mar 13 12:26:21 2011 +0200 staging: xgifb: replace XGINew_SetReg4() with outl() Replace XGINew_SetReg4() with outl(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit efdf4ee78cd5eb1172955a63fff1e6f6748a41d9 Author: Aaro Koskinen Date: Sun Mar 13 12:26:20 2011 +0200 staging: xgifb: replace XGINew_SetReg3() with outb() Replace XGINew_SetReg3() with outb(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit f5b571fa24f523265b6bf9a282e0aa7eeff8098a Author: Aaro Koskinen Date: Sun Mar 13 12:26:19 2011 +0200 staging: xgifb: replace XGINew_GetReg3() with inl() Replace XGINew_GetReg3() with inl(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit d8ad0a6d29ed6203b4ddc3114a9adf5bd48ba45b Author: Aaro Koskinen Date: Sun Mar 13 12:26:18 2011 +0200 staging: xgifb: replace XGINew_GetReg2() with inb() Replace XGINew_GetReg2() with inb(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit b649c827a90969f586a6595af9b9040b1f6b75b4 Author: Aaro Koskinen Date: Sun Mar 13 12:26:17 2011 +0200 staging: xgifb: vb_util: delete commented-out code Delete commented-out code. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 0998e1db988658bb5ca660b4d929e1d2e7e8473e Author: Aaro Koskinen Date: Sun Mar 13 12:26:16 2011 +0200 staging: xgifb: vb_util: include the .h file Include the .h file and delete redundant definitions. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit c45715bb95527f69f9c741b05d1771b2a1e5eac9 Author: Aaro Koskinen Date: Sun Mar 13 12:26:15 2011 +0200 staging: xgifb: replace DelayUS() with udelay() Replace DelayUS() with udelay(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit c83c620afabb582fa0d540aea1817724a5118c4f Author: Aaro Koskinen Date: Sun Mar 13 12:26:14 2011 +0200 staging: xgifb: use mdelay() for millisecond delays Use mdelay() instead of udelay() for millisecond delays. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 8277cf87bd676e3af869bb2c2c5249a215e2822c Author: Aaro Koskinen Date: Sun Mar 13 12:26:13 2011 +0200 staging: xgifb: delete incorrect I/O mapping If the PCI device was disabled when the probe() routine started, the driver will create 256 MB video memory mapping which is never used or properly released. It's also unsafe as the size is incorrect for many video cards. Deleting it also allows eliminating XGIvga_enable global variable. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 8a1ed67b51911086c7c284dd1d43c2e699afd884 Author: Aaro Koskinen Date: Sun Mar 13 12:26:12 2011 +0200 staging: xgifb: delete redundant extended register access enable The extended register access enable in !XGIvga_enabled case is not needed. The driver has enabled the access unconditionally already earlier in the routine. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 38583420d34a470f6dd7b66bfb84908ab29af399 Author: Aaro Koskinen Date: Sun Mar 13 12:26:11 2011 +0200 staging: xgifb: delete unused LINUXBIOS code Delete unused LINUXBIOS code. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 0658733528268ed055d1fd43fc5296b0ac98a7c2 Author: Aaro Koskinen Date: Sun Mar 13 12:26:10 2011 +0200 staging: xgifb: eliminate redudant chip type >= XG40 checks Since all chips supported by the driver are >= XG40, these checks are redundant and the code can be modified accordingly. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit fd0ad4701a3d096e6caf609e15eecae1459cc4b4 Author: Aaro Koskinen Date: Sun Mar 13 12:26:09 2011 +0200 staging: xgifb: delete dead code for chip types < XG40 XG40 is the first supported chip, so the code for earlier chips can be dropped. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit ebe7846def655647608993c9c295158766f2e301 Author: Aaro Koskinen Date: Sun Mar 13 12:26:08 2011 +0200 staging: xgifb: delete unsupported chip types The probe routine will fail if the chip is other than XG40..XG27, so the other types can be dropped. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit cc1e2398f757e2bf9fa3afd8166ae03e41f29502 Author: Aaro Koskinen Date: Sun Mar 13 12:26:07 2011 +0200 staging: xgifb: vb_setmode: move functions to avoid forward declarations Move functions to avoid forward declarations. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit b9ebf5e5913307e67d226e61d953c3c4fd48de99 Author: Aaro Koskinen Date: Sun Mar 13 12:26:06 2011 +0200 staging: xgifb: vb_init: move functions to avoid forward declarations Move functions to avoid forward declarations. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 3f8214c33f3b9997f3351feef77eb32d213ef94d Author: Aaro Koskinen Date: Sun Mar 13 12:26:05 2011 +0200 staging: xgifb: vb_ext: move functions to avoid forward declarations Move functions to avoid forward declarations. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 6d2b67219523afbb7d83e8664cb9b0f4f267bd9a Author: Marek Belisko Date: Thu Mar 10 11:51:35 2011 +0100 staging: ft1000: Fix coding style in ft1000_proc_drvmsg function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit fc796a6502de4c146bf3893390cca43df2d0e539 Author: Marek Belisko Date: Thu Mar 10 11:51:34 2011 +0100 staging: ft1000: Fix coding style in ft1000_dsp_prov function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 8b2dab1cf8dec78aecaf1b4cf65fb316562699ca Author: Marek Belisko Date: Thu Mar 10 11:51:33 2011 +0100 staging: ft1000: Fix coding style in ft1000_receive_cmd function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 53cd3aa6194cf0f2970dd85e51b64e915e6ba99c Author: Marek Belisko Date: Thu Mar 10 11:51:32 2011 +0100 staging: ft1000: Fix coding style in ft1000_chkcard function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit a007e842af9cb06279f9a535c1de0c59cfa65742 Author: Marek Belisko Date: Thu Mar 10 11:51:31 2011 +0100 staging: ft1000: Fix coding style in ft1000_close function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit a01ffcd69f4987f64e02151575743d756eb4e4d2 Author: Marek Belisko Date: Thu Mar 10 11:51:30 2011 +0100 staging: ft1000: Fix coding style in ft1000_open function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit bee1b21cfac6c415563e4643826b9d8b9b31b6f8 Author: Marek Belisko Date: Thu Mar 10 11:51:29 2011 +0100 staging: ft1000: Fix coding style in ft1000_copy_up_pkt function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 6b2a66f2500b69a1627c50b953ce301c19b24d56 Author: Marek Belisko Date: Thu Mar 10 11:51:28 2011 +0100 staging: ft1000: Fix coding style in ft1000_submit_rx_urb function. Fix coding style and also replace printk with proper pr_err function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit e31e33855ad9025f25b834305716307801a3d88c Author: Marek Belisko Date: Thu Mar 10 11:51:27 2011 +0100 staging: ft1000: Fix coding style in ft1000_start_xmit function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit d8dfaf4c94de533cffe9637cd14f9a0e39ad23ad Author: Marek Belisko Date: Thu Mar 10 11:51:26 2011 +0100 staging: ft1000: Fix coding style in ft1000_copy_down_pkt function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 251c72f84ae300465c7b5ca5688b51f392ee646f Author: Marek Belisko Date: Thu Mar 10 11:51:25 2011 +0100 staging: ft1000: Fix coding style in ft1000_usb_transmit_complete function. Fix coding style and also replace printk with proper pr_err function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 2dd9017b47bb932d0f6c9a9e529b55b106ad0bd2 Author: Marek Belisko Date: Thu Mar 10 11:51:24 2011 +0100 staging: ft1000: Fix coding style in ft1000_reset function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 05a7c39c36cdfb68ddbfc417bd461755ec32e258 Author: Marek Belisko Date: Thu Mar 10 11:51:23 2011 +0100 staging: ft1000: Fix coding style in reg_ft1000_netdev function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit f135da03597e8ff5a47ab3eff5aeaab2171d95ba Author: Marek Belisko Date: Thu Mar 10 11:51:22 2011 +0100 staging: ft1000: Change return value for init_ft1000_netdev function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 6c284c7b06a18b6b77653a755b57e9e0d0451602 Author: Marek Belisko Date: Thu Mar 10 11:51:21 2011 +0100 staging: ft1000: Fix coding style in init_ft1000_netdev function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit cb3aa5d5b50670c4ee438fb855706538c0fd4bf6 Author: Marek Belisko Date: Thu Mar 10 11:51:20 2011 +0100 staging: ft1000: Fix identation in ftnet_ops struct. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 3071c12ea799db6d46ccb8ce42980e39c6e3447e Author: Marek Belisko Date: Thu Mar 10 11:51:19 2011 +0100 staging: ft1000: Fix coding style in ft1000_reset_card function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 84a60963e259263446c81776067957cac52afbfb Author: Marek Belisko Date: Thu Mar 10 11:51:18 2011 +0100 staging: ft1000: Fix coding style in ft1000_reset_asic function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 3529bd416491d5ebb1acf10e679447b08ae8051c Author: Marek Belisko Date: Thu Mar 10 11:51:17 2011 +0100 staging: ft1000: Fix coding style in dsp_reload function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 68e79bccceba1efc3b4abac1594cb1798dd5e780 Author: Marek Belisko Date: Thu Mar 10 11:51:16 2011 +0100 staging: ft1000: Fix coding style in card_send_command function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit a209efadf0b93238fe052fe1e92f48ccf6da57a1 Author: Marek Belisko Date: Thu Mar 10 11:51:15 2011 +0100 staging: ft1000: Replace camelcase CardSendCommand function name. Replace CardSendCommand by card_send_command. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 2b61535a6e210358255c872b3187e48869e16e27 Author: Michael Hennerich Date: Thu Mar 10 13:26:48 2011 +0100 staging: IIO: DAC: AD5446: Add support for AD5601/AD5611/AD5621 This patch adds support for the AD5601/AD5611/AD5621 single channel, 8-/10-/12-bit, buffered voltage output DACs. Changes since v1: Sort Kconfig description my number Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit bbed4dc791036e97cbe844935dece153fdace0dc Author: Michael Hennerich Date: Thu Mar 10 13:26:47 2011 +0100 staging: IIO: DAC: AD5446: Add power down support Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit bd51c0b078eb3edeee9e48eb236d5831d7ae34cf Author: Michael Hennerich Date: Thu Mar 10 13:26:46 2011 +0100 staging: IIO: DAC: AD5446: Add missing ID table entries Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit e278913c3c70dea6302d99f5f0ee4961e09970b6 Author: Dan Carpenter Date: Mon Mar 14 12:35:31 2011 +0300 Staging: crystalhd: don't waste the last char of buffer pinfo->name is a 32 char buffer. In the original code, the last char wasn't fully utilized. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit a3b6ff03527247c81eab37d95b7fb36e7eda1939 Author: Dan Carpenter Date: Mon Mar 14 12:33:37 2011 +0300 Staging: crystalhd: change GFP_ATOMIC to GFP_KERNEL These two allocations are only called from the probe() path and there aren't any locks held for probe(). Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 7d2c16befae67b901e6750b845661c1fdffd19f1 Author: Felix Fietkau Date: Sat Mar 12 01:11:28 2011 +0100 ath9k: fix aggregation related interoperability issues Some clients seems to keep track of their reorder window even after an aggregation session has been disabled. This causes issues if there are still retried but not completed frames pending for the TID. To ensure that rx does not stall in such situations, set sendbar to 1 for any frame purged from the TID queue on teardown. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 9db372fdd5de9e0464c77a9d3db2a3b356db8668 Author: Felix Fietkau Date: Fri Mar 11 21:45:51 2011 +0100 mac80211: fix channel type recalculation with HT and non-HT interfaces When running an AP interface along with the cooked monitor interface created by hostapd, adding an interface and deleting it again triggers a channel type recalculation during which the (non-HT) monitor interface takes precedence over the HT AP interface, thus causing the channel type to be set to non-HT. Fix this by ensuring that a more wide channel type will not be overwritten by a less wide channel type. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit efff395e97fffd55c60c77c09a18deba8d84e2c0 Author: Felix Fietkau Date: Fri Mar 11 21:38:20 2011 +0100 ath9k: improve reliability of beacon transmission and stuck beacon handling ath9k calls ath9k_hw_stoptxdma every time it sends a beacon, however there is not much point in doing that if the previous beacon and mcast traffic went out properly. On AR9380, calling that function too often can result in an increase of stuck beacons due to differences in the handling of the queue enable/disable functionality. With this patch, the queue will only be explicitly stopped if the previous data frames were not sent successfully. With the beacon code being the only remaining user of ath9k_hw_stoptxdma, this function can be simplified in order to remove the now pointless attempts at waiting for transmission completion, which would never happen at this point due to the different method of tx scheduling of the beacon queue. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 86271e460a66003dc1f4cbfd845adafb790b7587 Author: Felix Fietkau Date: Fri Mar 11 21:38:19 2011 +0100 ath9k: fix the .flush driver op implementation This patch simplifies the flush op and reuses ath_drain_all_txq for flushing out pending frames if necessary. It also uses a global timeout of 200ms instead of the per-queue 60ms timeout. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0d51cccc2436fa4d978efc3764552779e163d840 Author: Felix Fietkau Date: Fri Mar 11 21:38:18 2011 +0100 ath9k: fix stopping tx dma on reset In some situations, stopping Tx DMA frequently fails, leading to messages like this: ath: Failed to stop TX DMA in 100 msec after killing last frame ath: Failed to stop TX DMA! This patch uses a few MAC features to abort DMA globally instead of iterating over all hardware queues and attempting to stop them individually. Not only is that faster and works with a shorter timeout, it also makes the process much more reliable. With this change, I can no longer trigger these messages on AR9380, and on AR9280 they become much more rare. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 997941d7efe4d165a558ed5b6029a8b3c2c85cf7 Author: Felix Fietkau Date: Fri Mar 11 21:38:17 2011 +0100 ath9k_hw: fix REG_SET_BIT and REG_CLR_BIT for multiple bits Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit cf28d7934c57168d530b606c26ab955a56eb13f9 Author: Helmut Schaa Date: Wed Mar 9 10:02:38 2011 +0100 mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devices Devices without multi rate retry support won't be able to use all rates as specified by mintrel_ht. Hence, we can simply skip setting up further rates as the devices will only use the first one. Also add a special case for devices with only two possible tx rates. We use sample_rate -> max_prob_rate for sampling and max_tp_rate -> max_prob_rate by default. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 89a4d0cbdee5289025c38b6b9706ad5dc5df264b Author: Roland Vossen Date: Thu Mar 10 14:40:20 2011 +0100 staging: brcm80211: lower number of wlc_bsscfg.h includes Code cleanup. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit b1562946267b14012e4d6e76c71db1f1af726913 Author: Roland Vossen Date: Thu Mar 10 14:40:19 2011 +0100 staging: brcm80211: replaced wlc_bsscfg_t by struct wlc_bsscfg Code cleanup. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit d4b977bd4875e852c98f0423eab43d35f1e84874 Author: Roland Vossen Date: Thu Mar 10 14:40:17 2011 +0100 staging: brcm80211: removed comment in rx status processing Code cleanup. The comment is hinting that we should sanity check the header to verify that if it claims its from a 5Ghz channel, that the chip actually supports 5 Ghz. This is redundant (2.4G only chips do not report 5G channels) and thus the comment was removed. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 9ee63c6a9f122688ea05b977ffa894dd60bf99eb Author: Roland Vossen Date: Thu Mar 10 11:35:09 2011 +0100 staging: brcm80211: invalidate all AMPDU packets on IEEE80211_AMPDU_TX_STOP The previous patch flushed the AMPDU packets associated to a certain STA/AP in the driver queues, but left the AMPDU packets in the DMA queue untouched. This patch invalidates AMPDU packets in the DMA queue, so they can be processed accordingly when hardware releases the packets to the driver. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 61f4420597b750e932ad0e8567715f1a3439bb03 Author: Roland Vossen Date: Thu Mar 10 11:35:08 2011 +0100 staging: brcm80211: added IEEE80211_AMPDU_TX_STOP handling Driver now flushes AMPDU packets for a specified station on Mac80211 calling wl_ops_ampdu_action(IEEE80211_AMPDU_TX_STOP). Not all AMPDU packets are flushed yet: there can still be AMPDU packets pending in hardware (DMA). That is the subject of the next patch in this series. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 8ada0be34014565dc4e57d1194d18594a5bcd161 Author: Roland Vossen Date: Thu Mar 10 11:35:07 2011 +0100 staging: brcm80211: bugfix for control.sta NULL ptr dereference Mac80211 can transmit packets where the control.sta field is NULL. The driver dereferenced this. Bugfix was to only dereference a non NULL ieee80211_sta pointer. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 0bf97bb1cff7204111c479c899dae30823314761 Author: Roland Vossen Date: Thu Mar 10 11:35:06 2011 +0100 staging: brcm80211: bugfix for NULL scb ptr dereference The driver uses a struct called 'scb', this struct is primarily used for AMPDU functionality and is embedded in struct ieee80211_sta. To increase driver robustness, the case in which this scb pointer is NULL is now handled graceful. This paves the way for the next patch in this series. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 05f689400ea5fa3d71af82f910c8b140f87ad1f3 Merge: 17fe12c 02b7b94 Author: Tony Lindgren Date: Mon Mar 14 11:22:22 2011 -0700 Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus commit fe8f661f2c2bb058822f13f6f232e121bde1338f Author: Stephen Hemminger Date: Mon Mar 14 19:20:44 2011 +0100 netfilter: nf_conntrack: fix sysctl memory leak Message in log because sysctl table was not empty at netns exit WARNING: at net/sysctl_net.c:84 sysctl_net_exit+0x2a/0x2c() Instrumenting showed that the nf_conntrack_timestamp was the entry that was being created but not cleared. Signed-off-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit 02b7b94ee98a0a463195d148e5c5885a218ee16f Author: Ohad Ben-Cohen Date: Mon Mar 14 14:24:25 2011 +0000 omap: zoom: host should not pull up wl1271's irq line The wl1271's irq line is completely controlled by the 1271 device, and the host does not not need to pull it up. While there's no functional effect, letting the host pull this line up is just redundant, and wastes power. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Tony Lindgren commit da4a0f764a6017659bf32505bbd773f561eaf605 Author: Aaro Koskinen Date: Mon Mar 14 12:28:32 2011 +0000 arm: plat-omap: iommu: fix request_mem_region() error path request_mem_region() error exit will leak ioremapped memory. Fix this by moving the ioremap() after request_mem_region(), which is the proper order to do this anyway. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit b235e007831dbf57710e59cd4a120e2f374eecb9 Author: Andy Green Date: Sat Mar 12 22:50:54 2011 +0000 OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430 This adapts the register offsets used to read the CPU DIE ID registers when run on 44XX so they match what is in the OMAP4430 Reference Manual page 269 Signed-off-by: Andy Green Signed-off-by: Tony Lindgren commit 42046e2e45c109ba703993c510401a11f716c8df Author: Patrick McHardy Date: Mon Mar 14 19:11:44 2011 +0100 netfilter: x_tables: return -ENOENT for non-existant matches/targets As Stephen correctly points out, we need to return -ENOENT in xt_find_match()/xt_find_target() after the patch "netfilter: x_tables: misuse of try_then_request_module" in order to properly indicate a non-existant module to the caller. Signed-off-by: Patrick McHardy commit 17fe12c5a7bd674c1e6dca9cf1e250f9cd7b96b1 Author: Tony Lindgren Date: Fri Mar 11 11:55:34 2011 -0800 omap4: mux: Remove duplicate mux modes Remove duplicate mux modes to make the binary smaller: text data bss dec hex filename 9378 24472 0 33850 843a mux44xx.o 9378 19104 0 28482 6f42 mux44xx.o Cc: Benoit Cousson Signed-off-by: Tony Lindgren commit cfd748ae066e776d45bdce550b47cd00c67d55de Author: Frederic Weisbecker Date: Mon Mar 14 16:40:30 2011 +0100 perf stat: Provide support for filters Now the --filter option is usable with perf stat too. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <1300117230-8404-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Frederic Weisbecker Signed-off-by: Arnaldo Carvalho de Melo commit 1fa073803ec543e8b95fc5acf164fa2e0074bb4f Author: Paul Gortmaker Date: Mon Mar 14 12:03:44 2011 -0400 tipc: delete extra semicolon blocking node deletion Remove bogus semicolon only recently introduced in 34e46258cb9f5 that blocks cleanup of nodes for N>1 on shutdown. Signed-off-by: Paul Gortmaker commit d038aee24dcd5a2a0d8547f5396f67ae9698ac8e Author: David Cohen Date: Wed Mar 9 09:17:33 2011 +0000 omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag Currently IOVMM driver sets IOVMF_DA_FIXED/IOVMF_DA_ANON flags according to input 'da' address when mapping memory: da == 0: IOVMF_DA_ANON da != 0: IOVMF_DA_FIXED It prevents IOMMU to map first page with fixed 'da'. To avoid such issue, IOVMM will not automatically set IOVMF_DA_FIXED. It should now come from the user throught 'flags' parameter when mapping memory. As IOVMF_DA_ANON and IOVMF_DA_FIXED are mutually exclusive, IOVMF_DA_ANON can be removed. The driver will now check internally if IOVMF_DA_FIXED is set or not. Signed-off-by: David Cohen Signed-off-by: Tony Lindgren commit 4359d38d518c0dd72c03a3bc9918607ba8f2648a Author: Michael Jones Date: Wed Mar 9 09:17:32 2011 +0000 omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set commit c7f4ab26e3bcdaeb3e19ec658e3ad9092f1a6ceb allowed mapping the NULL address if da_start==0, which would then not get unmapped. Disallow this again if IOVMF_DA_ANON is set. And spell variable 'alignment' correctly. Signed-off-by: Michael Jones Signed-off-by: Tony Lindgren commit 9d90c8d9cde929cbc575098e825d7c29d9f45054 Author: Kay Sievers Date: Sun Mar 13 03:19:51 2011 +0100 printk: do not mangle valid userspace syslog prefixes printk: do not mangle valid userspace syslog prefixes with /dev/kmsg Log messages passed to the kernel log by using /dev/kmsg or /dev/ttyprintk might contain a syslog prefix including the syslog facility value. This makes printk to recognize these headers properly, extract the real log level from it to use, and add the prefix as a proper prefix to the log buffer, instead of wrongly printing it as the log message text. Before: $ echo '<14>text' > /dev/kmsg $ dmesg -r <4>[135159.594810] <14>text After: $ echo '<14>text' > /dev/kmsg $ dmesg -r <14>[ 50.750654] text Cc: Lennart Poettering Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 54fad532b29aa9145f12a83f4f82820c2f23b4e2 Author: Mike Waychison Date: Fri Mar 11 17:43:32 2011 -0800 efivars: Add Documentation This patch documents the interface exposed by the 'efivars' module. Signed-off-by: Mike Waychison Cc: Matt Domsch , Signed-off-by: Greg Kroah-Hartman commit 4fc756bd9dbf6b84fbf751e3bf495277849c5db7 Author: Mike Waychison Date: Fri Mar 11 17:43:27 2011 -0800 efivars: Expose efivars functionality to external drivers. Signed-off-by: Mike Waychison Cc: Matt Domsch , Signed-off-by: Greg Kroah-Hartman commit 3295814d83c55e629abc6c2a31af1d504febb229 Author: Mike Waychison Date: Fri Mar 11 17:43:21 2011 -0800 efivars: Parameterize operations. Instead of letting efivars access struct efi directly when dealing with variables, use an operations structure. This allows a later change to reuse the efivars logic without having to pretend to support everything in struct efi. Signed-off-by: Mike Waychison Cc: Matt Domsch , Signed-off-by: Greg Kroah-Hartman commit 76b53f7c8bfa41f94ec32d84493a691f096e89f5 Author: Mike Waychison Date: Fri Mar 11 17:43:16 2011 -0800 efivars: Split out variable registration In anticipation of re-using the variable facilities in efivars from elsewhere, split out the registration and unregistration of struct efivars from the rest of the EFI specific sysfs code. Signed-off-by: Mike Waychison Cc: Matt Domsch , Signed-off-by: Greg Kroah-Hartman commit 4142ef146aee440731de956d9f9f3170d5a238ae Author: Mike Waychison Date: Fri Mar 11 17:43:11 2011 -0800 efivars: parameterize efivars Now that we all global variable state is encapsulated by struct efivars, parameterize all functions to the efivars local to the control flow rather than at file scope. We do this by removing the variable "efivars" at file scope and move its storage down to the end of the file. Variables get at efivars by storing the efivars pointer within each efivar_entry. The "new_var" and "del_var" binary attribute files get at the efivars through the private pointer. Signed-off-by: Mike Waychison Cc: Matt Domsch , Signed-off-by: Greg Kroah-Hartman commit d502fbb0dc4d4babe5fb330257fa49a83fbf86a6 Author: Mike Waychison Date: Fri Mar 11 17:43:06 2011 -0800 efivars: Make efivars bin_attributes dynamic In preparation for encapsulating efivars, we need to have the bin_attributes be dynamically allocated so that we can use their ->private fields to get back to the struct efivars structure. Signed-off-by: Mike Waychison Cc: Matt Domsch , Signed-off-by: Greg Kroah-Hartman commit 29422693c410c68071bdd60e0a0ec590490781aa Author: Mike Waychison Date: Fri Mar 11 17:43:00 2011 -0800 efivars: move efivars globals into struct efivars In preparation for abstracting out efivars to be usable by other similar variable services, move the global lock, list and kset into a structure. Later patches will change the scope of 'efivars' and have it be passed by function argument. Signed-off-by: Mike Waychison Cc: Matt Domsch , Signed-off-by: Greg Kroah-Hartman commit 95d2ac4a0c904942a4fecf815781ebd4171e7a30 Author: Daniel Kiper Date: Tue Mar 8 22:48:24 2011 +0100 xen/balloon: Protect against CPU exhaust by event/x process Protect against CPU exhaust by event/x process during errors by adding some delays in scheduling next event and retry count limit. Signed-off-by: Daniel Kiper Signed-off-by: Konrad Rzeszutek Wilk commit 95170b2e23d4e98843b4833d27fae7bf0910e19c Author: Daniel Kiper Date: Tue Mar 8 22:47:39 2011 +0100 xen/balloon: Migration from mod_timer() to schedule_delayed_work() Migration from mod_timer() to schedule_delayed_work(). Signed-off-by: Daniel Kiper Signed-off-by: Konrad Rzeszutek Wilk commit 06f521d5d67a23d91add6f1beb73edc6f2b70d0c Author: Daniel Kiper Date: Tue Mar 8 22:45:46 2011 +0100 xen/balloon: Removal of driver_pages Removal of driver_pages (I do not have seen any references to it). Signed-off-by: Daniel Kiper Signed-off-by: Konrad Rzeszutek Wilk commit 706cc9d2a4cb9b03217e15b0bb3d117f4d5109ee Author: Stefano Stabellini Date: Wed Feb 2 18:32:59 2011 +0000 xen/m2p: Check whether the MFN has IDENTITY_FRAME bit set.. If there is no proper PFN value in the M2P for the MFN (so we get 0xFFFFF.. or 0x55555, or 0x0), we should consult the M2P override to see if there is an entry for this. [Note: we also consult the M2P override if the MFN is past our machine_to_phys size]. We consult the P2M with the PFN. In case the returned MFN is one of the special values: 0xFFF.., 0x5555 (which signify that the MFN can be either "missing" or it belongs to DOMID_IO) or the p2m(m2p(mfn)) != mfn, we check the M2P override. If we fail the M2P override check, we reset the PFN value to INVALID_P2M_ENTRY. Next we try to find the MFN in the P2M using the MFN value (not the PFN value) and if found, we know that this MFN is an identity value and return it as so. Otherwise we have exhausted all the posibilities and we return the PFN, which at this stage can either be a real PFN value found in the machine_to_phys.. array, or INVALID_P2M_ENTRY value. [v1: Added Review-by tag] Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 146c4e511717e581065800938537b276173d8548 Author: Konrad Rzeszutek Wilk Date: Fri Jan 14 17:55:44 2011 -0500 xen/m2p: No need to catch exceptions when we know that there is no RAM .. beyound what we think is the end of memory. However there might be more System RAM - but assigned to a guest. Hence jump to the M2P override check and consult. [v1: Added Review-by tag] Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit fc25151d9ac7d809239fe68de0a1490b504bb94a Author: Konrad Rzeszutek Wilk Date: Thu Dec 23 16:25:29 2010 -0500 xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set. Only enabled if XEN_DEBUG is enabled. We print a warning when: pfn_to_mfn(pfn) == pfn, but no VM_IO (_PAGE_IOMAP) flag set (and pfn is an identity mapped pfn) pfn_to_mfn(pfn) != pfn, and VM_IO flag is set. (ditto, pfn is an identity mapped pfn) [v2: Make it dependent on CONFIG_XEN_DEBUG instead of ..DEBUG_FS] [v3: Fix compiler warning] Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 2222e71bd6eff7b2ad026d4ee663b6327c5a49f5 Author: Konrad Rzeszutek Wilk Date: Wed Dec 22 08:57:30 2010 -0500 xen/debugfs: Add 'p2m' file for printing out the P2M layout. We walk over the whole P2M tree and construct a simplified view of which PFN regions belong to what level and what type they are. Only enabled if CONFIG_XEN_DEBUG_FS is set. [v2: UNKN->UNKNOWN, use uninitialized_var] [v3: Rebased on top of mmu->p2m code split] [v4: Fixed the else if] Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 68df0da7f42be6ae017fe9f48ac414c43a7b9d32 Author: Konrad Rzeszutek Wilk Date: Tue Feb 1 17:15:30 2011 -0500 xen/setup: Set identity mapping for non-RAM E820 and E820 gaps. We walk the E820 region and start at 0 (for PV guests we start at ISA_END_ADDRESS) and skip any E820 RAM regions. For all other regions and as well the gaps we set them to be identity mappings. The reasons we do not want to set the identity mapping from 0-> ISA_END_ADDRESS when running as PV is b/c that the kernel would try to read DMI information and fail (no permissions to read that). There is a lot of gnarly code to deal with that weird region so we won't try to do a cleanup in this patch. This code ends up calling 'set_phys_to_identity' with the start and end PFN of the the E820 that are non-RAM or have gaps. On 99% of machines that means one big region right underneath the 4GB mark. Usually starts at 0xc0000 (or 0x80000) and goes to 0x100000. [v2: Fix for E820 crossing 1MB region and clamp the start] [v3: Squshed in code that does this over ranges] [v4: Moved the comment to the correct spot] [v5: Use the "raw" E820 from the hypervisor] [v6: Added Review-by tag] Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit c7617798771ad588d585986d896197c04b737621 Author: Konrad Rzeszutek Wilk Date: Tue Jan 18 20:17:10 2011 -0500 xen/mmu: WARN_ON when racing to swap middle leaf. The initial bootup code uses set_phys_to_machine quite a lot, and after bootup it would be used by the balloon driver. The balloon driver does have mutex lock so this should not be necessary - but just in case, add a WARN_ON if we do hit this scenario. If we do fail this, it is OK to continue as there is a backup mechanism (VM_IO) that can bypass the P2M and still set the _PAGE_IOMAP flags. [v2: Change from WARN to BUG_ON] [v3: Rebased on top of xen->p2m code split] [v4: Change from BUG_ON to WARN] Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit fb38923ead10aa8a28db191548e176e8856614d7 Author: Konrad Rzeszutek Wilk Date: Wed Jan 5 15:46:31 2011 -0500 xen/mmu: Set _PAGE_IOMAP if PFN is an identity PFN. If we find that the PFN is within the P2M as an identity PFN make sure to tack on the _PAGE_IOMAP flag. Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit f4cec35b0d4b90d96e3770a3d1e68ea882e7a7c8 Author: Konrad Rzeszutek Wilk Date: Tue Jan 18 20:15:21 2011 -0500 xen/mmu: Add the notion of identity (1-1) mapping. Our P2M tree structure is a three-level. On the leaf nodes we set the Machine Frame Number (MFN) of the PFN. What this means is that when one does: pfn_to_mfn(pfn), which is used when creating PTE entries, you get the real MFN of the hardware. When Xen sets up a guest it initially populates a array which has descending (or ascending) MFN values, as so: idx: 0, 1, 2 [0x290F, 0x290E, 0x290D, ..] so pfn_to_mfn(2)==0x290D. If you start, restart many guests that list starts looking quite random. We graft this structure on our P2M tree structure and stick in those MFN in the leafs. But for all other leaf entries, or for the top root, or middle one, for which there is a void entry, we assume it is "missing". So pfn_to_mfn(0xc0000)=INVALID_P2M_ENTRY. We add the possibility of setting 1-1 mappings on certain regions, so that: pfn_to_mfn(0xc0000)=0xc0000 The benefit of this is, that we can assume for non-RAM regions (think PCI BARs, or ACPI spaces), we can create mappings easily b/c we get the PFN value to match the MFN. For this to work efficiently we introduce one new page p2m_identity and allocate (via reserved_brk) any other pages we need to cover the sides (1GB or 4MB boundary violations). All entries in p2m_identity are set to INVALID_P2M_ENTRY type (Xen toolstack only recognizes that and MFNs, no other fancy value). On lookup we spot that the entry points to p2m_identity and return the identity value instead of dereferencing and returning INVALID_P2M_ENTRY. If the entry points to an allocated page, we just proceed as before and return the PFN. If the PFN has IDENTITY_FRAME_BIT set we unmask that in appropriate functions (pfn_to_mfn). The reason for having the IDENTITY_FRAME_BIT instead of just returning the PFN is that we could find ourselves where pfn_to_mfn(pfn)==pfn for a non-identity pfn. To protect ourselves against we elect to set (and get) the IDENTITY_FRAME_BIT on all identity mapped PFNs. This simplistic diagram is used to explain the more subtle piece of code. There is also a digram of the P2M at the end that can help. Imagine your E820 looking as so: 1GB 2GB /-------------------+---------\/----\ /----------\ /---+-----\ | System RAM | Sys RAM ||ACPI| | reserved | | Sys RAM | \-------------------+---------/\----/ \----------/ \---+-----/ ^- 1029MB ^- 2001MB [1029MB = 263424 (0x40500), 2001MB = 512256 (0x7D100), 2048MB = 524288 (0x80000)] And dom0_mem=max:3GB,1GB is passed in to the guest, meaning memory past 1GB is actually not present (would have to kick the balloon driver to put it in). When we are told to set the PFNs for identity mapping (see patch: "xen/setup: Set identity mapping for non-RAM E820 and E820 gaps.") we pass in the start of the PFN and the end PFN (263424 and 512256 respectively). The first step is to reserve_brk a top leaf page if the p2m[1] is missing. The top leaf page covers 512^2 of page estate (1GB) and in case the start or end PFN is not aligned on 512^2*PAGE_SIZE (1GB) we loop on aligned 1GB PFNs from start pfn to end pfn. We reserve_brk top leaf pages if they are missing (means they point to p2m_mid_missing). With the E820 example above, 263424 is not 1GB aligned so we allocate a reserve_brk page which will cover the PFNs estate from 0x40000 to 0x80000. Each entry in the allocate page is "missing" (points to p2m_missing). Next stage is to determine if we need to do a more granular boundary check on the 4MB (or 2MB depending on architecture) off the start and end pfn's. We check if the start pfn and end pfn violate that boundary check, and if so reserve_brk a middle (p2m[x][y]) leaf page. This way we have a much finer granularity of setting which PFNs are missing and which ones are identity. In our example 263424 and 512256 both fail the check so we reserve_brk two pages. Populate them with INVALID_P2M_ENTRY (so they both have "missing" values) and assign them to p2m[1][2] and p2m[1][488] respectively. At this point we would at minimum reserve_brk one page, but could be up to three. Each call to set_phys_range_identity has at maximum a three page cost. If we were to query the P2M at this stage, all those entries from start PFN through end PFN (so 1029MB -> 2001MB) would return INVALID_P2M_ENTRY ("missing"). The next step is to walk from the start pfn to the end pfn setting the IDENTITY_FRAME_BIT on each PFN. This is done in 'set_phys_range_identity'. If we find that the middle leaf is pointing to p2m_missing we can swap it over to p2m_identity - this way covering 4MB (or 2MB) PFN space. At this point we do not need to worry about boundary aligment (so no need to reserve_brk a middle page, figure out which PFNs are "missing" and which ones are identity), as that has been done earlier. If we find that the middle leaf is not occupied by p2m_identity or p2m_missing, we dereference that page (which covers 512 PFNs) and set the appropriate PFN with IDENTITY_FRAME_BIT. In our example 263424 and 512256 end up there, and we set from p2m[1][2][256->511] and p2m[1][488][0->256] with IDENTITY_FRAME_BIT set. All other regions that are void (or not filled) either point to p2m_missing (considered missing) or have the default value of INVALID_P2M_ENTRY (also considered missing). In our case, p2m[1][2][0->255] and p2m[1][488][257->511] contain the INVALID_P2M_ENTRY value and are considered "missing." This is what the p2m ends up looking (for the E820 above) with this fabulous drawing: p2m /--------------\ /-----\ | &mfn_list[0],| /-----------------\ | 0 |------>| &mfn_list[1],| /---------------\ | ~0, ~0, .. | |-----| | ..., ~0, ~0 | | ~0, ~0, [x]---+----->| IDENTITY [@256] | | 1 |---\ \--------------/ | [p2m_identity]+\ | IDENTITY [@257] | |-----| \ | [p2m_identity]+\\ | .... | | 2 |--\ \-------------------->| ... | \\ \----------------/ |-----| \ \---------------/ \\ | 3 |\ \ \\ p2m_identity |-----| \ \-------------------->/---------------\ /-----------------\ | .. +->+ | [p2m_identity]+-->| ~0, ~0, ~0, ... | \-----/ / | [p2m_identity]+-->| ..., ~0 | / /---------------\ | .... | \-----------------/ / | IDENTITY[@0] | /-+-[x], ~0, ~0.. | / | IDENTITY[@256]|<----/ \---------------/ / | ~0, ~0, .... | | \---------------/ | p2m_missing p2m_missing /------------------\ /------------\ | [p2m_mid_missing]+---->| ~0, ~0, ~0 | | [p2m_mid_missing]+---->| ..., ~0 | \------------------/ \------------/ where ~0 is INVALID_P2M_ENTRY. IDENTITY is (PFN | IDENTITY_BIT) Reviewed-by: Ian Campbell [v5: Changed code to use ranges, added ASCII art] [v6: Rebased on top of xen->p2m code split] [v4: Squished patches in just this one] [v7: Added RESERVE_BRK for potentially allocated pages] [v8: Fixed alignment problem] [v9: Changed 1<<3X to 1< commit cc90fd725e14020607c5a6ba3ea02a0ddec5655f Author: Takashi Iwai Date: Mon Mar 14 15:53:15 2011 +0100 ALSA: hda - Remove an unused variable in patch_realtek.c Signed-off-by: Takashi Iwai commit a7b807ce8c86925eef92fe6aa79cea4ac7f097c4 Author: Ian Campbell Date: Mon Mar 14 09:50:39 2011 +0000 xen: events: correct locking in xen_irq_from_pirq One of those spin_lock() calls should be an unlock... Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 699d899560cd7e72da39231e584412e7ac8114a4 Author: Vitaliy Kulikov Date: Thu Mar 10 13:43:35 2011 -0600 ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs This patch replaces use of the harcoded arrays of pins, muxes, digital mics and adcs with the auto-generated ones using codec parsing and auto-discovers all actually connected digital mic pins on 92HD8X-like codecs This patch also adds the support for d-mic on pin 0x20. Signed-off-by: Vitaliy Kulikov Signed-off-by: Takashi Iwai commit 094a42452abd5564429045e210281c6d22e67fca Author: Vitaliy Kulikov Date: Wed Mar 9 19:47:43 2011 -0600 ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs When the mux for digital mic is different from the mux for other mics, the current auto-parser doesn't handle them in a right way but provides only one mic. This patch fixes the issue. Signed-off-by: Vitaliy Kulikov Cc: Signed-off-by: Takashi Iwai commit ae0ebbf70afe2889b39f575e800e7292abd259d6 Author: Takashi Iwai Date: Thu Mar 10 14:11:59 2011 +0100 ALSA: hda - Move default input-src selection to init part Move the default input-src selection code for alc268/269 to the init part instead of the parser. The input-src selection might be overwritten by init verbs. Signed-off-by: Takashi Iwai commit 584c0c4c359bdac37d94157f8d7fc513d26c8328 Author: Takashi Iwai Date: Thu Mar 10 12:51:11 2011 +0100 ALSA: hda - Initialize special cases for input src in init phase Currently some special handling for the unusual case like dual-ADCs or a single-input-src is done in the tree-parse time in set_capture_mixer(). But this setup could be overwritten by static init verbs. This patch moves the initialization into the init phase so that such input-src setup won't be lost. Cc: Signed-off-by: Takashi Iwai commit 6c474f7bc1ef70bc05ce486e7e7e524124122de8 Author: Maxim Date: Mon Mar 14 13:19:21 2011 +0000 GFS2: Adding missing unlock_page() gfs2_write_begin() calls grab_cache_page_write_begin() that returns *locked* page. Correspondent error-handling path lacks for unlock_page() call: > out: > if (error == 0) > return 0; > > page_cache_release(page); The whole system hangs if gfs2_unstuff_dinode() called from gfs2_write_begin() failed for some reason. Reported-by: Maxim Signed-off-by: Maxim Signed-off-by: Steven Whitehouse commit 5fe0c2378884e68beb532f5890cc0e3539ac747b Author: Aneesh Kumar K.V Date: Sat Jan 29 18:43:25 2011 +0530 exportfs: Return the minimum required handle size The exportfs encode handle function should return the minimum required handle size. This helps user to find out the handle size by passing 0 handle size in the first step and then redoing to the call again with the returned handle size value. Acked-by: Serge Hallyn Signed-off-by: Aneesh Kumar K.V Signed-off-by: Al Viro commit c8b91accfa1059d5565443193d89572eca2f5dd6 Author: Al Viro Date: Sat Mar 12 10:41:39 2011 -0500 clean statfs-like syscalls up New helpers: user_statfs() and fd_statfs(), taking userland pathname and descriptor resp. and filling struct kstatfs. Syscalls of statfs family (native, compat and foreign - osf and hpux on alpha and parisc resp.) switched to those. Removes some boilerplate code, simplifies cleanup on errors... Signed-off-by: Al Viro commit 73d049a40fc6269189c4e2ba6792cb5dd054883c Author: Al Viro Date: Fri Mar 11 12:08:24 2011 -0500 open-style analog of vfs_path_lookup() new function: file_open_root(dentry, mnt, name, flags) opens the file vfs_path_lookup would arrive to. Note that name can be empty; in that case the usual requirement that dentry should be a directory is lifted. open-coded equivalents switched to it, may_open() got down exactly one caller and became static. Signed-off-by: Al Viro commit 5b6ca027d85b7438c84b78a54ccdc2e53f2909cd Author: Al Viro Date: Wed Mar 9 23:04:47 2011 -0500 reduce vfs_path_lookup() to do_path_lookup() New lookup flag: LOOKUP_ROOT. nd->root is set (and held) by caller, path_init() starts walking from that place and all pathname resolution machinery never drops nd->root if that flag is set. That turns vfs_path_lookup() into a special case of do_path_lookup() *and* gets us down to 3 callers of link_path_walk(), making it finally feasible to rip the handling of trailing symlink out of link_path_walk(). That will not only simply the living hell out of it, but make life much simpler for unionfs merge. Trailing symlink handling will become iterative, which is a good thing for stack footprint in a lot of situations as well. Signed-off-by: Al Viro commit 5a18fff2090c3af830d699c8ccb230498a1e37e5 Author: Al Viro Date: Fri Mar 11 04:44:53 2011 -0500 untangle do_lookup() That thing has devolved into rats nest of gotos; sane use of unlikely() gets rid of that horror and gives much more readable structure: * make a fast attempt to find a dentry; false negatives are OK. In RCU mode if everything went fine, we are done, otherwise just drop out of RCU. If we'd done (RCU) ->d_revalidate() and it had not refused outright (i.e. didn't give us -ECHILD), remember its result. * now we are not in RCU mode and hopefully have a dentry. If we do not, lock parent, do full d_lookup() and if that has not found anything, allocate and call ->lookup(). If we'd done that ->lookup(), remember that dentry is good and we don't need to revalidate it. * now we have a dentry. If it has ->d_revalidate() and we can't skip it, call it. * hopefully dentry is good; if not, either fail (in case of error) or try to invalidate it. If d_invalidate() has succeeded, drop it and retry everything as if original attempt had not found a dentry. * now we can finish it up - deal with mountpoint crossing and automount. Signed-off-by: Al Viro commit 40b39136f07279fdc868a36cba050f4e84ce0ace Author: Al Viro Date: Wed Mar 9 16:22:18 2011 -0500 path_openat: clean ELOOP handling a bit Signed-off-by: Al Viro commit f374ed5fa8afed8590deaae5dc147422e0e1a6d9 Author: Al Viro Date: Wed Mar 9 01:34:45 2011 -0500 do_last: kill a rudiment of old ->d_revalidate() workaround There used to be time when ->d_revalidate() couldn't return an error. So intents code had lookup_instantiate_filp() stash ERR_PTR(error) in nd->intent.open.filp and had it checked after lookup_hash(), to catch the otherwise silent failures. That had been introduced by commit 4af4c52f34606bdaab6930a845550c6fb02078a4. These days ->d_revalidate() can and does propagate errors back to callers explicitly, so this check isn't needed anymore. Signed-off-by: Al Viro commit 6c0d46c493217cf48999b3f8808910ae534aa085 Author: Al Viro Date: Wed Mar 9 00:59:59 2011 -0500 fold __open_namei_create() and open_will_truncate() into do_last() ... and clean up a bit more Signed-off-by: Al Viro commit ca344a894b41a133dab07dfbbdf652c053f6658c Author: Al Viro Date: Wed Mar 9 00:36:45 2011 -0500 do_last: unify may_open() call and everyting after it We have a bunch of diverging codepaths in do_last(); some of them converge, but the case of having to create a new file duplicates large part of common tail of the rest and exits separately. Massage them so that they could be merged. Signed-off-by: Al Viro commit 9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b Author: Al Viro Date: Wed Mar 9 00:17:27 2011 -0500 move may_open() from __open_name_create() to do_last() Signed-off-by: Al Viro commit 0f9d1a10c341020617e5b1c7f9c16f6a070438ec Author: Al Viro Date: Wed Mar 9 00:13:14 2011 -0500 expand finish_open() in its only caller Signed-off-by: Al Viro commit 5a202bcd75bbd2397136397961babbd8463416af Author: Al Viro Date: Tue Mar 8 14:17:44 2011 -0500 sanitize pathname component hash calculation Lift it to lookup_one_len() and link_path_walk() resp. into the same place where we calculated default hash function of the same name. Signed-off-by: Al Viro commit 6a96ba54418be740303765c0f52be028573cb99a Author: Al Viro Date: Mon Mar 7 23:49:20 2011 -0500 kill __lookup_one_len() only one caller left Signed-off-by: Al Viro commit fe2d35ff0d18a2c93993b0d7d46f846ff4331b72 Author: Al Viro Date: Sat Mar 5 22:58:25 2011 -0500 switch non-create side of open() to use of do_last() Instead of path_lookupat() doing trailing symlink resolution, use the same scheme as on the O_CREAT side. Walk with LOOKUP_PARENT, then (in do_last()) look the final component up, then either open it or return error or, if it's a symlink, give the symlink back to path_openat() to be resolved there. The really messy complication here is RCU. We don't want to drop out of RCU mode before the final lookup, since we don't want to bounce parent directory ->d_count without a good reason. Result is _not_ pretty; later in the series we'll clean it up. For now we are roughly back where we'd been before the revert done by Nick's series - top-level logics of path_openat() is cleaned up, do_last() does actual opening, symlink resolution is done uniformly. Signed-off-by: Al Viro commit 70e9b3571107b88674cd55ae4bed33f76261e7d3 Author: Al Viro Date: Sat Mar 5 21:12:22 2011 -0500 get rid of nd->file Don't stash the struct file * used as starting point of walk in nameidata; pass file ** to path_init() instead. Signed-off-by: Al Viro commit 951361f954596bd134d4270df834f47d151f98a6 Author: Al Viro Date: Fri Mar 4 14:44:37 2011 -0500 get rid of the last LOOKUP_RCU dependencies in link_path_walk() New helper: terminate_walk(). An error has happened during pathname resolution and we either drop nd->path or terminate RCU, depending the mode we had been in. After that, nd is essentially empty. Switch link_path_walk() to using that for cleanup. Now the top-level logics in link_path_walk() is back to sanity. RCU dependencies are in the lower-level functions. Signed-off-by: Al Viro commit a7472baba22dd5d68580f528374f93421b33667e Author: Al Viro Date: Fri Mar 4 14:39:30 2011 -0500 make nameidata_dentry_drop_rcu_maybe() always leave RCU mode Now we have do_follow_link() guaranteed to leave without dangling RCU and the next step will get LOOKUP_RCU logics completely out of link_path_walk(). Signed-off-by: Al Viro commit ef7562d5283a91da3ba5c14de3221f47b7f08823 Author: Al Viro Date: Fri Mar 4 14:35:59 2011 -0500 make handle_dots() leave RCU mode on error Signed-off-by: Al Viro commit 4455ca6223cc59cbc0a75f4be8bce9e84cc0d6b8 Author: Al Viro Date: Fri Mar 4 14:28:10 2011 -0500 clear RCU on all failure exits from link_path_walk() Signed-off-by: Al Viro commit 9856fa1b281eccdc9f8d94d716e96818c675e78e Author: Al Viro Date: Fri Mar 4 14:22:06 2011 -0500 pull handling of . and .. into inlined helper getting LOOKUP_RCU checks out of link_path_walk()... Signed-off-by: Al Viro commit 7bc055d1d524f209bf49d8b9cb220712dd7df4ed Author: Al Viro Date: Wed Feb 23 19:41:31 2011 -0500 kill out_dput: in link_path_walk() Signed-off-by: Al Viro commit 13aab428a73d3200b9283b61b7fdf5713181ac66 Author: Al Viro Date: Wed Feb 23 17:54:08 2011 -0500 separate -ESTALE/-ECHILD retries in do_filp_open() from real work new helper: path_openat(). Does what do_filp_open() does, except that it tries only the walk mode (RCU/normal/force revalidation) it had been told to. Both create and non-create branches are using path_lookupat() now. Fixed the double audit_inode() in non-create branch. Signed-off-by: Al Viro commit 47c805dc2d2dff686962f5f0baa6bac2d703ba19 Author: Al Viro Date: Wed Feb 23 17:44:09 2011 -0500 switch do_filp_open() to struct open_flags take calculation of open_flags by open(2) arguments into new helper in fs/open.c, move filp_open() over there, have it and do_sys_open() use that helper, switch exec.c callers of do_filp_open() to explicit (and constant) struct open_flags. Signed-off-by: Al Viro commit c3e380b0b3cfa613189fb91513efd88a65e1d9d8 Author: Al Viro Date: Wed Feb 23 13:39:45 2011 -0500 Collect "operation mode" arguments of do_last() into a structure No point messing with passing shitloads of "operation mode" arguments to do_open() one by one, especially since they are not going to change during do_filp_open(). Collect them into a struct, fill it and pass to do_last() by reference. Make sure that lookup intent flags are correctly set and removed - we want them for do_last(), but they make no sense for __do_follow_link(). Signed-off-by: Al Viro commit f1afe9efc84476ca42fbb7301a441021063eead7 Author: Al Viro Date: Tue Feb 22 22:27:28 2011 -0500 clean up the failure exits after __do_follow_link() in do_filp_open() Signed-off-by: Al Viro commit 36f3b4f69070fee7c647bab5dc4408990bb3606c Author: Al Viro Date: Tue Feb 22 21:24:38 2011 -0500 pull security_inode_follow_link() into __do_follow_link() Signed-off-by: Al Viro commit 086e183a641109033420e0b26ddecb6f4abb4c89 Author: Al Viro Date: Tue Feb 22 20:56:27 2011 -0500 pull dropping RCU on success of link_path_walk() into path_lookupat() Signed-off-by: Al Viro commit 16c2cd7179881d5dd87779512ca5a0d657c64f62 Author: Al Viro Date: Tue Feb 22 15:50:10 2011 -0500 untangle the "need_reval_dot" mess instead of ad-hackery around need_reval_dot(), do the following: set a flag (LOOKUP_JUMPED) in the beginning of path, on absolute symlink traversal, on ".." and on procfs-style symlinks. Clear on normal components, leave unchanged on ".". Non-nested callers of link_path_walk() call handle_reval_path(), which checks that flag is set and that fs does want the final revalidate thing, then does ->d_revalidate(). In link_path_walk() all the return_reval stuff is gone. Signed-off-by: Al Viro commit fe479a580dc9c737c4eb49ff7fdb31d41d2c7003 Author: Al Viro Date: Tue Feb 22 15:10:03 2011 -0500 merge component type recognition no need to do it in three places... Signed-off-by: Al Viro commit e41f7d4ee5bdb00da7d327a00b0ab9c4a2e9eaa3 Author: Al Viro Date: Tue Feb 22 14:02:58 2011 -0500 merge path_init and path_init_rcu Actual dependency on whether we want RCU or not is in 3 small areas (as it ought to be) and everything around those is the same in both versions. Since each function has only one caller and those callers are on two sides of if (flags & LOOKUP_RCU), it's easier and cleaner to merge them and pull the checks inside. Signed-off-by: Al Viro commit ee0827cd6b42b0385dc1a116cd853ac1b739f711 Author: Al Viro Date: Mon Feb 21 23:38:09 2011 -0500 sanitize path_walk() mess New helper: path_lookupat(). Basically, what do_path_lookup() boils to modulo -ECHILD/-ESTALE handler. path_walk* family is gone; vfs_path_lookup() is using link_path_walk() directly, do_path_lookup() and do_filp_open() are using path_lookupat(). Signed-off-by: Al Viro commit 52094c8a0610cf57920ad4c6c57470ae2ccbbd25 Author: Al Viro Date: Mon Feb 21 21:34:47 2011 -0500 take RCU-dependent stuff around exec_permission() into a new helper Signed-off-by: Al Viro commit c9c6cac0c2bdbda42e7b804838648d0bc60ddb13 Author: Al Viro Date: Wed Feb 16 15:15:47 2011 -0500 kill path_lookup() all remaining callers pass LOOKUP_PARENT to it, so flags argument can die; renamed to kern_path_parent() Signed-off-by: Al Viro commit 15a9155fe3e8215c02b80df51ec2cac7c0d726ad Author: Al Viro Date: Wed Feb 16 15:08:54 2011 -0500 fix race in audit_get_nd() don't rely on pathname resolution ending up twice at the same point... Signed-off-by: Al Viro commit b9df468d8630c583e3597e24ad8cc4c0318790c1 Author: Rabin Vincent Date: Thu Feb 10 11:45:58 2011 +0530 plat-nomadik: make GPIO interrupts work with cpuidle ApSleep Enable wakeups by default for any GPIO interrupts and in the suspend/resume path narrow this down to only the the real wakeup interrupts. This approach is based on the assumption that cpuidle ApSleep will be entered more often than system suspend. Signed-off-by: Rabin Vincent Reviewed-by: Srinidhi Kasagar [Fixup for genirq changes to struct irq_data on 2.6.38] Signed-off-by: Linus Walleij commit 96cb164bdec6f91eadf09a858c4820701f791b37 Author: Linus Walleij Date: Mon Sep 27 17:40:22 2010 +0200 mach-u300: define a dummy filter function for coh901318 All platform data has to be made conditional on as to avoid cluttering the code with other #ifdef:s. Signed-off-by: Linus Walleij commit 4b4f757c807375564ce3d4ff1d088d3847c52f6d Author: Linus Walleij Date: Tue Feb 15 15:01:35 2011 +0100 mach-ux500: basic HREFv60 support v2 The HREFv60 variant of the MOP500 family of boards remove the external GPIO expander and route these pins back to some of the readily available internal GPIO pins instead. Based on a patch by Bibek Basu for an internal kernel version. Cc: Bibek Basu Signed-off-by: Linus Walleij commit 4bc3a698c3db6592490cd685e395e27216ed2454 Author: Bibek Basu Date: Tue Feb 15 10:46:59 2011 +0100 mach-ux500: add hrefv60 GPIO pins This will centralize all GPIO pin muxing for the different boards in the MOP500 family to a single file. It also kills off the deprecated support for the ED (Early Drop) ASIC, this should never be spotted in the open and ST-Ericsson have internally deprecated this hardware. Signed-off-by: Bibek Basu [Rebasing and kill old ASIC support] Signed-off-by: Linus Walleij commit fe05203b0c4ba0454ba34a858002b12ae4a72faa Author: Rabin Vincent Date: Fri Feb 11 17:07:21 2011 -0700 mach-ux500: move MOP500 pins to separate file Split off pin definitions for the MOP500 board family to its own file. Signed-off-by: Rabin Vincent Signed-off-by: Mathieu Poirier Signed-off-by: Linus Walleij commit 3c4bee04d147f149a167633cf0033f9d25a8d720 Author: Linus Walleij Date: Wed Feb 16 10:37:52 2011 +0100 plat-nomadik: fix compilation warning The compiler warns that [rf]wimsc may be used uninitialized in this function - the warning is actually false since the uses are in identical if()-clauses, but it can't hurt very much to read out the values to be modified early anyway and rid the warning. Cc: Rabin Vincent Signed-off-by: Linus Walleij commit 5317e4d11d1ce4db949f207aaebe09b7d0d76b5f Author: Rabin Vincent Date: Thu Feb 10 09:29:53 2011 +0530 plat-nomadik: get rid of unused GPIO PM code The NOMADIK_GPIO_PM config option is disabled by default, not user visible, and never selected by any other option: the code is therefore unused. The GPIO registers need not be saved and restored since their values are preserved when vAPE (on DB8500) is powered down. Signed-off-by: Rabin Vincent Reviewed-by: Jonas Aberg Signed-off-by: Linus Walleij commit 8b40eeeadc5837c2c01329aa1294e4bef3b35429 Author: Rikard Olsson Date: Mon Jan 3 14:30:41 2011 +0100 plat-nomadik: change sleep/wakeup setting in GPIO SLPM register This patch fixes a bug when setting SLPM register for DB8500. When calling__nmk_gpio_set_slpm(...) offset to GPIO is now used instead of the GPIO number itself. Signed-off-by: Rikard Olsson Signed-off-by: Linus Walleij commit 01727e61f0967dd18fadd9dfcee5cf1246e6d8a6 Author: Rabin Vincent Date: Mon Dec 13 12:02:40 2010 +0530 plat-nomadik: implement safe switch sequence for Alt-C Setting pinmux alternative C for a GPIO pin is actually not so easy since it ivolves setting value "1" in two registers, and since the combined result will take effect for intermediate values (01 or 10) this will cause glitches while you wrote one register but have not yet written the other. This patch implements a series of kludges including an optional machine-specific callback to avoid glitches when changing pin mux mode to alternative C. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 3546d15c5c3f923f7925f92bfe0f8e1cf8bccc1c Author: Rabin Vincent Date: Thu Nov 25 11:38:27 2010 +0530 plat-nomadik: set altfunc to GPIO when enabling the sleep config Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 2c8bb0eba96f6027ea1e6cf52376e07d18f54ddc Author: Virupax Sadashivpetimath Date: Thu Nov 11 14:10:38 2010 +0530 plat-nomadik: type secondary IRQ correctly Coverity found that we were checking an unsigned variable for >= zero. Type it correctly so that the check works as intended. Signed-off-by: Virupax Sadashivpetimath Signed-off-by: Linus Walleij commit 9c66ee6f55667c5f7e118135d3175b0100e160b9 Author: Jonas Aaberg Date: Wed Oct 13 13:14:17 2010 +0200 plat-nomadik: pull-up/down settings for GPIO resume Suspend/resume didn't take care of pull-up and pull-down settings and writing back the DAT register at resume can change pull up/down settings, depending on pin input value. Output values are now also restored. Signed-off-by: Jonas Aaberg Signed-off-by: Linus Walleij commit 33b744b35189baaa260f526cf117392095331843 Author: Rabin Vincent Date: Thu Oct 14 10:38:03 2010 +0530 plat-nomadik: support secondary GPIO interrupts When GPIOs wake up the system from sleep mode, the normal GPIO interrupt handler does not hit and the normal interrupt status register does not contain the status. Instead the secondary GPIO handler does, and the interrupt status needs to be retrieved from the wakeup status saved by the suspend/resume code. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit c84c7c08e320acfd10a0b7e55dbb0bc819b6d284 Author: Rabin Vincent Date: Wed Mar 17 15:19:04 2010 +0530 plat-nomadik: implement suspend/resume for GPIO Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit d0b543c772af20f576e204cae442ccfd221631a7 Author: Rabin Vincent Date: Thu Mar 4 17:39:05 2010 +0530 plat-nomadik: add custom dbg_show for GPIO Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit e493e06fedd86b484d172f961234f105f295d4d4 Author: Rabin Vincent Date: Thu Mar 18 12:35:22 2010 +0530 plat-nomadik: support varying number of GPIOs per block Signed-off-by: Rabin Vincent [Added constant 32-pin assignment in platform data] Signed-off-by: Linus Walleij commit 5d7b8467e18b14ed44c5781d77993bfdcd8c826b Author: Linus Walleij Date: Thu Oct 14 13:57:59 2010 +0200 mach-ux500: config Ux500 PL011 PL022 PL180 for DMA This will configure the platform data for the PL011, PL022 and PL180 (derivate) PrimeCells found in the Ux500 to use DMA with the generic DMA engine for DMA40. Signed-off-by: Per Forlin Signed-off-by: Linus Walleij commit ec8f12533b4a439a8feb0d1a3bf15516781804be Author: Linus Walleij Date: Fri Aug 13 11:31:59 2010 +0200 mach-u300: config U300 PL180 PL011 PL022 for DMA This will configure the platform data for the PL180, PL011 and PL022 PrimeCells found in the U300 to use DMA with the generic PrimeCell DMA engine for COH 901 318. Signed-off-by: Linus Walleij commit 1a721859f8e57ddf3f6df2b5094057f9f536b4d0 Author: Linus Walleij Date: Wed Feb 2 14:41:19 2011 +0100 mach-u300: use mmci driver for GPIO card detect The mmci driver can handle a GPIO pin for card detect, using IRQs and all just fine, so switch to using that. Delete the old bogus input device hack, if userspace need to detect MMC cards it should use udev like everyone else. Signed-off-by: Linus Walleij commit 741caea4e518f5374cc9ff7cfaabc0e591416420 Author: Mian Yousaf Kaukab Date: Fri Jan 21 18:24:19 2011 +0100 mach-ux500: add MUSB to db5500 devices - DMA tx and rx maps for usb channels are set to be configured at runtime - MUSB is enabled with soc specific base address, irq and dma configurations Signed-off-by: Mian Yousaf Kaukab Signed-off-by: Linus Walleij commit 6f3f3c3f0b5c7b84a99f0aa99658d6c6cee8e700 Author: Mian Yousaf Kaukab Date: Fri Jan 21 18:21:50 2011 +0100 mach-ux500: add MUSB to db8500 devices - DMA tx and rx maps for usb channels are set to be configured at runtime - GPIO configurations for usb are added - MUSB is enabled with soc specific base address, irq and dma configurations Signed-off-by: Mian Yousaf Kaukab Signed-off-by: Linus Walleij commit 7f0709efe65a1a46f9b0affb6b5d27d31bae450a Author: Mian Yousaf Kaukab Date: Fri Jan 21 18:05:40 2011 +0100 mach-ux500: update MUSB clock configurations MUSB driver has been updated to separate out BSP layer from its generic parts, as separate driver. This patch configures the clock with the new platform driver name. Signed-off-by: Mian Yousaf Kaukab Signed-off-by: Linus Walleij commit 07f201d8a30b077b536a9bbc6788724aa8973e31 Author: Mian Yousaf Kaukab Date: Fri Jan 21 17:59:56 2011 +0100 mach-ux500: add platform data for musb USB resources and DMA40 configurations are dynamically with the data provided in ux500_add_usb() call. Though only DMA40 configurations differ between U8500 and U5500 (USB resource are common between them). Signed-off-by: Mian Yousaf Kaukab Signed-off-by: Linus Walleij commit 7863513efc4b2829a9d3768b37fdcd46842ac8e6 Author: Philippe Langlais Date: Thu Jan 27 14:35:37 2011 +0100 mach-ux500: fix inverted SD-card GPIO pin The levelshifter pins were set to inverted values, fix this up. Signed-off-by: Philippe Langlais Signed-off-by: Linus Walleij commit fbdc6d11ae0594fb03f4c5556cbb8ff46e1971e3 Author: Philippe Langlais Date: Thu Jan 27 14:37:07 2011 +0100 mach-ux500: set sd/mmc clock rate to 100MHz The clock speed for the SD/MMC clock was incorrect, rectify it. Signed-off-by: Philippe Langlais Signed-off-by: Linus Walleij commit bb3b218756e061b1e51c1593684be0261482e399 Author: Lee Jones Date: Thu Jan 13 14:41:22 2011 +0000 mach-ux500: Add Rohm BH1780GLI Light Sensor to i2c_board_info Signed-off-by: Lee Jones Signed-off-by: Linus Walleij commit dd7b2a055622e23c9354bd9b081973c9a15ac639 Author: Philippe Langlais Date: Wed Jan 12 11:26:20 2011 +0100 mach-ux500: platform data for LP5521 leds driver Signed-off-by: Philippe Langlais Signed-off-by: Linus Walleij commit a71b819b6edfb31d6866d084167583bd92f4ad29 Author: Philippe Langlais Date: Fri Jan 14 10:53:59 2011 +0100 mach-ux500: platform data for SFH7741 proximity sensor driver Proximity sensor is managed as an input event (SW_PROXIMITY). Signed-off-by: Philippe Langlais [Named GPIO pin] Signed-off-by: Linus Walleij commit b3f1f73d35839f3e40bd9dba2c3de53f56a2a880 Author: Linus Walleij Date: Fri Jan 21 10:50:08 2011 +0100 mach-ux500: delete old keypad board file We register keypads per-UIB now, remove this. Cc: Lee Jones Signed-off-by: Linus Walleij commit 71f933f4efe8395d4f3da6979cab6a01f2c5411b Author: Sundar Iyer Date: Fri Jan 21 10:56:18 2011 +0530 mach-ux500: add U8500 UIB platform data The U8500 UIB contains a Synaptics RMI touchpanel and a matrix keyboard via the TC35893 port expander device. Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 0c24352eada58dc3571647593e516b2d5b50014f Author: Sundar Iyer Date: Fri Jan 21 10:56:17 2011 +0530 mach-ux500: add ST-UIB platform data The ST-UIB contains a matrix keypad interfaced with the STMPE1601 port expander and a ROHM BU2101 touch panel. Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 705e0984444bc7109c5686c36333b27119d8a888 Author: Rabin Vincent Date: Fri Jan 21 10:56:16 2011 +0530 mach-ux500: dynamic UIB (user interface boards) detection Add support for dynamic detection of the UIB used (at the cost of one i2c error on the lesser-used UIB) and also provide an override via a command line parameter if needed. Signed-off-by: Rabin Vincent Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 871056e7dfb6164ffd6c6665752f921f9d5c6a81 Author: Sundar Iyer Date: Fri Jan 21 10:56:15 2011 +0530 mach-ux500: fix ux500 build error Include ab8500 regulators for DB8500 SoC by default and fix build issues Signed-off-by: Sundar Iyer [Small fixup for changed boardfiles] Signed-off-by: Linus Walleij commit d1de85a23144e922a1f2971be74076020f340090 Author: Linus Walleij Date: Thu Dec 2 17:10:14 2010 +0100 mach-ux500: add a few AB8500 regulator consumers v3 Try to make the regulators a little bit more useful by adding some of the most basic consumers we're going to have in the end. Cc: Mark Brown Cc: Rabin Vincent Cc: Naveen Kumar Gaddipati Cc: Bengt Jonsson Cc: Lee Jones Signed-off-by: Linus Walleij commit df93f1f4eeb02529c13d1f6be832ab6ff7cd8222 Author: Linus Walleij Date: Fri Jan 21 09:19:05 2011 +0100 mach-ux500: add DB5500 PMU resources This adds the PMU resources necessary to get perf working with the DB5500 ASIC. Acked-by: Will Deacon Signed-off-by: Linus Walleij commit c618e87a5fd02aaad006c12d5a80a231dfa39250 Author: Steven Whitehouse Date: Mon Mar 14 12:40:29 2011 +0000 GFS2: Update to AIL list locking The previous patch missed a couple of places where the AIL list needed locking, so this fixes up those places, plus a comment is corrected too. Signed-off-by: Steven Whitehouse Cc: Dave Chinner commit 7b2a64c96ad53c4299f7e6ddf8c2f99cb48940a9 Author: Rafi Rubin Date: Wed Mar 9 23:33:52 2011 -0500 HID: hid-ntrig: init settle and mode check Adding a wait before the wakeup signal. As a precautionary measure sanity check the current sensor mode. If needed reset it to "dual". When the device is responding poorly and needs the wakeup call, it was missing it. Giving it a chance to settle first improves the chances that signal gets through. Signed-off-by: Rafi Rubin Tested-by: Peter Hutterer Signed-off-by: Jiri Kosina commit 4875ac114d8bce99838a9b0ee7c3f5469cc6352e Author: Richard Nauber Date: Wed Mar 9 06:20:57 2011 +0100 HID: merge hid-egalax into hid-multitouch This patch merges the hid-egalax driver into hid-multitouch. There are two types of devices support by the hid-egalax driver: resistive and capacitive. Here, they are implicitly distinguished by the absence of a HID_DG_CONTACTCOUNT field in the latter, so no special code path needs to be introduced. As a side effect, this patch fixes the broken suspend/resume behavior in the old driver. [rydberg@euromail.se: minor fixups] Signed-off-by: Richard Nauber Signed-off-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit f153fc3990d4ad2709a52d7150e2c04363afb1fb Author: Henrik Rydberg Date: Wed Mar 9 06:35:25 2011 +0100 HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing The recent capacitive DWAV firmwares do not use the CONTACTCOUNT field, and the touch frame boundary can therefore not be determined. This patch makes the driver report the touch frame at each completed slot instead. Signed-off-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit ff4046294ba215abeaf45c10ab6cbfae41978b14 Author: Rafi Rubin Date: Mon Mar 7 21:13:28 2011 -0500 HID: ntrig remove if and drop an indent Signed-off-by: Rafi Rubin Tested-by: Peter Hutterer Signed-off-by: Jiri Kosina commit efed5f26664f93991c929d5bb343e65f900d72bc Author: Przemyslaw Bruski Date: Sun Mar 13 16:18:58 2011 +0100 ALSA: ctxfi - Clear input settings before initialization Clear input settings before initialization. Signed-off-by: Przemyslaw Bruski Cc: Signed-off-by: Takashi Iwai commit f164753a263bfd2daaf3e0273b179de7e099c57d Author: Przemyslaw Bruski Date: Sun Mar 13 16:18:57 2011 +0100 ALSA: ctxfi - Fix SPDIF status retrieval SDPIF status retrieval always returned the default settings instead of the actual ones. Signed-off-by: Przemyslaw Bruski Cc: Signed-off-by: Takashi Iwai commit 4c1847e884efddcc3ede371f7839e5e65b25c34d Author: Przemyslaw Bruski Date: Sun Mar 13 16:18:56 2011 +0100 ALSA: ctxfi - Fix incorrect SPDIF status bit mask SPDIF status mask creation was incorrect. Signed-off-by: Przemyslaw Bruski Cc: Signed-off-by: Takashi Iwai commit 19002fd5f1ba452ba13491f97da65367f80e09a8 Author: Przemyslaw Bruski Date: Sun Mar 13 16:18:55 2011 +0100 ALSA: ctxfi - Fix microphone boost codes/comments microphone boost was set at +12dB, not +20dB (like in Windows driver and in adc_conf structure declaration), some comments added. Signed-off-by: Przemyslaw Bruski Signed-off-by: Takashi Iwai commit ba02fa37de80bea10d706f39f076dd848348320a Author: Tomi Valkeinen Date: Fri Mar 11 09:28:06 2011 +0200 HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 to prevent crash Something seems to be wrong with OMAP4 & VENC, and register access fails in omap_venchw_probe(). This patch skips venc driver registration on OMAP4, thus circumventing the problem for now. Signed-off-by: Tomi Valkeinen commit 578ca87c9d18d344b449a8eefee40c10e4fc319f Author: Prabhakar Kushwaha Date: Mon Mar 7 09:28:10 2011 +0530 sata_fsl: Update RX_WATER_MARK for TRANSCFG RX_WATER_MARK sets the number of locations in Rx FIFO that can be used before the transport layer instructs the link layer to transmit HOLDS. Note that it can take some time for the HOLDs to get to the other end, and that in the interim there must be enough room in the FIFO to absorb all data that could arrive. Update the new recommended value to 16. Signed-off-by: Prabhakar Kushwaha Signed-off-by: Jeff Garzik commit 4ac7534a7ff1aa1b1486e39bdf169aaa8a9bb3e2 Author: Prabhakar Kushwaha Date: Wed Mar 9 12:47:18 2011 +0530 sata_fsl: Fix wrong Device Error Register usage When a single device error is detected, the device under the error is indicated by the error bit set in the DER. There is a one to one mapping between register bit and devices on Port multiplier(PMP) i.e. bit 0 represents PMP device 0 and bit 1 represents PMP device 1 etc. Current implementation treats Device error register value as device number not set of bits representing multiple device on PMP. It is changed to consider bit level. No need to check for each set bit as all command is going to be aborted. Signed-off-by: Ashish Kalra Signed-off-by: Prabhakar Kushwaha Signed-off-by: Jeff Garzik commit 6b3b9d73e08d8939aaf54f85bb47495171f49e20 Author: Hannes Reinecke Date: Mon Mar 7 08:56:44 2011 +0100 libata: Include WWN ID in inquiry VPD emulation As per SAT-3 the WWN ID should be included in the VPD page 0x83 (device identification) emulation. Signed-off-by: Hannes Reinecke Acked-by: Tejun Heo Signed-off-by: Jeff Garzik commit 60a230e4a62be6837335911b09101bd8aeb7c95a Author: Viresh Kumar Date: Fri Mar 4 16:39:29 2011 +0530 ata/pata_arasan_cf: fill dma chan->private from pdata->dma_priv Some DMA controllers (eg: drivers/dma/dw_dmac*) allow platform specific configuration for dma transfers. User drivers need to set chan->private field of channel with pointer to configuration data. This patch takes dma_priv data from platform data and passes it to chan->private_data, in order to pass platform specific configuration to DMAC controller. Signed-off-by: Viresh Kumar Signed-off-by: Jeff Garzik commit 8d7b1c70b3c1aac4b63109f5c73f732f1d63fad6 Author: Joe Perches Date: Mon Jan 31 08:39:24 2011 -0800 ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_ Commit 40d69ba029c8d5de51aaeb5358999266c482d00a ("pata_hpt{37x|3x2n}: use pr_*(DRV_NAME ...) instead of printk(KERN_* ...)") used pr_. Add #define pr_fmt and remove DRV_NAME. Increment driver version numbers. Signed-off-by: Joe Perches Signed-off-by: Jeff Garzik commit a17139b6f63709b2d409c027f8ab401f5aa136d3 Author: Jeff Garzik Date: Mon Mar 14 02:54:03 2011 -0400 pata_arasan_cf: fix printk format string warning Signed-off-by: Jeff Garzik commit a480167b23ef9b35ec0299bb3e1b11b4ed6b3508 Author: Viresh Kumar Date: Tue Feb 22 15:46:07 2011 +0530 pata_arasan_cf: Adding support for arasan compact flash host controller The Arasan CompactFlash Device Controller has three basic modes of operation: PC card ATA using I/O mode, PC card ATA using memory mode, PC card ATA using true IDE modes. Currently driver supports only True IDE mode. Signed-off-by: Viresh Kumar Signed-off-by: Jeff Garzik commit 64b97594251bb909d74d64012a2b9e5cc32bb11d Author: Viresh Kumar Date: Tue Feb 22 14:32:38 2011 +0530 libata-sff: add ata_sff_queue_work() & ata_sff_queue_delayed_work() This patch adds ata_sff_queue_work() & ata_sff_queue_delayed_work() routine in libata-sff.c file. This routine can be used by ata drivers to use ata_sff_wq. Signed-off-by: Viresh Kumar Acked-by: Tejun Heo Signed-off-by: Jeff Garzik commit 64a3903d0885879ba8706a8bcf71c5e3e7664db2 Author: Seth Heasley Date: Fri Mar 11 11:57:42 2011 -0800 ahci: AHCI mode SATA patch for Intel Patsburg SATA RAID controller This patch adds an updated SATA RAID DeviceID for the Intel Patsburg PCH. Signed-off-by: Seth Heasley Signed-off-by: Jeff Garzik commit bd7e4e85f3b8e5c7ea2f09d0b3350b264e339a14 Author: Bo Shen Date: Sun Mar 13 23:34:59 2011 -0700 Input: add Atmel AT42QT1070 keypad driver The AT42QT1070 QTouch sensor supports up to 7 keys. The driver has been tested on Atmel AT91SAM9M10-G45-EK board, and it should work fine on other platforms. Signed-off-by: Bo Shen Signed-off-by: Dmitry Torokhov commit bd35fe5a7930bf83ed56422ea4e4b6471ee6f739 Author: Marcin Slusarz Date: Wed Mar 9 14:22:19 2011 +0100 drm/nouveau: fix __nouveau_fence_wait performance Commit 21e86c1c8a844bf978f8fc431a59c9f5a578812d ("drm/nouveau: remove cpu_writers lock") turned on lazy waits. Unfortunately __nouveau_fence_wait was not optimized for this case and on HZ=100 kernel wasted up to 10 ms per call. Depending on application, it led to 10-30% FPS regression. Fix it. Signed-off-by: Marcin Slusarz Signed-off-by: Francisco Jerez commit 459ca7e5283914845d7139905ff58824d2b0cc85 Author: Ben Skeggs Date: Tue Mar 8 14:47:53 2011 +1000 drm/nv40: attempt to reserve just enough vram for all 32 channels This also makes the fact we're giving 512MiB of GART space to all PCIE boards explicit, although the vast majority (if not all) of them will now have a ramin_rsvd_vram larger than 2MiB anyway. Signed-off-by: Ben Skeggs commit 6fdb383e81a644a244299d635de5eb30ed401278 Author: Ben Skeggs Date: Tue Mar 8 09:57:17 2011 +1000 drm/nv50: check for vm traps on every gr irq Signed-off-by: Ben Skeggs commit 312d1d5fe9b832899b02c620c143bc7eb5a3bdb1 Author: Ben Skeggs Date: Tue Mar 8 09:50:06 2011 +1000 drm/nv50: decode vm faults some more Signed-off-by: Ben Skeggs commit bb9b18a390db4a15cd46bbd7472510feb7d4c168 Author: Ben Skeggs Date: Tue Mar 8 08:39:43 2011 +1000 drm/nouveau: add nouveau_enum_find() util function Signed-off-by: Ben Skeggs commit 7fa0cba2b269fa498804a89a0a1d763ea1f65015 Author: Marcin Slusarz Date: Mon Mar 7 12:31:35 2011 +0100 drm/nouveau: properly handle pushbuffer check failures When "buffer in list" check does not pass, don't free validation lists - they were not initialized yet. Fixes this oops: [drm] nouveau 0000:02:00.0: push 105 buffer not in list BUG: unable to handle kernel NULL pointer dereference at 000000000000057c IP: [] do_raw_spin_lock+0x14/0x13c PGD 1ac6cb067 PUD 1aaa52067 PMD 0 CPU 0 Modules linked in: nouveau ttm drm_kms_helper snd_hda_codec_realtek snd_hda_intel snd_hda_codec Pid: 6265, comm: OilRush_x86 Not tainted 2.6.38-rc6-nv+ #632 System manufacturer System Product Name/P6T SE RIP: 0010:[] [] do_raw_spin_lock+0x14/0x13c (...) Process OilRush_x86 (pid: 6265, threadinfo ffff8801a6aee000, task ffff8801a26c0000) 0000000000000000 ffff8801ac74c618 0000000000000000 0000000000000578 0000000000000000 ffff8801ac74c618 0000000000000000 ffff8801bd9d0000 [] _raw_spin_lock+0x1e/0x22 [] nouveau_bo_fence+0x2e/0x60 [nouveau] [] validate_fini_list+0x35/0xeb [nouveau] [] validate_fini+0x12/0x31 [nouveau] [] nouveau_gem_ioctl_pushbuf+0xe94/0xf6b [nouveau] [] ? sub_preempt_count+0x9e/0xb2 [] ? _raw_spin_unlock_irqrestore+0x30/0x4d [] ? __wake_up+0x3f/0x48 [] drm_ioctl+0x289/0x361 [] ? sub_preempt_count+0x9e/0xb2 [] ? nouveau_gem_ioctl_pushbuf+0x0/0xf6b [nouveau] [] ? sub_preempt_count+0x9e/0xb2 [] nouveau_compat_ioctl+0x16/0x1c [nouveau] [] compat_sys_ioctl+0x1c8/0x12d7 [] ? trace_hardirqs_off_thunk+0x3a/0x6c [] sysenter_dispatch+0x7/0x30 [] ? trace_hardirqs_on_thunk+0x3a/0x3c RIP [] do_raw_spin_lock+0x14/0x13c RSP ---[ end trace 0014d5d93e6147e1 ]--- Additionally, don't call validate_fini twice in case of validation failure. Signed-off-by: Marcin Slusarz Signed-off-by: Maarten Maathuis Signed-off-by: Ben Skeggs commit b84f30e65c2352c6400b9c748b918ca4031f5d4a Author: Ben Skeggs Date: Mon Feb 28 17:20:45 2011 +1000 drm/nvc0: remove vm hack forcing large/small pages to not share a PDE Appears to be fixed with commit: "drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo" Signed-off-by: Ben Skeggs commit 4e75db2e8ff2c97762e87f61f54d7cdeaab1a6b0 Author: Eric Dumazet Date: Sun Mar 13 23:22:23 2011 -0700 inetpeer: should use call_rcu() variant After commit 7b46ac4e77f3224a (inetpeer: Don't disable BH for initial fast RCU lookup.), we should use call_rcu() to wait proper RCU grace period. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit bcd5023c961a44c7149936553b6929b2b233dd27 Author: Dave Airlie Date: Mon Mar 14 14:17:55 2011 +1000 drm/i915: disable opregion lid detection for now. At least on my HP 2540p this is wrong at bootup, fine at any other time once a lid event has occured. This is due to _REG vs _INI ordering in the ACPI tables. Signed-off-by: Dave Airlie commit 34db18abd376b2075c760c38f0b861aed379415d Merge: e73f88a 47ae63e Author: Dave Airlie Date: Mon Mar 14 14:15:13 2011 +1000 Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next * 'intel/drm-intel-next' of ../drm-next: (755 commits) drm/i915: Only wait on a pending flip if we intend to write to the buffer drm/i915/dp: Sanity check eDP existence drm/i915: Rebind the buffer if its alignment constraints changes with tiling drm/i915: Disable GPU semaphores by default drm/i915: Do not overflow the MMADDR write FIFO Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing" drm/i915: Don't save/restore hardware status page address register drm/i915: don't store the reg value for HWS_PGA drm/i915: fix memory corruption with GM965 and >4GB RAM Linux 2.6.38-rc7 Revert "TPM: Long default timeout fix" drm/i915: Re-enable GPU semaphores for SandyBridge mobile drm/i915: Replace vblank PM QoS with "Interrupt-Based AGPBUSY#" Revert "drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU" drm/i915: Allow relocation deltas outside of target bo drm/i915: Silence an innocuous compiler warning for an unused variable fs/block_dev.c: fix new kernel-doc warning ACPI: Fix build for CONFIG_NET unset mm: must include x86: Use u32 instead of long to set reset vector back to 0 ... Conflicts: drivers/gpu/drm/i915/i915_gem.c commit d8647b79c3b7e223ac051439d165bc8e7bbb832f Author: Steffen Klassert Date: Tue Mar 8 00:10:27 2011 +0000 xfrm: Add user interface for esn and big anti-replay windows This patch adds a netlink based user interface to configure esn and big anti-replay windows. The new netlink attribute XFRMA_REPLAY_ESN_VAL is used to configure the new implementation. If the XFRM_STATE_ESN flag is set, we use esn and support for big anti-replay windows for the configured state. If this flag is not set we use the new implementation with 32 bit sequence numbers. A big anti-replay window can be configured in this case anyway. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 2cd084678fc1eb75aec4f7ae3d339d232c00ec61 Author: Steffen Klassert Date: Tue Mar 8 00:09:51 2011 +0000 xfrm: Add support for IPsec extended sequence numbers This patch adds support for IPsec extended sequence numbers (esn) as defined in RFC 4303. The bits to manage the anti-replay window are based on a patch from Alex Badea. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 97e15c3a8504ea39a209778d7dcdbdf440404a91 Author: Steffen Klassert Date: Tue Mar 8 00:09:09 2011 +0000 xfrm: Support anti-replay window size bigger than 32 packets As it is, the anti-replay bitmap in struct xfrm_replay_state can only accomodate 32 packets. Even though it is possible to configure anti-replay window sizes up to 255 packets from userspace. So we reject any packet with a sequence number within the configured window but outside the bitmap. With this patch, we represent the anti-replay window as a bitmap of variable length that can be accessed via the new struct xfrm_replay_state_esn. Thus, we have no limit on the window size anymore. To use the new anti-replay window implementantion, new userspace tools are required. We leave the old implementation untouched to stay in sync with old userspace tools. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 9fdc4883d92d20842c5acea77a4a21bb1574b495 Author: Steffen Klassert Date: Tue Mar 8 00:08:32 2011 +0000 xfrm: Move IPsec replay detection functions to a separate file To support multiple versions of replay detection, we move the replay detection functions to a separate file and make them accessible via function pointers contained in the struct xfrm_replay. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit d212a4c29096484e5e83b5006e695add126260af Author: Steffen Klassert Date: Tue Mar 8 00:07:51 2011 +0000 esp6: Add support for IPsec extended sequence numbers This patch adds IPsec extended sequence numbers support to esp6. We use the authencesn crypto algorithm to handle esp with separate encryption/authentication algorithms. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 0dc49e9b28a7253ff05be2794d747f8ea5f1f423 Author: Steffen Klassert Date: Tue Mar 8 00:07:14 2011 +0000 esp4: Add support for IPsec extended sequence numbers This patch adds IPsec extended sequence numbers support to esp4. We use the authencesn crypto algorithm to handle esp with separate encryption/authentication algorithms. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 1ce3644ade9c865c755bf0f6a4e109b7bb6eb60f Author: Steffen Klassert Date: Tue Mar 8 00:06:31 2011 +0000 xfrm: Use separate low and high order bits of the sequence numbers in xfrm_skb_cb To support IPsec extended sequence numbers, we split the output sequence numbers of xfrm_skb_cb in low and high order 32 bits and we add the high order 32 bits to the input sequence numbers. All users are updated accordingly. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 9736acf395d3608583a7be70f62800b494fa103c Author: Steffen Klassert Date: Tue Mar 8 00:05:43 2011 +0000 xfrm: Add basic infrastructure to support IPsec extended sequence numbers This patch adds the struct xfrm_replay_state_esn which will be used to support IPsec extended sequence numbers and anti replay windows bigger than 32 packets. Also we add a function that returns the actual size of the xfrm_replay_state_esn, a xfrm netlink atribute and a xfrm state flag for the use of extended sequence numbers. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit a5079d084f8be781aae8a635cab4b179cfea4ebd Author: Steffen Klassert Date: Tue Mar 8 00:04:58 2011 +0000 crypto: authencesn - Add algorithm to handle IPsec extended sequence numbers ESP with separate encryption/authentication algorithms needs a special treatment for the associated data. This patch add a new algorithm that handles esp with extended sequence numbers. Signed-off-by: Steffen Klassert Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 27b61ae2d73936554fcd07e77c3cc13bc88c41a9 Merge: 46af318 633d2bd Author: David S. Miller Date: Sun Mar 13 18:49:11 2011 -0700 Merge branch 'tipc-Mar13-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6 commit 46af31800b6916c92fffa529dc3c357008da957d Author: Hiroaki SHIMODA Date: Wed Mar 9 20:09:58 2011 +0000 ipv4: Fix PMTU update. On current net-next-2.6, when Linux receives ICMP Type: 3, Code: 4 (Destination unreachable (Fragmentation needed)), icmp_unreach -> ip_rt_frag_needed (peer->pmtu_expires is set here) -> tcp_v4_err -> do_pmtu_discovery -> ip_rt_update_pmtu (peer->pmtu_expires is already set, so check_peer_pmtu is skipped.) -> check_peer_pmtu check_peer_pmtu is skipped and MTU is not updated. To fix this, let check_peer_pmtu execute unconditionally. And some minor fixes 1) Avoid potential peer->pmtu_expires set to be zero. 2) In check_peer_pmtu, argument of time_before is reversed. 3) check_peer_pmtu expects peer->pmtu_orig is initialized as zero, but not initialized. Signed-off-by: Hiroaki SHIMODA Signed-off-by: David S. Miller commit 500132a0f26ad7d9916102193cbc6c1b1becb373 Author: Paul Zimmerman Date: Mon Feb 28 18:11:27 2011 -0800 USB: Add support for SuperSpeed isoc endpoints Use the Mult and bMaxBurst values from the endpoint companion descriptor to calculate the max length of an isoc transfer. Add USB_SS_MULT macro to access Mult field of bmAttributes, at Sarah's suggestion. This patch should be queued for the 2.6.36 and 2.6.37 stable trees, since those were the first kernels to have isochronous support for SuperSpeed devices. Signed-off-by: Paul Zimmerman Signed-off-by: Sarah Sharp Cc: stable@kernel.org commit ba0a4d9aaae789a6a632968b27c21d49b858b13a Author: Sarah Sharp Date: Wed Feb 23 18:13:43 2011 -0800 xhci: Clean up cycle bit math used during stalls. Use XOR to invert the cycle bit, instead of a more complicated calculation. Eliminate a check for the link TRB type in find_trb_seg(). We know that there will always be a link TRB at the end of a segment, so xhci_segment->trbs[TRBS_PER_SEGMENT - 1] will always have a link TRB type. Signed-off-by: Sarah Sharp Tested-by: Takashi Iwai commit 01a1fdb9a7afa5e3c14c9316d6f380732750b4e4 Author: Sarah Sharp Date: Wed Feb 23 18:12:29 2011 -0800 xhci: Fix cycle bit calculation during stall handling. When an endpoint stalls, we need to update the xHCI host's internal dequeue pointer to move it past the stalled transfer. This includes updating the cycle bit (TRB ownership bit) if we have moved the dequeue pointer past a link TRB with the toggle cycle bit set. When we're trying to find the new dequeue segment, find_trb_seg() is supposed to keep track of whether we've passed any link TRBs with the toggle cycle bit set. However, this while loop's body while (cur_seg->trbs > trb || &cur_seg->trbs[TRBS_PER_SEGMENT - 1] < trb) { Will never get executed if the ring only contains one segment. find_trb_seg() will return immediately, without updating the new cycle bit. Since find_trb_seg() has no idea where in the segment the TD that stalled was, make the caller, xhci_find_new_dequeue_state(), check for this special case and update the cycle bit accordingly. This patch should be queued to kernels all the way back to 2.6.31. Signed-off-by: Sarah Sharp Tested-by: Takashi Iwai Cc: stable@kernel.org commit bf161e85fb153c0dd5a95faca73fd6a9d237c389 Author: Sarah Sharp Date: Wed Feb 23 15:46:42 2011 -0800 xhci: Update internal dequeue pointers after stalls. When an endpoint stalls, the xHCI driver must move the endpoint ring's dequeue pointer past the stalled transfer. To do that, the driver issues a Set TR Dequeue Pointer command, which will complete some time later. Takashi was having issues with USB 1.1 audio devices that stalled, and his analysis of the code was that the old code would not update the xHCI driver's ring dequeue pointer after the command completes. However, the dequeue pointer is set in xhci_find_new_dequeue_state(), just before the set command is issued to the hardware. Setting the dequeue pointer before the Set TR Dequeue Pointer command completes is a dangerous thing to do, since the xHCI hardware can fail the command. Instead, store the new dequeue pointer in the xhci_virt_ep structure, and update the ring's dequeue pointer when the Set TR dequeue pointer command completes. While we're at it, make sure we can't queue another Set TR Dequeue Command while the first one is still being processed. This just won't work with the internal xHCI state code. I'm still not sure if this is the right thing to do, since we might have a case where a driver queues multiple URBs to a control ring, one of the URBs Stalls, and then the driver tries to cancel the second URB. There may be a race condition there where the xHCI driver might try to issue multiple Set TR Dequeue Pointer commands, but I would have to think very hard about how the Stop Endpoint and cancellation code works. Keep the fix simple until when/if we run into that case. This patch should be queued to kernels all the way back to 2.6.31. Signed-off-by: Sarah Sharp Tested-by: Takashi Iwai Cc: stable@kernel.org commit 0c9ffe0f6286a02bf82f8d7fb7274aec2ad977f1 Author: Sarah Sharp Date: Thu Dec 30 13:27:36 2010 -0800 USB: Disable auto-suspend for USB 3.0 hubs. USB 3.0 devices have a slightly different suspend sequence than USB 2.0/1.1 devices. There isn't support for USB 3.0 device suspend yet, so make khubd leave autosuspend disabled for USB 3.0 hubs. Make sure that USB 3.0 roothubs still have autosuspend enabled, since that path in the xHCI driver works fine. Signed-off-by: Sarah Sharp commit 131dec344d5e41f01e4791aa4c80eb4bdb1e5274 Author: Sarah Sharp Date: Mon Dec 6 21:00:19 2010 -0800 USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol. USB_PORT_STAT_SUPER_SPEED is a made up symbol that the USB core used to track whether USB ports had a SuperSpeed device attached. This is a linux-internal symbol that was used when SuperSpeed and non-SuperSpeed devices would show up under the same xHCI roothub. This particular port status is never returned by external USB 3.0 hubs. (Instead they have a USB_PORT_STAT_SPEED_5GBPS that uses a completely different speed mask.) Now that the xHCI driver registers two roothubs, USB 3.0 devices will only show up under USB 3.0 hubs. Rip out USB_PORT_STAT_SUPER_SPEED and replace it with calls to hub_is_superspeed(). Signed-off-by: Sarah Sharp commit c6cc27c782e3a64cced0fcf1d6f492c8d8881c76 Author: Sarah Sharp Date: Fri Mar 11 10:20:58 2011 -0800 xhci: Return canceled URBs immediately when host is halted. When the xHCI host controller is halted, it won't respond to commands placed on the command ring. So if an URB is cancelled after the first roothub is deallocated, it will try to place a stop endpoint command on the command ring, which will fail. The command watchdog timer will fire after five seconds, and the host controller will be marked as dying, and all URBs will be completed. Add a flag to the xHCI's internal state variable for when the host controller is halted. Immediately return the canceled URB if the host controller is halted. Signed-off-by: Sarah Sharp commit b320937972d456db2a46fdcbc6bebc4dcdc9daa4 Author: Sarah Sharp Date: Mon Mar 7 11:24:07 2011 -0800 xhci: Fixes for suspend/resume of shared HCDs. Make sure the HCD_FLAG_HW_ACCESSIBLE flag is mirrored by both roothubs, since it refers to whether the shared hardware is accessible. Make sure each bus is marked as suspended by setting usb_hcd->state to HC_STATE_SUSPENDED when the PCI host controller is resumed. Signed-off-by: Sarah Sharp commit 65b22f93fde320b34d43e4a3978e1b52b1bcc279 Author: Sarah Sharp Date: Fri Dec 17 12:35:05 2010 -0800 xhci: Fix re-init on power loss after resume. When a host controller has lost power during a suspend, we must reinitialize it. Now that the xHCI host has two roothubs, xhci_run() and xhci_stop() expect to be called with both usb_hcd structures. Be sure that the re-initialization code in xhci_resume() mirrors the process the USB PCI probe function uses. Signed-off-by: Sarah Sharp commit f9de8151877b4f01cc8e124b0e213a6c6c78d970 Author: Sarah Sharp Date: Fri Oct 29 14:37:23 2010 -0700 xhci: Make roothub functions deal with device removal. Return early in the roothub control and status functions if the xHCI host controller is not electrically present in the system (register reads return all "fs"). This issue only shows up when the xHCI driver registers two roothubs and the host controller is removed from the system. Signed-off-by: Sarah Sharp commit d30b2a208108a0b0fdeae7006b8824d9be16ca96 Author: Sarah Sharp Date: Tue Nov 23 10:42:22 2010 -0800 xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports. The USB core allocates a USB 2.0 roothub descriptor that has room for 31 (USB_MAXCHILDREN) ports' worth of DeviceRemovable and PortPwrCtrlMask fields. Limit the number of USB 2.0 roothub ports accordingly. I don't expect to run into this limitation ever, but this prevents a buffer overflow issue in the roothub descriptor filling code. Similarly, a USB 3.0 hub can only have 15 downstream ports, so limit the USB 3.0 roothub to 15 USB 3.0 ports. Signed-off-by: Sarah Sharp commit 4bbb0ace9a3de8392527e3c87926309d541d3b00 Author: Sarah Sharp Date: Mon Nov 29 16:14:37 2010 -0800 xhci: Return a USB 3.0 hub descriptor for USB3 roothub. Return the correct xHCI roothub descriptor, based on whether the roothub is marked as USB 3.0 or USB 2.0 in usb_hcd->bcdUSB. Fill in DeviceRemovable for the USB 2.0 and USB 3.0 roothub descriptors, using the Device Removable bit in the port status and control registers. xHCI is the first host controller to actually properly set these bits (other hosts say all devices are removable). When userspace asks for a USB 2.0-style hub descriptor for the USB 3.0 roothub, stall the endpoint. This is what real external USB 3.0 hubs do, and we don't want to return a descriptor that userspace didn't ask for. The USB core is already fixed to always ask for USB 3.0-style hub descriptors. Only usbfs (typically lsusb) will ask for the USB 2.0-style hub descriptors. This has already been fixed in usbutils version 0.91, but the kernel needs to deal with older usbutils versions. Signed-off-by: Sarah Sharp commit f6ff0ac878eb420011fa2448851dd48c3a7e7b31 Author: Sarah Sharp Date: Thu Dec 16 11:21:10 2010 -0800 xhci: Register second xHCI roothub. This patch changes the xHCI driver to allocate two roothubs. This touches the driver initialization and shutdown paths, roothub emulation code, and port status change event handlers. This is a rather large patch, but it can't be broken up, or it would break git-bisect. Make the xHCI driver register its own PCI probe function. This will call the USB core to create the USB 2.0 roothub, and then create the USB 3.0 roothub. This gets the code for registering a shared roothub out of the USB core, and allows other HCDs later to decide if and how many shared roothubs they want to allocate. Make sure the xHCI's reset method marks the xHCI host controller's primary roothub as the USB 2.0 roothub. This ensures that the high speed bus will be processed first when the PCI device is resumed, and any USB 3.0 devices that have migrated over to high speed will migrate back after being reset. This ensures that USB persist works with these odd devices. The reset method will also mark the xHCI USB2 roothub as having an integrated TT. Like EHCI host controllers with a "rate matching hub" the xHCI USB 2.0 roothub doesn't have an OHCI or UHCI companion controller. It doesn't really have a TT, but we'll lie and say it has an integrated TT. We need to do this because the USB core will reject LS/FS devices under a HS hub without a TT. Other details: ------------- The roothub emulation code is changed to return the correct number of ports for the two roothubs. For the USB 3.0 roothub, it only reports the USB 3.0 ports. For the USB 2.0 roothub, it reports all the LS/FS/HS ports. The code to disable a port now checks the speed of the roothub, and refuses to disable SuperSpeed ports under the USB 3.0 roothub. The code for initializing a new device context must be changed to set the proper roothub port number. Since we've split the xHCI host into two roothubs, we can't just use the port number in the ancestor hub. Instead, we loop through the array of hardware port status register speeds and find the Nth port with a similar speed. The port status change event handler is updated to figure out whether the port that reported the change is a USB 3.0 port, or a non-SuperSpeed port. Once it figures out the port speed, it kicks the proper roothub. The function to find a slot ID based on the port index is updated to take into account that the two roothubs will have over-lapping port indexes. It checks that the virtual device with a matching port index is the same speed as the passed in roothub. There's also changes to the driver initialization and shutdown paths: 1. Make sure that the xhci_hcd pointer is shared across the two usb_hcd structures. The xhci_hcd pointer is allocated and the registers are mapped in when xhci_pci_setup() is called with the primary HCD. When xhci_pci_setup() is called with the non-primary HCD, the xhci_hcd pointer is stored. 2. Make sure to set the sg_tablesize for both usb_hcd structures. Set the PCI DMA mask for the non-primary HCD to allow for 64-bit or 32-bit DMA. (The PCI DMA mask is set from the primary HCD further down in the xhci_pci_setup() function.) 3. Ensure that the host controller doesn't start kicking khubd in response to port status changes before both usb_hcd structures are registered. xhci_run() only starts the xHC running once it has been called with the non-primary roothub. Similarly, the xhci_stop() function only halts the host controller when it is called with the non-primary HCD. Then on the second call, it resets and cleans up the MSI-X irqs. Signed-off-by: Sarah Sharp commit 5233630fcdd6f7d415dcbed264031439cab73f9d Author: Sarah Sharp Date: Thu Dec 16 10:49:09 2010 -0800 xhci: Change xhci_find_slot_id_by_port() API. xhci_find_slot_id_by_port() tries to map the port index to the slot ID for the USB device. In the future, there will be two xHCI roothubs, and their port indices will overlap. Therefore, xhci_find_slot_id_by_port() will need to use information in the roothub's usb_hcd structure to map the port index and roothub speed to the right slot ID. Add a new parameter to xhci_find_slot_id_by_port(), in order to pass in the roothub's usb_hcd structure. Signed-off-by: Sarah Sharp commit 20b67cf51fa606442bb343afad0ee1a393a6afb3 Author: Sarah Sharp Date: Wed Dec 15 12:47:14 2010 -0800 xhci: Refactor bus suspend state into a struct. There are several variables in the xhci_hcd structure that are related to bus suspend and resume state. There are a couple different port status arrays that are accessed by port index. Move those variables into a separate structure, xhci_bus_state. Stash that structure in xhci_hcd. When we have two roothhubs that can be suspended and resumed separately, we can have two xhci_bus_states, and index into the port arrays in each structure with the fake roothub port index (not the real hardware port index). Signed-off-by: Sarah Sharp commit 5308a91b9fc1a8f94b860c2589b06908a97cba7e Author: Sarah Sharp Date: Wed Dec 1 11:34:59 2010 -0800 xhci: Index with a port array instead of PORTSC addresses. In the upcoming patches, the roothub emulation code will need to return port status and port change buffers based on whether they are called with the xHCI USB 2.0 or USB 3.0 roothub. To facilitate that, make the roothub code index into an array of port addresses with wIndex, rather than calculating the address using the offset and the address of the PORTSC registers. Later we can set the port array to be the array of USB 3.0 port addresses, or the USB 2.0 port addresses, depending on the roothub passed in. Create a temporary (statically sized) port array and fill it in with both USB 3.0 and USB 2.0 port addresses. This is inefficient to do for every roothub call, but this is needed for git bisect compatibility. The temporary port array will be deleted in a subsequent patch. Signed-off-by: Sarah Sharp commit ff9d78b36f76687c91c67b9f4c5c33bc888ed2f9 Author: Sarah Sharp Date: Thu Dec 2 19:10:02 2010 -0800 USB: Set usb_hcd->state and flags for shared roothubs. The hcd->flags are in a sorry state. Some of them are clearly specific to the particular roothub (HCD_POLL_RH, HCD_POLL_PENDING, and HCD_WAKEUP_PENDING), but some flags are related to PCI device state (HCD_HW_ACCESSIBLE and HCD_SAW_IRQ). This is an issue when one PCI device can have two roothubs that share the same IRQ line and hardware. Make sure to set HCD_FLAG_SAW_IRQ for both roothubs when an interrupt is serviced, or an URB is unlinked without an interrupt. (We can't tell if the host actually serviced an interrupt for a particular bus, but we can tell it serviced some interrupt.) HCD_HW_ACCESSIBLE is set once by usb_add_hcd(), which is set for both roothubs as they are added, so it doesn't need to be modified. HCD_POLL_RH and HCD_POLL_PENDING are only checked by the USB core, and they are never set by the xHCI driver, since the roothub never needs to be polled. The usb_hcd's state field is a similar mess. Sometimes the state applies to the underlying hardware: HC_STATE_HALT, HC_STATE_RUNNING, and HC_STATE_QUIESCING. But sometimes the state refers to the roothub state: HC_STATE_RESUMING and HC_STATE_SUSPENDED. Alan Stern recently made the USB core not rely on the hcd->state variable. Internally, the xHCI driver still checks for HC_STATE_SUSPENDED, so leave that code in. Remove all references to HC_STATE_HALT, since the xHCI driver only sets and doesn't test those variables. We still have to set HC_STATE_RUNNING, since Alan's patch has a bug that means the roothub won't get registered if we don't set that. Alan's patch made the USB core check a different variable when trying to determine whether to suspend a roothub. The xHCI host has a split roothub, where two buses are registered for one PCI device. Each bus in the xHCI split roothub can be suspended separately, but both buses must be suspended before the PCI device can be suspended. Therefore, make sure that the USB core checks HCD_RH_RUNNING() for both roothubs before suspending the PCI host. Signed-off-by: Sarah Sharp commit c56354378426e550aaf6ddf3983f502a8fddeab5 Author: Sarah Sharp Date: Thu Oct 28 15:40:26 2010 -0700 usb: Make core allocate resources per PCI-device. Introduce the notion of a PCI device that may be associated with more than one USB host controller driver (struct usb_hcd). This patch is the start of the work to separate the xHCI host controller into two roothubs: a USB 3.0 roothub with SuperSpeed-only ports, and a USB 2.0 roothub with HS/FS/LS ports. One usb_hcd structure is designated to be the "primary HCD", and a pointer is added to the usb_hcd structure to keep track of that. A new function call, usb_hcd_is_primary_hcd() is added to check whether the USB hcd is marked as the primary HCD (or if it is not part of a roothub pair). To allow the USB core and xHCI driver to access either roothub in a pair, a "shared_hcd" pointer is added to the usb_hcd structure. Add a new function, usb_create_shared_hcd(), that does roothub allocation for paired roothubs. It will act just like usb_create_hcd() did if the primary_hcd pointer argument is NULL. If it is passed a non-NULL primary_hcd pointer, it sets usb_hcd->shared_hcd and usb_hcd->primary_hcd fields. It will also skip the bandwidth_mutex allocation, and set the secondary hcd's bandwidth_mutex pointer to the primary HCD's mutex. IRQs are only allocated once for the primary roothub. Introduce a new usb_hcd driver flag that indicates the host controller driver wants to create two roothubs. If the HCD_SHARED flag is set, then the USB core PCI probe methods will allocate a second roothub, and make sure that second roothub gets freed during rmmod and in initialization error paths. When usb_hc_died() is called with the primary HCD, make sure that any roothubs that share that host controller are also marked as being dead. Signed-off-by: Sarah Sharp commit 83de4b2b90887b5b317d8313864fe4cc5db35280 Author: Sarah Sharp Date: Thu Dec 2 14:45:18 2010 -0800 usb: Store bus type in usb_hcd, not in driver flags. The xHCI driver essentially has both a USB 2.0 and a USB 3.0 roothub. So setting the HCD_USB3 bits in the hcd->driver->flags is a bit misleading. Add a new field to usb_hcd, bcdUSB. Store the result of hcd->driver->flags & HCD_MASK in it. Later, when we have the xHCI driver register the two roothubs, we'll set the usb_hcd->bcdUSB field to HCD_USB2 for the USB 2.0 roothub, and HCD_USB3 for the USB 3.0 roothub. Signed-off-by: Sarah Sharp commit d673bfcbfffdeb56064a6b1ee047b85590bed76c Author: Sarah Sharp Date: Fri Oct 15 08:55:24 2010 -0700 usb: Change usb_hcd->bandwidth_mutex to a pointer. Change the bandwith_mutex in struct usb_hcd to a pointer. This will allow the pointer to be shared across usb_hcds for the upcoming work to split the xHCI driver roothub into a USB 2.0/1.1 and a USB 3.0 bus. Signed-off-by: Sarah Sharp commit 23e0d1066f429ab44305e96fbff13f1793886277 Author: Sarah Sharp Date: Thu Oct 21 11:14:54 2010 -0700 usb: Refactor irq enabling out of usb_add_hcd() Refactor out the code in usb_add_hcd() to request the IRQ line for the HCD. This will only need to be called once for the two xHCI roothubs, so it's easier to refactor it into a function, rather than wrapping the long if-else block into another if statement. Signed-off-by: Sarah Sharp commit 8766c815607e572556b04075d4545330123c4f27 Author: Sarah Sharp Date: Fri Oct 15 10:33:48 2010 -0700 usb: Make usb_hcd_pci_probe labels more descriptive. Make the labels for the goto statements in usb_hcd_pci_probe() describe the cleanup they do, rather than being numbered err[1-4]. This makes it easier to add error handling later. The error handling for this function looks a little fishy, since set_hs_companion() isn't called until the very end of the function, and clear_hs_companion() is called if this function fails earlier than that. But it should be harmless to clear a NULL pointer, so leave the error handling as-is. Signed-off-by: Sarah Sharp commit b02d0ed677acb3465e7600366f2353413bf24074 Author: Sarah Sharp Date: Tue Oct 26 11:03:44 2010 -0700 xhci: Change hcd_priv into a pointer. Instead of allocating space for the whole xhci_hcd structure at the end of usb_hcd, make the USB core allocate enough space for a pointer to the xhci_hcd structure. This will make it easy to share the xhci_hcd structure across the two roothubs (the USB 3.0 usb_hcd and the USB 2.0 usb_hcd). Deallocate the xhci_hcd at PCI remove time, so the hcd_priv will be deallocated after the usb_hcd is deallocated. We do this by registering a different PCI remove function that calls the usb_hcd_pci_remove() function, and then frees the xhci_hcd. usb_hcd_pci_remove() calls kput() on the usb_hcd structure, which will deallocate the memory that contains the hcd_priv pointer, but not the memory it points to. Signed-off-by: Sarah Sharp commit 214f76f7d9198ddd090bd927a4bcd49391bfcd36 Author: Sarah Sharp Date: Tue Oct 26 11:22:02 2010 -0700 xhci: Always use usb_hcd in URB instead of converting xhci_hcd. Make sure to call into the USB core's link, unlink, and giveback URB functions with the usb_hcd pointer found by using urb->dev->bus. This will avoid confusion later, when the xHCI driver will deal with URBs from two separate buses (the USB 3.0 roothub and the faked USB 2.0 roothub). Assume xhci_urb_dequeue() will be called with the proper usb_hcd. Signed-off-by: Sarah Sharp commit aa1b13efb7cfa9f7bf4942c1e858463e335c9500 Author: Sarah Sharp Date: Thu Mar 3 05:40:51 2011 -0800 xhci: Modify check for TT info. Commit d199c96d by Alan Stern ensured that low speed and full speed devices below a high speed hub without a transaction translator (TT) would never get enumerated. Simplify the check for a TT in the xHCI virtual device allocation to only check if the usb_device references a parent's TT. Make sure not to set the TT information on LS/FS devices directly connected to the roothub. The xHCI host doesn't really have a TT, and the host will throw an error when those virtual device TT fields are set for a device connected to the roothub. We need this check because the xHCI driver will shortly register two roothubs: a USB 2.0 roothub and a USB 3.0 roothub. Signed-off-by: Sarah Sharp commit 22c6a35d41f71b5b40ba8debcb8bd4e8e291ae43 Author: Sarah Sharp Date: Mon Sep 13 12:01:02 2010 -0700 usb: Make USB 3.0 roothub have a SS EP comp descriptor. Make the USB 3.0 roothub registered by the USB core have a SuperSpeed Endpoint Companion Descriptor after the interrupt endpoint. All USB 3.0 devices are required to have this, and the USB 3.0 bus specification (section 10.13.1) says which values the descriptor should have. Signed-off-by: Sarah Sharp commit c70615740996823580bb8fb58461347b7ffaad9a Author: Sarah Sharp Date: Mon Dec 6 15:08:20 2010 -0800 USB: Clear "warm" port reset change. In USB 3.0, there are two types of resets: a "hot" port reset and a "warm" port reset. The hot port reset is always tried first, and involves sending the reset signaling for a shorter amount of time. But sometimes devices don't respond to the hot reset, and a "Bigger Hammer" is needed. External hubs and roothubs will automatically try a warm reset when the hot reset fails, and they will set a status change bit to indicate when there is a "BH reset" change. Make sure the USB core clears that port status change bit, or we'll get lots of status change notifications on the interrupt endpoint of the USB 3.0 hub. (Side note: you may be confused why the USB 3.0 spec calls the same type of reset "warm reset" in some places and "BH reset" in other places. "BH" reset is supposed to stand for "Big Hammer" reset, but it also stands for "Brad Hosler". Brad died shortly after the USB 3.0 bus specification was started, and they decided to name the reset after him. The suggestion was made shortly before the spec was finalized, so the wording is a bit inconsistent.) Signed-off-by: Sarah Sharp commit dbe79bbe9dcb22cb3651c46f18943477141ca452 Author: John Youn Date: Mon Sep 17 00:00:00 2001 -0700 USB 3.0 Hub Changes Update the USB core to deal with USB 3.0 hubs. These hubs have a slightly different hub descriptor than USB 2.0 hubs, with a fixed (rather than variable length) size. Change the USB core's hub descriptor to have a union for the last fields that differ. Change the host controller drivers that access those last fields (DeviceRemovable and PortPowerCtrlMask) to use the union. Translate the new version of the hub port status field into the old version that khubd understands. (Note: we need to fix it to translate the roothub's port status once we stop converting it to USB 2.0 hub status internally.) Add new code to handle link state change status. Send out new control messages that are needed for USB 3.0 hubs, like Set Hub Depth. This patch is a modified version of the original patch submitted by John Youn. It's updated to reflect the removal of the "bitmap" #define, and change the hub descriptor accesses of a couple new host controller drivers. Signed-off-by: John Youn Signed-off-by: Sarah Sharp Cc: Nobuhiro Iwamatsu Cc: Inaky Perez-Gonzalez Cc: Tony Olech Cc: "Robert P. J. Day" Cc: Max Vozeler Cc: Tejun Heo Cc: Yoshihiro Shimoda Cc: Rodolfo Giometti Cc: Mike Frysinger Cc: Anton Vorontsov Cc: Sebastian Siewior Cc: Lothar Wassmann Cc: Olav Kongas Cc: Martin Fuzzey Cc: Alan Stern Cc: David Brownell commit ad73dff32e04cad1ff2af89512bf489224b503cc Author: Sarah Sharp Date: Fri Mar 11 13:49:55 2011 -0800 xhci: Remove references to HC_STATE_RUNNING. The USB core will set hcd->state to HC_STATE_RUNNING before calling xhci_run, so there's no point in setting it twice. The USB core also doesn't pay attention to HC_STATE_RUNNING on the resume path anymore; it uses HCD_RH_RUNNING(), which looks at hcd->flags & (1U << HCD_FLAG_RH_RUNNING. Therefore, it's safe to remove the state set in xhci_bus_resume(). Signed-off-by: Sarah Sharp commit 4814030ce11f08350b7a91573487ad4b600dae34 Author: Sarah Sharp Date: Fri Mar 11 13:46:17 2011 -0800 usb: Initialize hcd->state roothubs. We would like to allow host controller drivers to stop using hcd->state. Unfortunately, some host controller drivers use hcd->state as an implicit way of telling the core that a controller has died. The roothub registration functions must assume the host died if hcd->state equals HC_STATE_HALT. To facilitate drivers that don't want to set hcd->state to HC_STATE_RUNNING in their initialization routines, we set the state to running before calling the host controller's start function. Signed-off-by: Sarah Sharp commit ac04e6ff3e32699920ae75b22e2bec7f7c631434 Author: Sarah Sharp Date: Fri Mar 11 08:47:33 2011 -0800 xhci: Remove references to HC_STATE_HALT. The xHCI driver doesn't ever test hcd->state for HC_STATE_HALT. The USB core recently stopped using it internally, so there's no point in setting it in the driver. We still need to set HC_STATE_RUNNING in order to make it past the USB core's hcd->state check in register_roothub(). Signed-off-by: Sarah Sharp commit bdfca5025a159c8bb966e3b87b0c084dd1f831a9 Author: Andiry Xu Date: Thu Jan 6 15:43:39 2011 +0800 xHCI: prolong host controller halt time limit xHCI 1.0 spec specifies the xHC shall halt within 16ms after software clears Run/Stop bit. In xHCI 0.96 spec the time limit is 16 microframes (2ms), it's too short and often cause dmesg shows "Host controller not halted, aborting reset." message when rmmod xhci-hcd. Modify the time limit to comply with xHCI 1.0 specification and prevents the warning message showing when remove xhci-hcd. Signed-off-by: Andiry Xu Signed-off-by: Sarah Sharp commit 019a35f1142b1cd153c8a38338515e633ec0cf77 Author: Andiry Xu Date: Thu Jan 6 15:43:17 2011 +0800 xHCI: Remove redundant variable in xhci_resume() Set hcd->state = HC_STATE_SUSPENDED if there is a power loss during system resume or the system is hibernated, otherwise leave it be. The variable old_state is redundant and made an unreachable code path, so remove it. Signed-off-by: Andiry Xu Signed-off-by: Sarah Sharp commit 518e848ea8e2932ce18ce2daef8ad5f55a145f27 Author: Sarah Sharp Date: Wed Dec 15 11:56:29 2010 -0800 xhci: Rename variables and reduce register reads. The xhci_bus_suspend() and xhci_bus_resume() functions are a bit hard to read, because they have an ambiguously named variable "port". Rename it to "port_index". Introduce a new temporary variable, "max_ports" that holds the maximum number of roothub ports the host controller supports. This will reduce the number of register reads, and make it easy to change the maximum number of ports when there are two roothubs. Signed-off-by: Sarah Sharp commit 1d5810b6923c76fc95e52d9d3491c91824c2f075 Author: Sarah Sharp Date: Thu Dec 9 14:52:41 2010 -0800 xhci: Rework port suspend structures for limited ports. The USB core only allows up to 31 (USB_MAXCHILDREN) ports under a roothub. The xHCI driver keeps track of which ports are suspended, which ports have a suspend change bit set, and what time the port will be done resuming. It keeps track of the first two by setting a bit in a u32 variable, suspended_ports or port_c_suspend. The xHCI driver currently assumes we can have up to 256 ports under a roothub, so it allocates an array of 8 u32 variables for both suspended_ports and port_c_suspend. It also allocates a 256-element array to keep track of when the ports will be done resuming. Since we can only have 31 roothub ports, we only need to use one u32 for each of the suspend state and change variables. We simplify the bit math that's trying to index into those arrays and set the correct bit, if we assume wIndex never exceeds 30. (wIndex is zero-based after it's decremented from the value passed in from the USB core.) Finally, we change the resume_done array to only hold 31 elements. Signed-off-by: Sarah Sharp Cc: Andiry Xu commit abc4f9b099e9e7db3f6f945210aee125571c236d Author: Sarah Sharp Date: Wed Dec 1 09:22:05 2010 -0800 USB: Fix usb_add_hcd() checkpatch errors. The irq enabling code is going to be refactored into a new function, so clean up some checkpatch errors before moving it. Signed-off-by: Sarah Sharp commit da13051cc756756f10b2da8ea97b05bdf84bd7bb Author: Sarah Sharp Date: Tue Nov 30 15:55:51 2010 -0800 USB: Remove bitmap #define from hcd.h Using a #define to redefine a common variable name is a bad thing, especially when the #define is in a header. include/linux/usb/hcd.h redefined bitmap to DeviceRemovable to avoid typing a long field in the hub descriptor. This has unintended side effects for files like drivers/usb/core/devio.c that include that file, since another header included after hcd.h has different variables named bitmap. Remove the bitmap #define and replace instances of it in the host controller code. Cleanup the spaces around function calls and square brackets while we're at it. Signed-off-by: Sarah Sharp Cc: Nobuhiro Iwamatsu Cc: Inaky Perez-Gonzalez Cc: Tony Olech Cc: "Robert P. J. Day" Cc: Max Vozeler Cc: Tejun Heo Cc: Yoshihiro Shimoda Cc: Rodolfo Giometti Cc: Mike Frysinger Cc: Anton Vorontsov Cc: Sebastian Siewior Cc: Lothar Wassmann Cc: Olav Kongas Cc: Martin Fuzzey Cc: Alan Stern Cc: David Brownell commit 0b8ca72a23df365a413e03f991bc6b8179dee13f Author: Sarah Sharp Date: Thu Oct 21 12:22:28 2010 -0700 xhci: Remove old no-op test. The test of placing a number of command no-ops on the command ring and counting the number of no-op events that were generated was only used during the initial xHCI driver bring up. This test is no longer used, so delete it. Signed-off-by: Sarah Sharp commit db7c7c0aeef51dba12d877875b8deb78d9886647 Author: Sarah Sharp Date: Wed Dec 29 22:03:07 2010 -0800 usb: Always return 0 or -EBUSY to the runtime PM core. The PM core reacts badly when the return code from usb_runtime_suspend() is not 0, -EAGAIN, or -EBUSY. The PM core regards this as a fatal error, and refuses to run anymore PM helper functions. In particular, usbfs_open() and other usbfs functions will fail because the PM core will return an error code when usb_autoresume_device() is called. This causes libusb and/or lsusb to either hang or segfault. If a USB device cannot suspend for some reason (e.g. a hub doesn't report it has remote wakeup capabilities), we still want lsusb and other userspace programs to work. So return -EBUSY, which will fill people's log files with failed tries, but will ensure userspace still works. Signed-off-by: Sarah Sharp commit 586ce098a23b6ab7383df853a84ae3d48dc889aa Author: Al Viro Date: Sun Mar 13 01:50:58 2011 -0500 compat breakage in preadv() and pwritev() Fix for a dumb preadv()/pwritev() compat bug - unlike the native variants, compat_... ones forget to check FMODE_P{READ,WRITE}, so e.g. on pipe the native preadv() will fail with -ESPIPE and compat one will act as readv() and succeed. Not critical, but it's a clear bug with trivial fix. Signed-off-by: Al Viro commit de4d768a428d9de943dd6dc82bcd61742955cb6e Author: Michael S. Tsirkin Date: Sun Mar 13 23:00:52 2011 +0200 vhost-net: remove unlocked use of receive_queue Use of skb_queue_empty(&sock->sk->sk_receive_queue) without taking the sk_receive_queue.lock is unsafe or useless. Take it out. Reported-by: Eric Dumazet Signed-off-by: Michael S. Tsirkin commit 783e3988544b94ff3918666b9f36866ac547fba1 Author: Jason Wang Date: Mon Jan 17 16:11:17 2011 +0800 vhost: lock receive queue, not the socket vhost takes a sock lock to try and prevent the skb from being pulled from the receive queue after skb_peek. However this is not the right lock to use for that, sk_receive_queue.lock is. Fix that up. Signed-off-by: Michael S. Tsirkin commit 633d2bdedc3b81f202bda8fdad17aeb08809b7df Author: Allan Stephens Date: Sun Mar 13 15:44:07 2011 -0500 tipc: Update maintenance information Updates TIPC maintenance information to reflect changes that have taken place during TIPC 2.0 development, including: - removal of directories that have been deleted - removal of websites that have been decommisioned - removal of sidestream SCM repositories that are no longer used - addition of netdev as appropriate list for kernel code. Grateful acknowledgement is given to Joe Perches , who reported the stale file entry that triggered the update. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 390bce4237487975c2168aa5fa786f75ead66852 Author: Allan Stephens Date: Fri Mar 11 13:22:53 2011 -0500 tipc: Eliminate obsolete routine for handling routed messages Eliminates a routine that is used in handling messages arriving from another cluster or zone. Such messages can no longer be received by TIPC now that multi-cluster and multi-zone network support has been eliminated. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 7945c1fb02ef08316df8c054ce180bf3f4e35ae4 Author: Allan Stephens Date: Fri Mar 11 13:09:28 2011 -0500 tipc: Eliminate remaining support for routing table messages Gets rid of all remaining code relating to ROUTE_DISTRIBUTOR messages. These messages were only used in multi-cluster and multi-zone networks, which TIPC no longer supports. (For safety, TIPC now treats such messages the same way that it handles other unrecognized messages.) Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 50d492321a2d94aa2ff5e26e73af08d937f8acb0 Author: Allan Stephens Date: Mon Feb 28 11:47:36 2011 -0500 tipc: Remove bearer flag indicating existence of broadcast address Eliminates the flag in the TIPC bearer structure that indicates if the bearer supports broadcasting, since the flag is always set to 1 and serves no useful purpose. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit f9107ebe7d18a04f07d2a990a912efa2a2ac1873 Author: Allan Stephens Date: Mon Feb 28 11:04:08 2011 -0500 tipc: Don't respond to neighbor discovery request on blocked bearer Adds a check to prevent TIPC from trying to respond to an incoming LINK_CONFIG request message if the associated bearer is currently prohibited from sending messages. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit d901a42b271dbd94983b798955403dcf1afa60ac Author: Allan Stephens Date: Mon Feb 28 16:02:30 2011 -0500 tipc: Eliminate unnecessary constant for neighbor discovery msg size Eliminates an unnecessary constant that defines the size of a LINK_CONFIG message, and uses one of the existing standard message size symbols in its place. (The defunct constant was located in the wrong place anyway, since it was grouped with other constants that define message users instead of message sizes.) Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit a2b58de2e3993a23b092ae54a35c38bf0dacb618 Author: Allan Stephens Date: Mon Feb 28 15:03:22 2011 -0500 tipc: Remove unused field in bearer structure Eliminates a field in TIPC's bearer objects that is set, but never referenced. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 50d3e6399a61fca53c5c440a79f71299db66b803 Author: Allan Stephens Date: Mon Feb 28 14:56:15 2011 -0500 tipc: Correct misnamed references to neighbor discovery domain Renames items that are improperly labelled as "network scope" items (which are represented by simple integer values) rather than "network domain" items (which are represented by -type network addresses). This change is purely cosmetic, and does not affect the operation of TIPC. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 37b9c08a88f9a82456bb11fa050cccb544e8dc60 Author: Allan Stephens Date: Mon Feb 28 11:32:27 2011 -0500 tipc: Optimizations to link creation code Enhances link creation code as follows: 1) Detects illegal attempts to add a requested link earlier in the link creation process. This prevents TIPC from wasting time initializing a link object it then throws away, and also eliminates the code needed to do the throwing away. 2) Passes in the node object associated with the requested link. This allows TIPC to eliminate a search to locate the node object, as well as code that attempted to create the node if it doesn't exist. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit fa2bae2d5bede252445cc457737d00f9036c41c3 Author: Allan Stephens Date: Mon Feb 28 10:56:23 2011 -0500 tipc: Give Tx of discovery responses priority over link messages Delay releasing the node lock when processing a neighbor discovery message until after the optional discovery response message has been sent. This helps ensure that any link protocol messages sent by a link endpoint created as a result of a neighbor discovery request are received after the discovery response is received, thereby giving the receiving node a chance to create a peer link endpoint to consume those link protocol messages, if one does not already exist. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit a728750e4f0c9500741406299f1817022d411d33 Author: Allan Stephens Date: Mon Feb 28 10:03:05 2011 -0500 tipc: Cosmetic changes to neighbor discovery logic Reworks the appearance of the routine that processes incoming LINK_CONFIG messages to keep the main logic flow at a consistent level of indentation, and to add comments outlining the various phases involved in processing each message. This rework is being done to allow upcoming enhancements to this routine to be integrated more cleanly. The diff isn't really readable, so know that it was a case of the old code being like: tipc_disc_recv_msg(..) { if (in_own_cluster(orig)) { ... lines and lines of stuff ... } } which is now replaced with the more sane: tipc_disc_recv_msg(..) { if (!in_own_cluster(orig)) return; ... lines and lines of stuff ... } Instances of spin locking within the reindented block were replaced with the identical tipc_node_[un]lock() abstractions. Note that all these changes are cosmetic in nature, and do not change the way LINK_CONFIG messages are processed. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 75f0aa49908992dbeb75710b72cbedb5cff9680f Author: Allan Stephens Date: Mon Feb 28 15:30:20 2011 -0500 tipc: Fix redundant link field handling in link protocol message Ensures that the "redundant link exists" field of the LINK_PROTOCOL messages sent by a link endpoint is set if and only if the sending node has at least one other working link to the peer node. Previously, the bit was set only if there were at least 2 working links to the peer node, meaning the bit was incorrectly left unset in messages sent by a non-working link endpoint when exactly one alternate working link was available. The revised code now takes the state of the link sending the message into account when deciding if an alternate link exists. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 77f167fcce4d2ea144d92891d1e0fc0c50554082 Author: Allan Stephens Date: Mon Feb 28 15:30:20 2011 -0500 tipc: make msg_set_redundant_link() consistent with other set ops All the other boolean like msg_set_X(m) operations don't export both a msg_set_X(a) and a msg_clear_X(m), but instead just have the single msg_set_X(m, val) variant. Make the redundant_link one consistent by having the set take a value, and delete the msg_clear_redundant_link() anomoly. This is a cosmetic change and should not change behaviour. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 8f19afb2dbc885befef2a4e7931dfcb51702a212 Author: Paul Gortmaker Date: Mon Feb 28 11:36:21 2011 -0400 tipc: cosmetic - function names are not to be full sentences Function names like "tipc_node_has_redundant_links" are unweildy and result in long lines even for simple lines. The "has" doesn't contribute any value add, so dropping that is a slight step in the right direction. This is a cosmetic change, basic result of: for i in `grep -l tipc_node_has_ *` ; do sed -i s/tipc_node_has_/tipc_node_/ $i ; done Signed-off-by: Paul Gortmaker commit e7b3acb6a85266dfd3e102b3d15b51b0ecd6bc2e Author: Allan Stephens Date: Sun Feb 27 14:43:52 2011 -0500 tipc: Eliminate timestamp from link protocol messages Removes support for the timestamp field of TIPC's link protocol messages. This field was previously used to hold an OS-dependent timestamp value that was used to assist in debugging early versions of TIPC. The field has now been deemed unnecessary and has been removed from the latest TIPC specification. This change has no impact on the operation of TIPC since the field was set by TIPC, but never referenced. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 34e46258cb9f53b41e8ffd2e9acd58e0cf64b158 Author: Allan Stephens Date: Fri Feb 25 19:11:25 2011 -0500 tipc: manually inline net_start/stop, make assoc. vars static Relocates network-related variables into the subsystem files where they are now primarily used (following the recent rework of TIPC's node table), and converts globals into locals where possible. Changes the initialization of tipc_num_links from run-time to compile-time, and eliminates the net_start routine that becomes empty as a result. Also eliminates the corresponding net_stop routine by moving its (trivial) content into the one location that called the routine. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 672d99e19a12b703c9e2d71ead8fb8b8a85a3886 Author: Allan Stephens Date: Fri Feb 25 18:42:52 2011 -0500 tipc: Convert node object array to a hash table Replaces the dynamically allocated array of pointers to the cluster's node objects with a static hash table. Hash collisions are resolved using chaining, with a typical hash chain having only a single node, to avoid degrading performance during processing of incoming packets. The conversion to a hash table reduces the memory requirements for TIPC's node table to approximately the same size it had prior to the previous commit. In addition to the hash table itself, TIPC now also maintains a linked list for the node objects, sorted by ascending network address. This list allows TIPC to continue sending responses to user space applications that request node and link information in sorted order. The list also improves performance when name table update messages are sent by making it easier to identify the nodes that must be notified. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit f831c963b5c20bec230edce89e25f369996be5db Author: Allan Stephens Date: Fri Feb 25 14:22:11 2011 -0500 tipc: Eliminate configuration for maximum number of cluster nodes Gets rid of the need for users to specify the maximum number of cluster nodes supported by TIPC. TIPC now automatically provides support for all 4K nodes allowed by its addressing scheme. Note: This change sets TIPC's memory usage to the amount used by a maximum size node table with 4K entries. An upcoming patch that converts the node table from a linear array to a hash table will compact the node table to a more efficient design, but for clarity it is nice to have all the Kconfig infrastruture go away separately. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit d1bcb11544109114d72965afea7805cc3e16a83a Author: Allan Stephens Date: Fri Feb 25 10:01:58 2011 -0500 tipc: Split up unified structure of network-related variables Converts the fields of the global "tipc_net" structure into individual variables. Since the struct was never referenced as a complete unit, its existence was pointless. This will facilitate upcoming changes to TIPC's node table and simpify upcoming relocation of the variables so they are only visible to the files that actually use them. This change is essentially cosmetic in nature, and doesn't affect the operation of TIPC. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 9df3b7eb6ec1c7734482f782bf8335a2737c02f0 Author: Allan Stephens Date: Thu Feb 24 13:20:20 2011 -0500 tipc: Fix problem with missing link in "tipc-config -l" output Removes a race condition that could cause TIPC's internal counter of the number of links it has to neighboring nodes to have the incorrect value if two independent threads of control simultaneously create new link endpoints connecting to two different nodes using two different bearers. Such under counting would result in TIPC failing to list the final link(s) in its response to a configuration request to list all of the node's links. The counter is now updated atomically to ensure that simultaneous increments do not interfere with each other. Thanks go to Peter Butler for his assistance in diagnosing and fixing this problem. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 71092ea122062012f8e4b7fb2f9a747212d1479c Author: Allan Stephens Date: Wed Feb 23 14:52:14 2011 -0500 tipc: Add support for SO_RCVTIMEO socket option Adds support for the SO_RCVTIMEO socket option to TIPC's socket receive routines. Thanks go out to Raj Hegde for his contribution to the development and testing this enhancement. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit f1379173326de4c745c4f610501486e4f3bd9248 Author: Allan Stephens Date: Wed Feb 23 14:13:41 2011 -0500 tipc: Cosmetic changes to node subscription code Relocates the code that notifies users of node subscriptions so that it is adjacent to the rest of the routines that implement TIPC's node subscription capability. Renames the name table routine that is invoked by a node subscription to better reflect its purpose and to be consistent with other, similar name table routines. These changes are cosmetic in nature, and do not alter the behavior of TIPC. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 431697eb60d2d36614096aff12bd1b826a9f9bc1 Author: Allan Stephens Date: Wed Feb 23 13:51:15 2011 -0500 tipc: Prevent null pointer error when removing a node subscription Prevents a null pointer dereference from occurring if a node subscription is triggered at the same time that the subscribing port or publication is terminating the subscription. The problem arises if the triggering routine asynchronously activates and deregisters the node subscription while deregistration is already underway -- the deregistration routine may find that the pointer it has just verified to be non-NULL is now NULL. To avoid this race condition the triggering routine now simply marks the node subscription as defunct (to prevent it from re-activating) instead of deregistering it. The subscription is now both deregistered and destroyed only when the subscribing port or publication code terminates the node subscription. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit a3796f895ff2917aea331a8d40036c73452b2203 Author: Allan Stephens Date: Wed Feb 23 11:44:49 2011 -0500 tipc: Add network address mask helper routines Introduces a pair of helper routines that convert the network address for a TIPC node into the network address for its cluster or zone. This is a cosmetic change designed to avoid future errors caused by the incorrect use of address bitmasks, and does not alter the existing operation of TIPC. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit aa8472948487432bacbd099b86e313bc16319495 Author: Allan Stephens Date: Mon Feb 21 09:45:31 2011 -0500 tipc: Correct broadcast link peer info when displaying links Fixes a typo in the calculation of the network address of a node's own cluster when generating a response to the configuration command that lists all of the node's links. The correct mask value for a network address uses 1's for the 8-bit zone and 12-bit cluster parts and 0's for the 12-bit node part. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 0232fd0ac475e5f5ec19a69d53467be11bec9833 Author: Allan Stephens Date: Mon Feb 21 09:45:40 2011 -0500 tipc: Allow receiving into iovec containing multiple entries Enhances TIPC's socket receive routines to support iovec structures containing more than a single entry. This change leverages existing sk_buff routines to do most of the work; the only significant change to TIPC itself is that an sk_buff now records how much data has been already consumed as an numeric offset, rather than as a pointer to the first unread data byte. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 94249369e9930276e30087da205349a55478cbb5 Author: Jason Wang Date: Mon Jan 17 16:11:08 2011 +0800 vhost-net: Unify the code of mergeable and big buffer handling Codes duplication were found between the handling of mergeable and big buffers, so this patch tries to unify them. This could be easily done by adding a quota to the get_rx_bufs() which is used to limit the number of buffers it returns (for mergeable buffer, the quota is simply UIO_MAXIOV, for big buffers, the quota is just 1), and then the previous handle_rx_mergeable() could be resued also for big buffers. Signed-off-by: Jason Wang Signed-off-by: Michael S. Tsirkin commit cfbdab951369f15de890597530076bf0119361be Author: Jason Wang Date: Mon Jan 17 16:10:59 2011 +0800 vhost-net: check the support of mergeable buffer outside the receive loop No need to check the support of mergeable buffer inside the recevie loop as the whole handle_rx()_xx is in the read critical region. So this patch move it ahead of the receiving loop. Signed-off-by: Jason Wang Signed-off-by: Michael S. Tsirkin commit 23c483d29fcbc35591131019660b2630cc6629ae Author: Mark Brown Date: Sat Mar 12 20:48:34 2011 -0800 Input: wm831x-ts - default pressure measurements on tslib expects pressure measurements so enable them by default for better compatibility. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 47340bd9fefb571888836da942b5aee0e85e959c Author: Andy Botting Date: Sat Mar 12 20:27:22 2011 -0800 Input: bcm5974 - add support for MacBookPro8 This patch add multitouch support for the MacBookPro8,1 and MacBookPro8,2 models. Cc: stable@kernel.org Signed-off-by: Andy Botting Signed-off-by: Henrik Rydberg Acked-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit 84eb5aa6ccb2a62c40722b8c5fb1338ea12155a3 Author: Ping Cheng Date: Sat Mar 12 20:35:18 2011 -0800 Input: wacom - support 2FGT in MT format Reviewed-by: Henrik Rydberg Reviewed-by: Chris Bagwell Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit a43c7c53835ba1ff4e488806d0f8b98e9dce9b0e Author: Ping Cheng Date: Sat Mar 12 20:34:42 2011 -0800 Input: wacom - support one finger touch the touchscreen way There are two types of 1FGT devices supported in wacom_wac.c. Changing them to follow the existing touchscreen format, i.e., only report BTN_TOUCH as a valid tool type. Touch data will be ignored if pen is in proximity. This requires a touch up event sent if touch was down when pen comes in. The touch up event should be sent before any pen events are emitted. Otherwise, two pointers would race for the cursor. However, we can not send a touch up inside wacom_tpc_pen since pen and touch are on different logical port. That is why we have to check if touch is up before sending pen events. Reviewed-by: Henrik Rydberg Reviewed-by: Chris Bagwell Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 8aa9a9ac89baa0e423da0211e0883d28165697e0 Author: Ping Cheng Date: Sat Mar 12 20:34:11 2011 -0800 Input: wacom - process pen data in its own routine So it would be easier for patch reviewers to follow the data path. Reviewed-by: Henrik Rydberg Reviewed-by: Chris Bagwell Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 4fc193814b3a269c1ea89aefdb56d4f957680d44 Author: Ping Cheng Date: Sat Mar 12 20:33:33 2011 -0800 Input: wacom - do not send 2FGT Tablet PC events in TAP format 2FGT Tablet PC touch events were processed in _TAP_ format. Remove them so we can change to _MT_ format. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit bef55aebd560c5a6f8883c421abccee39978c58c Author: David S. Miller Date: Sat Mar 12 17:17:10 2011 -0500 decnet: Convert to use flowidn where applicable. Signed-off-by: David S. Miller commit 1958b856c1a59c0f1e892b92debb8c9fe4f364dc Author: David S. Miller Date: Sat Mar 12 16:36:19 2011 -0500 net: Put fl6_* macros to struct flowi6 and use them again. Signed-off-by: David S. Miller commit 4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c Author: David S. Miller Date: Sat Mar 12 16:22:43 2011 -0500 ipv6: Convert to use flowi6 where applicable. Signed-off-by: David S. Miller commit 9cce96df5b76691712dba22e83ff5efe900361e1 Author: David S. Miller Date: Sat Mar 12 03:00:33 2011 -0500 net: Put fl4_* macros to struct flowi4 and use them again. Signed-off-by: David S. Miller commit f42454d632753d71ea1a2df09be7bbda32b6372d Author: David S. Miller Date: Sat Mar 12 02:44:16 2011 -0500 ipv4: Kill fib_semantic_match declaration from fib_lookup.h This function no longer exists. Signed-off-by: David S. Miller commit 7e1dc7b6f709dfc1a9ab4b320dbe723f45992693 Author: David S. Miller Date: Sat Mar 12 02:42:11 2011 -0500 net: Use flowi4 and flowi6 in xfrm layer. Signed-off-by: David S. Miller commit 2032656e76b5355151effdff14de4a1a58643915 Author: David S. Miller Date: Sat Mar 12 02:30:50 2011 -0500 net: Add flowi6_* member helper macros. Signed-off-by: David S. Miller commit a1bbb0e698b4ba18c6356564923bb395bed0e576 Author: David S. Miller Date: Sat Mar 12 02:16:48 2011 -0500 netfilter: Use flowi4 and flowi6 in xt_TCPMSS Signed-off-by: David S. Miller commit 5a49d0e04d62ab3f85aea4d15e0ca8be9b0ee89b Author: David S. Miller Date: Sat Mar 12 02:14:05 2011 -0500 netfilter: Use flowi4 and flowi6 in nf_conntrack_h323_main Signed-off-by: David S. Miller commit b6f21b268026165a239edb5f4d7120eacf7bc593 Author: David S. Miller Date: Sat Mar 12 02:09:18 2011 -0500 ipv4: Use flowi4 in UDP Signed-off-by: David S. Miller commit 3073e5ab927487328d48cd74faac0f95a8336867 Author: David S. Miller Date: Sat Mar 12 02:06:33 2011 -0500 netfilter: Use flowi4 in nf_nat_standalone.c Signed-off-by: David S. Miller commit da91981bee8de20bcd06ee0dbddd53d62d23b1bd Author: David S. Miller Date: Sat Mar 12 02:04:50 2011 -0500 ipv4: Use flowi4 in ipmr code. Signed-off-by: David S. Miller commit 9ade22861f922344788321e374c542c92bc049b6 Author: David S. Miller Date: Sat Mar 12 02:02:42 2011 -0500 ipv4: Use flowi4 in FIB layer. Signed-off-by: David S. Miller commit 9d6ec938019c6b16cb9ec96598ebe8f20de435fe Author: David S. Miller Date: Sat Mar 12 01:12:47 2011 -0500 ipv4: Use flowi4 in public route lookup interfaces. Signed-off-by: David S. Miller commit 68a5e3dd0a0056d8b349f9eea3756adda53ec17a Author: David S. Miller Date: Fri Mar 11 20:07:33 2011 -0500 ipv4: Use struct flowi4 internally in routing lookups. We will change the externally visible APIs next. Signed-off-by: David S. Miller commit 22bd5b9b13f2931ac80949f8bfbc40e8cab05be7 Author: David S. Miller Date: Fri Mar 11 19:54:08 2011 -0500 ipv4: Pass ipv4 flow objects into fib_lookup() paths. To start doing these conversions, we need to add some temporary flow4_* macros which will eventually go away when all the protocol code paths are changed to work on AF specific flowi objects. Signed-off-by: David S. Miller commit 59b1a94c9a034e63a5e030a5154be1d4d84677d9 Author: David S. Miller Date: Fri Mar 11 19:23:02 2011 -0500 net: Add flowiX_to_flowi() shorthands. This is just a shorthand which will help in passing around AF specific flow structures as generic ones. Signed-off-by: David S. Miller commit 56bb8059e1a8bf291054c26367564dc302f6fd8f Author: David S. Miller Date: Sat Mar 12 00:44:35 2011 -0500 net: Break struct flowi out into AF specific instances. Now we have struct flowi4, flowi6, and flowidn for each address family. And struct flowi is just a union of them all. It might have been troublesome to convert flow_cache_uli_match() but as it turns out this function is completely unused and therefore can be simply removed. Signed-off-by: David S. Miller commit 6281dcc94a96bd73017b2baa8fa83925405109ef Author: David S. Miller Date: Sat Mar 12 00:43:55 2011 -0500 net: Make flowi ports AF dependent. Create two sets of port member accessors, one set prefixed by fl4_* and the other prefixed by fl6_* This will let us to create AF optimal flow instances. It will work because every context in which we access the ports, we have to be fully aware of which AF the flowi is anyways. Signed-off-by: David S. Miller commit 08704bcbf022786532b5f188935ab6619906049f Author: David S. Miller Date: Fri Mar 11 18:36:42 2011 -0500 net: Create union flowi_uli This will be used when we have seperate flowi types. Signed-off-by: David S. Miller commit 806566cc78390b1565ded91712cd28619cea5f57 Author: David S. Miller Date: Fri Mar 11 18:22:00 2011 -0500 net: Create struct flowi_common Pull out the AF independent members of struct flowi into a new struct flowi_common Signed-off-by: David S. Miller commit 1d28f42c1bd4bb2363d88df74d0128b4da135b4a Author: David S. Miller Date: Sat Mar 12 00:29:39 2011 -0500 net: Put flowi_* prefix on AF independent members of struct flowi I intend to turn struct flowi into a union of AF specific flowi structs. There will be a common structure that each variant includes first, much like struct sock_common. This is the first step to move in that direction. Signed-off-by: David S. Miller commit ca116922afa8cc5ad46b00c0a637b1cde5ca478a Author: David S. Miller Date: Fri Mar 11 15:59:31 2011 -0500 xfrm: Eliminate "fl" and "pol" args to xfrm_bundle_ok(). There is only one caller of xfrm_bundle_ok(), and that always passes these parameters as NULL. Signed-off-by: David S. Miller commit fbef0a40919a80eb8a02fe9d3b96dfdcdebf4317 Author: David S. Miller Date: Fri Mar 11 15:55:37 2011 -0500 net: Remove unnecessary padding in struct flowi Move tos, scope, proto, and flags to the beginning of the structure. Signed-off-by: David S. Miller commit 78fbfd8a653ca972afe479517a40661bfff6d8c3 Author: David S. Miller Date: Sat Mar 12 00:00:52 2011 -0500 ipv4: Create and use route lookup helpers. The idea here is this minimizes the number of places one has to edit in order to make changes to how flows are defined and used. Signed-off-by: David S. Miller commit 1561747ddf9d28185548687b11aae7074d6129c4 Merge: ab1ebc9 1f4a024 Author: David S. Miller Date: Sat Mar 12 14:41:02 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit 2563afa9ec6970f3545906382cc986ee012f60ec Merge: bf5ea02 e4fcaef Author: Florian Tobias Schandinat Date: Sat Mar 12 21:54:56 2011 +0000 Merge branch 'viafb-pll' into viafb-next commit 0ae43810976bc969ee158510c4acbe70ed136e61 Author: Dmitry Torokhov Date: Fri Mar 11 00:27:34 2011 -0800 HID: ACRUX - activate the device immediately after binding This device does not tolerate delayed opening and goes into a coma if we try to that. Ubuntu even has a crutch for udev that opened the device upon seeing it for the first time, but it did not work if we happened to boot with the device attached, since by the time userspace got around opening the device it was too late. Let's start the device immediately to deal with this issue. Reported-by: Sergei Kolzun Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit 8688a1a8637c6b833b9b70148809db4538352d2e Merge: 3afdb0f f91f9cd Author: Russell King Date: Sat Mar 12 20:33:51 2011 +0000 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable commit 6e6823d17b157f185be09f4c70181299f9273f0b Author: Torben Hohn Date: Thu Mar 3 18:26:14 2011 +0100 posix-clocks: Check write permissions in posix syscalls pc_clock_settime() and pc_clock_adjtime() do not check whether the fd was opened in write mode, so a clock can be set with a read only fd. [ tglx: We deliberately do not return -EPERM as we want this to be distingushable from the capability based permission check ] Signed-off-by: Torben Hohn LKML-Reference: <1299173174-348-4-git-send-email-torbenh@gmx.de> Cc: Richard Cochran Cc: John Stultz Cc: Thomas Gleixner commit ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78 Merge: 70d279a 409ec36 Author: David S. Miller Date: Sat Mar 12 11:06:59 2011 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 167400d34070ebbc408dc0f447c4ddb4bf837360 Author: Justin TerAvest Date: Sat Mar 12 16:54:00 2011 +0100 blk-cgroup: Add unaccounted time to timeslice_used. There are two kind of times that tasks are not charged for: the first seek and the extra time slice used over the allocated timeslice. Both of these exported as a new unaccounted_time stat. I think it would be good to have this reported in 'time' as well, but that is probably a separate discussion. Signed-off-by: Justin TerAvest Signed-off-by: Jens Axboe commit c0185808eb85139f45dbfd0de66963c498d0c4db Author: Thomas Gleixner Date: Mon Feb 7 02:24:08 2011 +0100 x86: Enable forced interrupt threading support All non threadeable interrupts are marked. Enable forced irq threading support. Signed-off-by: Thomas Gleixner commit 9bbbff25b31bbfdb512563cc5a14bcde5bf29bdf Author: Thomas Gleixner Date: Thu Jan 27 18:17:01 2011 +0100 x86: Mark low level interrupts IRQF_NO_THREAD These cannot be threaded. Signed-off-by: Thomas Gleixner commit 517e49815677b43b26d3167aadca83919ef36a45 Author: Thomas Gleixner Date: Thu Dec 16 17:59:57 2010 +0100 x86: Use generic show_interrupts Signed-off-by: Thomas Gleixner commit 1a0e62a49ad417712cfa79a395f6c39f67aadb44 Author: Thomas Gleixner Date: Sat Mar 12 13:47:18 2011 +0100 x86: ioapic: Avoid redundant lookup of irq_cfg The caller of ioapic_register_intr() has a pointer to the irq_cfg for the irq already. Hand it in to avoid a full lookup. In msi_compose_msg() the pointer to irq_cfg is already available. No need to look it up again. Signed-off-by: Thomas Gleixner commit 08221110e88ae101acf2464154f98e6d1b1ab21c Author: Thomas Gleixner Date: Fri Feb 4 18:56:11 2011 +0100 x86: ioapic: Use new move_irq functions Use the functions which take irq_data. We already have a pointer to irq_data. That avoids a sparse irq lookup in move_*_irq. Signed-off-by: Thomas Gleixner commit 51c43ac6e4540786a6d79ea318b30f7bfa615ec7 Author: Thomas Gleixner Date: Thu Feb 10 21:40:36 2011 +0100 x86: Use the proper accessors in fixup_irqs() Signed-off-by: Thomas Gleixner commit 5451ddc5621550a2f4f82ddeac938b3ca392525f Author: Thomas Gleixner Date: Sat Feb 5 15:35:51 2011 +0100 x86: ioapic: Use irq_data->state Use the state information in irq_data. That avoids a radix-tree lookup from apic_ack_level() and simplifies setup_ioapic_dest(). Signed-off-by: Thomas Gleixner commit c60eaf25cd211d2282a6edddb3ce26b1e5795097 Author: Thomas Gleixner Date: Fri Mar 11 13:17:16 2011 +0100 x86: ioapic: Simplify irq chip and handler setup Use pointers instead of ugly multiline if/else constructs. Signed-off-by: Thomas Gleixner commit 2c778651f73d92edb847e65d371bb29b17c7ca60 Author: Thomas Gleixner Date: Sat Mar 12 12:20:43 2011 +0100 x86: Cleanup the genirq name space genirq is switching to a consistent name space for the irq related functions. Convert x86. Conversion was done with coccinelle. Signed-off-by: Thomas Gleixner commit b66538014f7eae121afa99ca18488fd67536a1bf Author: Jens Axboe Date: Sat Mar 12 13:47:51 2011 +0100 Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation" This reverts commit 978eb516a4e1a1b47163518d6f5d5e81ab27a583. The commit was broken, relying on other changes that have not been committed yet. Signed-off-by: Jens Axboe commit c1c5e4d463f844e5d44cafab752049267c102ca3 Merge: cfe08bb d209a69 Author: Thomas Gleixner Date: Sat Mar 12 13:23:37 2011 +0100 Merge branch 'irq/core' into x86/irq Reason: Enabling irq threads and update to latest genirq functionality requires the core code Signed-off-by: Thomas Gleixner commit cfe08bba1e0017d94a8f738a195d3a2b479327e3 Merge: 58bff94 abb0052 Author: Thomas Gleixner Date: Sat Mar 12 13:22:22 2011 +0100 Merge branch 'x86/apic' into x86/irq Reason: Update to latest genirq code conflicts with pending apic changes Signed-off-by: Thomas Gleixner commit 1f4a0244ff002672be855ff2eaa4a29a63d42d42 Author: John Fastabend Date: Thu Mar 10 12:06:12 2011 +0000 ixgbe: DCB, PFC not cleared until reset occurs The PFC configuration is not cleared until the device is reset. This has not been a problem because setting DCB attributes forced a hardware reset. Now that we no longer require this reset to occur PFC remains configured even after being disabled until the device is reset. This removes a goto in the PFC hardware set routines for 82598 and 82599 devices that was short circuiting the clear. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit ff4ab2061199cdb938282d302d5044b1858e28c8 Author: Lior Levy Date: Fri Mar 11 02:03:07 2011 +0000 ixgbe: add support for VF Transmit rate limit using iproute2 Implemented ixgbe_ndo_set_vf_bw function which is being used by iproute2 tool. In addition, updated ixgbe_ndo_get_vf_config function to show the actual rate limit to the user. The rate limitation can be configured only when the link is up and the link speed is 10Gb. The rate limit value can be 0 or ranged between 11 and actual link speed measured in Mbps. A value of '0' disables the rate limit for this specific VF. iproute2 usage will be 'ip link set ethX vf Y rate Z'. After the command is made, the rate will be changed instantly. To view the current rate limit, use 'ip link show ethX'. The rates will be zeroed only upon driver reload or a link speed change. This feature is being supported by 82599 and X540 devices. Signed-off-by: Lior Levy Signed-off-by: Jeff Kirsher commit 1390a59452a0895d3fea5b5504fa75ba36c13a74 Author: John Fastabend Date: Wed Mar 9 04:46:16 2011 +0000 ixgbe: DCB, set minimum bandwidth per traffic class DCB provides a guaranteed bandwidth in the case with 0% bandwidth then no bandwidth is guaranteed. However the traffic class should still be able to transmit traffic. For this to work the traffic class must be given the minimum credits required to send a frame. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 6fb456a07c68913516da9de90d3849ee9821dea8 Author: Emil Tantilov Date: Sat Mar 5 08:02:18 2011 +0000 ixgbe: correct typo in define name VF Free Running Timer register name missing an F. Signed-off-by: Emil Tantilov Acked-by: Greg Rose Tested-by: Evan Swanson Signed-off-by: Jeff Kirsher commit 9dda173667207fe59d380e522d318c144dc032f7 Author: Emil Tantilov Date: Sat Mar 5 01:28:07 2011 +0000 ixgbe: update PHY code to support 100Mbps as well as 1G/10G This change updates the PHY setup code to support 100Mbps capable PHYs as well as 10G and 1Gbps. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 7e7eb4346329da3b9fd4b8d4a5a66d327d9fff6c Author: Emil Tantilov Date: Fri Mar 4 03:20:59 2011 +0000 ixgbe: remove timer reset to 0 on timeout The VF mailbox polling for acks and messages would reset the timer to zero on a timeout. Under heavy load a timeout may actually occur without being the result of an error and when this occurs it is not practical to perform a full VF driver reset on every message timeout. Instead, just return an error (which is already done) and the VF driver will have an opportunity to retry the operation. Signed-off-by: Emil Tantilov Acked-by: Greg Rose Signed-off-by: Jeff Kirsher commit c27931da83bc486e192c8dfdab903ba51e176c54 Author: John Fastabend Date: Wed Feb 23 05:58:25 2011 +0000 ixgbe: DCB during ifup use correct CEE or IEEE mode DCB settings are cleared in the hardware across link events during ifup ixgbe reprograms the hardware for DCB if it is enabled. Now that we have two modes CEE or IEEE we need to use the correct set of configuration data. This patch checks the dcbx_cap bits and then enables the device in the correct mode. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 17049d30c2dec6f26d6165cc135578f9e41d53d3 Author: John Fastabend Date: Wed Feb 23 05:58:19 2011 +0000 ixgbe: IEEE 802.1Qaz, implement priority assignment table This patch adds support to use the priority assignment table in the ieee_ets structure to map priorities to traffic classes. Previously ixgbe only supported a 1:1 mapping. Now we can enable and disable hardware DCB support when multiple traffic classes are actually being used. This allows the default case all priorities mapped to traffic class 0 to work in normal hardware mode and utilize the full packet buffer. This patch does not address putting the hardware in 4TC mode so packet buffer space may be underutilized in this case. A follow up patch can address this optimization. But at least we have the hooks to do this now. Also CEE will behave as it always has and map priorities 1:1 with traffic classes. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 3b97fd695453ced96f22bdf1a84453f6744d25cc Author: John Fastabend Date: Wed Feb 23 05:58:14 2011 +0000 ixgbe: DCB, missed translation from 8021Qaz TSA to CEE link strict The patch below allowed IEEE 802.1Qaz and CEE DCB hardware configurations to use common hardware set routines, commit 88eb696cc6a7af8f9272266965b1a4dd7d6a931b Author: John Fastabend Date: Thu Feb 10 03:02:11 2011 -0800 ixgbe: DCB, abstract out dcb_config from DCB hardware configuration However the case when CEE link strict and group strict are set was missed and are currently being mapped incorrectly in some configurations. This patch resolves this. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 8187cd485b1a74b6ae258786b9ade3ecaafec318 Author: John Fastabend Date: Wed Feb 23 05:58:08 2011 +0000 ixgbe: DCB: enable RSS to be used with DCB RSS had previously been disabled when DCB was enabled because DCB was single queued per traffic class. Now that DCB implements multiple Tx/Rx rings per traffic class enable RSS. Here RSS hashes across the queues in the traffic class. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 24095aa347a32673cf220fc0bd0b78d28ba0a69e Author: John Fastabend Date: Wed Feb 23 05:58:03 2011 +0000 ixgbe: enable ndo_tc_setup This patch adds the ndo_tc_setup to ixgbe. By default we set the device to use strict priority. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit e5b646355770d34eab360ebae93c56c407dfe803 Author: John Fastabend Date: Tue Mar 8 03:44:52 2011 +0000 ixgbe: DCB, use multiple Tx rings per traffic class This enables multiple {Tx|Rx} rings per traffic class while in DCB mode. In order to get this working as expected the tc_to_tx net device mapping is configured as well as the prio_tc_map. skb priorities are mapped across a range of queue pairs to get a distribution per traffic class. The maximum number of queue pairs used while in DCB mode is capped at 64. The hardware max is actually 128 queues but 64 is sufficient for now and allocating more seemed a bit excessive. It is easy enough to increase the cap later if need be. To get the 802.1Q priority tags inserted correctly ixgbe was previously using the skb queue_mapping field to directly set the 802.1Q priority. This no longer works because we have removed the 1:1 mapping between queues and traffic class. Each ring is aligned with an 802.1Qaz traffic class so here we add an extra field to the ring struct to identify the 802.1Q traffic class. This uses an extra byte of the ixgbe_ring struct fortunately there was a 2byte hole, struct ixgbe_ring { void * desc; /* 0 8 */ struct device * dev; /* 8 8 */ struct net_device * netdev; /* 16 8 */ union { struct ixgbe_tx_buffer * tx_buffer_info; /* 8 */ struct ixgbe_rx_buffer * rx_buffer_info; /* 8 */ }; /* 24 8 */ long unsigned int state; /* 32 8 */ u8 atr_sample_rate; /* 40 1 */ u8 atr_count; /* 41 1 */ u16 count; /* 42 2 */ u16 rx_buf_len; /* 44 2 */ u16 next_to_use; /* 46 2 */ u16 next_to_clean; /* 48 2 */ u8 queue_index; /* 50 1 */ u8 reg_idx; /* 51 1 */ u16 work_limit; /* 52 2 */ /* XXX 2 bytes hole, try to pack */ u8 * tail; /* 56 8 */ /* --- cacheline 1 boundary (64 bytes) --- */ Now we can set the VLAN priority directly and it will be correct. User space can indicate the 802.1Qaz priority using the SO_PRIORITY setsocket() option and QOS layer will steer the skb to the correct rings. Additionally using the multiq qdisc with a queue_mapping action works as well. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit dc166e22ede5ffb46b5b18b99ba0321ae545f89b Author: John Fastabend Date: Wed Feb 23 05:57:52 2011 +0000 ixgbe: DCB remove ixgbe_fcoe_getapp routine Remove ixgbe_fcoe_getapp() and use the generic kernel routine instead. Also add application priority to the kernel maintained list on setapp so applications and stacks can query the value. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit f8628d404505e61bfc63638744656ede69227766 Author: John Fastabend Date: Wed Feb 23 05:57:47 2011 +0000 ixgbe: DCB, implement ieee_setapp dcbnl ops Implement ieee_setapp dcbnl ops in ixgbe. This is required to setup FCoE which requires dedicated resources. If the app data is not for FCoE then no action is taken in ixgbe except to add it to the dcb_app_list. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 3032309b49622497430ecd2b40ff51fb204c35e8 Author: John Fastabend Date: Tue Mar 1 05:25:35 2011 +0000 ixgbe: DCB, implement capabilities flags This implements dcbnl get and set capabilities ops. The devices supported by ixgbe can be configured to run in IEEE or CEE modes but not both. With the DCBX set capabilities bit we add an explicit signal that must be used to toggle between these modes. This patch adds logic to fail the CEE command set_hw_all() which programs the device with a CEE configuration if the CEE caps bit is not set. Similarly, IEEE set commands will fail if the IEEE caps bit is not set. We allow most CEE config set commands to occur because they do not touch the hardware until set_hw_all() is called. The one exception to the above is the {set|get}app routines. These must always be protected by caps bits to ensure side effects do not corrupt the current configured mode. By requiring the caps bit to be set correctly we can maintain a consistent configuration in the hardware for CEE or IEEE modes and prevent partial hardware configurations that may occur if user space does not send a complete IEEE or CEE configurations. It is expected that user space will signal a DCBX mode before programming device. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 0d1fe82deacdcc90458558b5d6a4a5af5db9a6c6 Author: Carolyn Wyborny Date: Fri Mar 11 20:58:19 2011 -0800 igb: Bump version to 3.0.6 This patch updates igb version to 3.0.6. Signed-off-by: Carolyn Wyborny Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 831ec0b4226cec7ea34f5c4c9810e78aeb2069bf Author: Carolyn Wyborny Date: Fri Mar 11 20:43:54 2011 -0800 igb: Add DMA Coalescing feature to driver This patch add DMA Coalescing which is a power-saving feature that coalesces DMA writes in order to stay in a low-power state as much as possible. Feature is disabled by default. Signed-off-by: Carolyn Wyborny Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 4322e561a93ec7ee034b603a6c610e7be90d4e8a Author: Carolyn Wyborny Date: Fri Mar 11 20:43:18 2011 -0800 igb: Update NVM functions to work with i350 devices This patch adds functions and functions pointers to accommodate differences between NVM interfaces and options for i350 devices, 82580 devices and the rest. Signed-off-by: Carolyn Wyborny Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 09b068d45737abb49320ab25cb4ed2916017ace7 Author: Carolyn Wyborny Date: Fri Mar 11 20:42:13 2011 -0800 igb: Add Energy Efficient Ethernet (EEE) for i350 devices. This patch adds the EEE feature for i350 devices, enabled by default. Signed-off-by: Carolyn Wyborny Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 422e05d12af9c1063d57210074b4e6db36a0cf39 Author: Greg Rose Date: Sat Mar 12 02:01:29 2011 +0000 ixgbevf: Fix Driver String Change the driver string to match the PF driver string format. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit a9f7c5363b7d2d836ad2be2d96fd4af3fd0d349a Author: Greg Rose Date: Wed Mar 2 06:52:30 2011 +0000 ixgbevf: Fix Version String The kernel version string is off by a major version number since new silicon was just introduced and also uses the wrong format for the version postfix. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 995612178c88407d8330f580ba6572cb8b284dd8 Merge: 8d7718a 6d55da5 Author: Thomas Gleixner Date: Sat Mar 12 11:37:14 2011 +0100 Merge branch 'tip/futex/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-rt into core/futexes futex,plist: Pass the real head of the priority list to plist_del() futex,plist: Remove debug lock assignment from plist_node plist: Shrink struct plist_head plist: Add priority list test commit 56396e6823fe9b42fe9cf9403d6ed67756255f70 Author: Tejun Heo Date: Fri Mar 11 10:33:31 2011 +0100 x86-64, NUMA: Don't call numa_set_distanc() for all possible node combinations during emulation The distance transforming in numa_emulation() used to call numa_set_distance() for all MAX_NUMNODES * MAX_NUMNODES node combinations regardless of which are enabled. As numa_set_distance() ignores all out-of-bound distance settings, this doesn't cause any problem other than looping unnecessarily many times during boot. However, as MAX_NUMNODES * MAX_NUMNODES can be pretty high, update the code such that it iterates through only the enabled combinations. Yinghai Lu identified the issue and provided an initial patch to address the issue; however, the patch was incorrect in that it didn't build emulated distance table when there's no physical distance table and unnecessarily complex. http://thread.gmane.org/gmane.linux.kernel/1107986/focus=1107988 Signed-off-by: Tejun Heo Reported-by: Yinghai Lu Acked-by: Yinghai Lu commit e4fcaeff4fcb56779f22f2f11e50ed2a69e650a3 Author: Florian Tobias Schandinat Date: Sat Mar 12 01:36:38 2011 +0000 viafb: split pll configs up This patch splits the pll configs up on pll versions. This allows easy adding of other known good pll values. Additionally it made it possible to remove invalid configurations resulting in better behaviour for such cases. The resulting clocks are no longer stored resulting in some computing overhead on each mode change. Signed-off-by: Florian Tobias Schandinat commit fd3cc69848b7e1873e5f12bbcdd572b20277ecf3 Author: Florian Tobias Schandinat Date: Fri Mar 11 00:04:01 2011 +0000 viafb: remove duplicated clock storage The clocks can be easily recalculated by the timing and refresh value. This brings us one step closer to removing VIAs modetable and use generic ones and being easier extensible. Signed-off-by: Florian Tobias Schandinat commit 97597a39778eefb628eb7734a18f32c7880ad0e0 Author: Florian Tobias Schandinat Date: Thu Mar 10 22:39:22 2011 +0000 viafb: always return the best possible clock Before this patch only clocks that perfectly match were used and if none existed this was not handled properly. This patch changes this to always use the closest clock supported. This should behave like before for clocks that have a perfect match but be much saner for clocks which are slightly off. Signed-off-by: Florian Tobias Schandinat commit f5b1c4b3b6d407ec5a9d93ca12738c4c7911000c Author: Florian Tobias Schandinat Date: Wed Mar 9 22:13:32 2011 +0000 viafb: remove duplicated clock information This patch removes the direct lookup table for resolution+refresh and pixclock by calculating this information from the mode table. Removes a lot of dupllication and error potential by just doing a little more calculations on each mode change. Signed-off-by: Florian Tobias Schandinat commit d209a699a0b975ad47f399d70ddc3791f1b84496 Author: Thomas Gleixner Date: Fri Mar 11 21:22:14 2011 +0100 genirq: Add chip flag to force mask on suspend On suspend we disable all interrupts in the core code, but this does not mask the interrupt line in the default implementation as we use a lazy disable approach. That means we mark the interrupt disabled, but leave the hardware unmasked. That's an optimization because we avoid the hardware access for the common case where no interrupt happens after we marked it disabled. If an interrupt happens, then the interrupt flow handler masks the line at the hardware level and marks it pending. Suspend makes use of this delayed disable as it "disables" all interrupts when preparing the suspend transition. Right before the system goes into hardware suspend state it checks whether one of the interrupts which is marked as a wakeup interrupt came in after disabling it. Most interrupt chips have a separate register which selects the interrupts which can wake up the system from suspend, so we don't have to mask any on the non wakeup interrupts. But now we have to deal with brilliant designed hardware which lacks such a wakeup configuration facility. For such hardware it's necessary to mask all non wakeup interrupts before going into suspend in order to avoid the wakeup from random interrupts. Rather than working around this in the affected interrupt chip implementations we can solve this elegant in the core code itself. Add a flag IRQCHIP_MASK_ON_SUSPEND which can be set by the irq chip implementation to indicate, that the interrupts which are not selected as wakeup sources must be masked in the suspend path. Mask them in the loop which checks the wakeup interrupts pending flag. Signed-off-by: Thomas Gleixner Reviewed-by: Abhijeet Dharmapurikar LKML-Reference: commit fc1599f7b0f6aff566237342ade28f2981186cc9 Author: Axel Lin Date: Thu Mar 10 17:10:45 2011 +0800 gpio: Use __devexit at necessary places The function gen_74x164_remove and mc33880_remove are used only wrapped by __devexit_p so define it using __devexit. Signed-off-by: Axel Lin Signed-off-by: Grant Likely commit 98f51ca98054b1268a7fdfe51d93c86a449ae87c Author: Axel Lin Date: Thu Mar 10 16:48:34 2011 +0800 gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio The device table is required to load modules based on modaliases. After adding MODULE_DEVICE_TABLE, below entries will be added to modules.pcimap: pch_gpio 0x00008086 0x00008803 0xffffffff 0xffffffff 0x00000000 0x00000000 0x0 ml_ioh_gpio 0x000010db 0x0000802e 0xffffffff 0xffffffff 0x00000000 0x00000000 0x0 Signed-off-by: Axel Lin Signed-off-by: Grant Likely commit 6d9a4f9e21486fa83526a9a9fdf88b9b2cdfd299 Author: Stephen M. Cameron Date: Sat Mar 12 10:02:30 2011 +0100 cciss: fix missed command status value CMD_UNABORTABLE and fix a nearby typo, "do" that should have been "due" Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit fcab1c112ade881d884cd7b8161f7543194d12e1 Author: Stephen M. Cameron Date: Sat Mar 12 10:02:24 2011 +0100 cciss: remove unnecessary casts Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 16011131ced8bdb317e1bf03324ca78a27fa0a1c Author: Stephen M. Cameron Date: Sat Mar 12 10:02:21 2011 +0100 cciss: Mask off error bits of c->busaddr in cmd_special_free when calling pci_free_consistent Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 0498cc2a9e81de97674adde8ced8a1462a397013 Author: Stephen M. Cameron Date: Sat Mar 12 10:02:16 2011 +0100 cciss: Inform controller we are using 32-bit tags. Controller will DMA only 32-bits of the tag per command on completion if it knows we are only using 32-bit tags. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 4a765046553a88e4ec80ad84d2131b9e69ab4ab0 Author: Stephen M. Cameron Date: Sat Mar 12 10:02:11 2011 +0100 cciss: hoist tag masking out of loop In process_nonindexed_cmd, hoist figuring of masked tag out of loop since it is the same throughout. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 0b7bb77fd55903ff9dc7c0474c49002aa6b9c78c Author: Peter Korsgaard Date: Wed Mar 9 17:56:30 2011 +0100 gpio/mcp23s08: support mcp23s17 variant mpc23s17 is very similar to the mcp23s08, except that registers are 16bit wide, so extend the interface to work with both variants. The s17 variant also has an additional address pin, so adjust platform data structure to support up to 8 devices per SPI chipselect. Signed-off-by: Peter Korsgaard Signed-off-by: Grant Likely commit 9c3c8afccb6a163fd2be739f511e863eab668702 Merge: 290293e a5abba9 Author: Grant Likely Date: Sat Mar 12 01:25:53 2011 -0700 Merge commit 'v2.6.38-rc8' into spi/next Conflicts: drivers/spi/pxa2xx_spi_pci.c commit 371c394af27ab7d1e58a66bc19d9f1f3ac1f67b4 Author: Alexander van Heukelum Date: Fri Mar 11 21:59:38 2011 +0100 x86, binutils, xen: Fix another wrong size directive The latest binutils (2.21.0.20110302/Ubuntu) breaks the build yet another time, under CONFIG_XEN=y due to a .size directive that refers to a slightly differently named (hence, to the now very strict and unforgiving assembler, non-existent) symbol. [ mingo: This unnecessary build breakage caused by new binutils version 2.21 gets escallated back several kernel releases spanning several years of Linux history, affecting over 130,000 upstream kernel commits (!), on CONFIG_XEN=y 64-bit kernels (i.e. essentially affecting all major Linux distro kernel configs). Git annotate tells us that this slight debug symbol code mismatch bug has been introduced in 2008 in commit 3d75e1b8: 3d75e1b8 (Jeremy Fitzhardinge 2008-07-08 15:06:49 -0700 1231) ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) The 'bug' is just a slight assymetry in ENTRY()/END() debug-symbols sequences, with lots of assembly code between the ENTRY() and the END(): ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) ... END(do_hypervisor_callback) Human reviewers almost never catch such small mismatches, and binutils never even warned about it either. This new binutils version thus breaks the Xen build on all upstream kernels since v2.6.27, out of the blue. This makes a straightforward Git bisection of all 64-bit Xen-enabled kernels impossible on such binutils, for a bisection window of over hundred thousand historic commits. (!) This is a major fail on the side of binutils and binutils needs to turn this show-stopper build failure into a warning ASAP. ] Signed-off-by: Alexander van Heukelum Cc: Jeremy Fitzhardinge Cc: Jan Beulich Cc: H.J. Lu Cc: Linus Torvalds Cc: Andrew Morton Cc: "H. Peter Anvin" Cc: Kees Cook LKML-Reference: <1299877178-26063-1-git-send-email-heukelum@fastmail.fm> Signed-off-by: Ingo Molnar commit a00ae34ac8bc8a5897d9b6b9b685c39b955b14b9 Author: Ira Snyder Date: Thu Mar 3 07:55:01 2011 +0000 fsldma: make halt behave nicely on all supported controllers The original dma_halt() function set the CA (channel abort) bit on both the 83xx and 85xx controllers. This is incorrect on the 83xx, where this bit means TEM (transfer error mask) instead. The 83xx doesn't support channel abort, so we only do this operation on 85xx. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit dc8d4091575ba81e886ebcdfd1e559c981f82f86 Author: Ira Snyder Date: Thu Mar 3 07:55:00 2011 +0000 fsldma: reduce locking during descriptor cleanup This merges the fsl_chan_ld_cleanup() function into the dma_do_tasklet() function to reduce locking overhead. In the best case, we will be able to keep the DMA controller busy while we are freeing used descriptors. In all cases, the spinlock is grabbed two times fewer than before on each transaction. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit 9c4d1e7bdeb1ed4dc0c3341d40662a6fbc5f2dc2 Author: Ira Snyder Date: Thu Mar 3 07:54:59 2011 +0000 fsldma: support async_tx dependencies and automatic unmapping Previous to this patch, the dma_run_dependencies() function has been called while holding desc_lock. This function can call tx_submit() for other descriptors, which may try to re-grab the lock. Avoid this by moving the descriptors to be cleaned up to a temporary list, and dropping the lock before cleanup. At the same time, add support for automatic unmapping of src and dst buffers, as offered by the DMAEngine API. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit f04cd40701deace2efb9edd7120e59366bda2118 Author: Ira Snyder Date: Thu Mar 3 07:54:58 2011 +0000 fsldma: fix controller lockups Enabling poisoning in the dmapool API quickly showed that the DMA controller was fetching descriptors that should not have been in use. This has caused intermittent controller lockups during testing. I have been unable to figure out the exact set of conditions which cause this to happen. However, I believe it is related to the driver using the hardware registers to track whether the controller is busy or not. The code can incorrectly decide that the hardware is idle due to lag between register writes and the hardware actually becoming busy. To fix this, the driver has been reworked to explicitly track the state of the hardware, rather than try to guess what it is doing based on the register values. This has passed dmatest with 10 threads per channel, 100000 iterations per thread several times without error. Previously, this would fail within a few seconds. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit 31f4306c83a2daa3e348056b720de511bffe5a9b Author: Ira Snyder Date: Thu Mar 3 07:54:57 2011 +0000 fsldma: minor codingstyle and consistency fixes This fixes some minor violations of the coding style. It also changes the style of the device_prep_dma_*() function definitions so they are identical. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit 0ab09c36818ca88f65c88f4d8c6d067fbf10578d Author: Ira Snyder Date: Thu Mar 3 07:54:56 2011 +0000 fsldma: improve link descriptor debugging This adds better tracking to link descriptor allocations, callbacks, and frees. This makes it much easier to track errors with link descriptors. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit b158471ef63bf399165db96e945a828096502d9d Author: Ira Snyder Date: Thu Mar 3 07:54:55 2011 +0000 fsldma: use channel name in printk output This makes debugging the driver much easier when multiple channels are running concurrently. In addition, you can see how much descriptor memory each channel has allocated via the dmapool API in sysfs. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit e8bd84df27c5921a9ac866aef06e044590ac118f Author: Ira Snyder Date: Thu Mar 3 07:54:54 2011 +0000 fsldma: move related helper functions near each other This is a purely cosmetic cleanup. It is nice to have related functions right next to each other in the code. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit b203bd3f6b9c3db3b1979c2ff79bb2b9be8f03a3 Author: Ira Snyder Date: Thu Mar 3 07:54:53 2011 +0000 dmatest: fix automatic buffer unmap type The dmatest code relies on the DMAEngine API to automatically call dma_unmap_single() on src buffers. The flags it passes are incorrect, fix them. Signed-off-by: Ira W. Snyder Signed-off-by: Dan Williams commit be7004f73d0b42cca29cf9f1cc86f32038fd140c Merge: 604eefe 30fe764 Author: Kukjin Kim Date: Sat Mar 12 10:20:07 2011 +0900 Merge branch 'next-exynos4-pm' into for-next Conflicts: arch/arm/mach-exynos4/include/mach/regs-pmu.h commit 30fe76437bc2463b25e9a64ff1b28f293e3f3413 Author: Jaecheol Lee Date: Wed Mar 9 08:22:31 2011 +0900 ARM: EXYNOS4: Update HRT for supporting PM This patch updates HRT driver for supporting PM. The resume function of PWM4 timer which is used clocksource is needed when kernel is resuming for restarting. Signed-off-by: Jaecheol Lee Signed-off-by: Kukjin Kim commit 1663895cb434b586d022d6414f03316469cf284d Author: Jaecheol Lee Date: Thu Mar 10 13:33:59 2011 +0900 ARM: EXYNOS4: Suspend to RAM Support This patch adds support suspend to ram for EXYNOS4210. As a note, this includes function of outer cache flush because it is used before entering PM. Signed-off-by: Jaecheol Lee Signed-off-by: Kukjin Kim commit b77ca655f343bf85578b24b1a3edfbc08336544c Author: Jaecheol Lee Date: Thu Mar 10 13:21:51 2011 +0900 ARM: EXYNOS4: Add PMU and CMU Registers for PM This patch adds definitions of PMU and CMU registers for EXYNOS4 PM. Signed-off-by: Jaecheol Lee Signed-off-by: Kukjin Kim commit 2424137a9c826bcda470a592132f32850cced333 Merge: a5abba9 30d8bea Author: Kukjin Kim Date: Sat Mar 12 10:17:19 2011 +0900 Merge branch 'next-exynos4' into next-exynos4-pm commit 604eefeb2308cda72325fd8754aecb55075ae866 Author: Sylwester Nawrocki Date: Sat Mar 12 08:58:01 2011 +0900 ARM: S5P: Add platform definitions for FIMC3 Add support for fourth FIMC platform device definition and define resources for FIMC modules on EXYNOS4 machines. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Marek Szyprowski Signed-off-by: Kukjin Kim commit 9e65bbf21371ea6705acd88229c8a7439f46e25e Author: Sangbeom Kim Date: Sat Mar 12 08:05:19 2011 +0900 ARM: S5P: Update defconfig for HRT support This patch updates s5pv210_defconfig and s5p64x0_defconfig for HRT support and CONFIG_S5P_HRT is used for its configuration. Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim commit 20780fcc4091897797979985868b1572dc7d78d9 Author: Sangbeom Kim Date: Sat Mar 12 08:02:12 2011 +0900 ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT This patch adds support HRT for machines of S5P64X0 and S5PV210. Basically, PWM Timer3 is used for clockevent and PWM Timer4 is used for clocksource. Since PWM Timer3 is used for other purpose, PWM Timer2 is used on SMDKV210. Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim commit f8bfff8e4c3c3d447fe12e3c0e3a36f3bdd891b5 Author: Sangbeom Kim Date: Sat Mar 12 08:02:07 2011 +0900 ARM: S5P: HRT support This patch adds support HR-Timer(High Resolution Timer) and dynamic tick system for S5P SoCs. There are many clock sources for HR-Timer on S5P SoCs. The PWM timer, RTC, System Timer, and MCT can be used for clock source. This patch can only support PWM timer for clock source of S5P64X0 and S5PV210. Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim commit 6c11371dd17c5bd29e3a53cf5263be6ea67c51e4 Merge: f5539af 0b863b3 Author: Dan Williams Date: Fri Mar 11 14:56:58 2011 -0800 Merge branch 'for_dan' of git://git.infradead.org/users/vkoul/slave-dma into dmaengine * 'for_dan' of git://git.infradead.org/users/vkoul/slave-dma: drivers, pch_dma: Fix warning when CONFIG_PM=n. dmaengine/dw_dmac fix: use readl & writel instead of __raw_readl & __raw_writel avr32: at32ap700x: Specify DMA Flow Controller, Src and Dst msize dw_dmac: Setting Default Burst length for transfers as 16. dw_dmac: Allow src/dst msize & flow controller to be configured at runtime dw_dmac: Changing type of src_master and dest_master to u8. dw_dmac: Pass Channel Priority from platform_data dw_dmac: Pass Channel Allocation Order from platform_data dw_dmac: Mark all tx_descriptors with DMA_CRTL_ACK after xfer finish dw_dmac: Change value of DWC_MAX_COUNT to 4095. dw_dmac: Adding support for 64 bit access width for memcpy xfers dw_dmac: Calling dwc_scan_descriptors from dwc_tx_status() after taking lock dw_dmac: Move single descriptor from dwc->queue to dwc->active_list in dwc_complete_all dw_dmac: Replace module_init() with subsys_initcall() dw_dmac: Remove compilation dependency from AVR32 and put on HAVE_CLK dmaengine: mxs-dma: add dma support for i.MX23/28 pch_dma: set the number of array correctly pch_dma: fix kernel error issue commit f5539af572ffa35545f21f604fb747eae55c8042 Merge: 0670e71 4abed0a Author: Dan Williams Date: Fri Mar 11 14:45:54 2011 -0800 Merge branch 'dmaengine-fixes' into dmaengine commit 0c9ba97318fc9a905bcc1419b6966de061203a70 Author: Alex Elder Date: Fri Mar 11 12:39:51 2011 +0000 xfs: don't name variables "panic" The new xfs_alert_tag() used a variable named "panic", and that is to be avoided. Rename it. Signed-off-by: Alex Elder Reviewed-by: Dave Chinner commit 0789b0033112e301f086f99bd15c7d67c051a51e Author: Greg Kroah-Hartman Date: Fri Mar 11 14:32:01 2011 -0800 Staging: samsung-laptop: add support for N230 model Signed-off-by: Greg Kroah-Hartman commit 9107a26ebcadf869e647100ada876e074b8d26a9 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:47 2011 -0800 staging: ath6kl: remove-typedef DEV_SCATTER_DMA_VIRTUAL_INFO remove-typedef -s DEV_SCATTER_DMA_VIRTUAL_INFO \ "struct dev_scatter_dma_virtual_info" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 84fd335f2d4f447363f79a8cb032635a05c91887 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:46 2011 -0800 staging: ath6kl: remove-typedef COMMON_CREDIT_STATE_INFO remove-typedef -s COMMON_CREDIT_STATE_INFO \ "struct common_credit_state_info" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit d184f4a0528f3734df4639c32a12c8ded4c1afb7 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:45 2011 -0800 staging: ath6kl: remove-typedef BUFFER_PROC_LIST remove-typedef -s BUFFER_PROC_LIST \ "struct buffer_proc_list" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 090f807a0ddcb01884827870be4038d6b4b4d5e4 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:44 2011 -0800 staging: ath6kl: remove-typedef ATH_DEBUG_MASK_DESCRIPTION remove-typedef -s ATH_DEBUG_MASK_DESCRIPTION \ "struct ath_debug_mask_description" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 42837dc9cb92ed7c0f69a23abad56b3ff2b190cd Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:43 2011 -0800 staging: ath6kl: remove-typedef ATHBT_FILTER_INSTANCE We mark this as unused as well, given that I find no users, at a later time we can determine to nuke this or not... Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit cbe7075102239dfc0187c30ac0cd4b79eddd35c2 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:42 2011 -0800 staging: ath6kl: remove-typedef AR_VIRTUAL_INTERFACE_T remove-typedef -s AR_VIRTUAL_INTERFACE_T \ "struct ar_virtual_interface" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit e6998a556b6773542b60e48b451f99574c05cbaa Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:41 2011 -0800 staging: ath6kl: remove-typedef AR6K_IRQ_PROC_REGISTERS remove-typedef -s AR6K_IRQ_PROC_REGISTERS \ "struct ar6k_irq_proc_registers" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit dfaa26b47a67d4b3bf598bdf607f953ed3338681 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:40 2011 -0800 staging: ath6kl: remove-typedef AR6K_IRQ_ENABLE_REGISTERS remove-typedef -s AR6K_IRQ_ENABLE_REGISTERS \ "struct ar6k_irq_enable_registers" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 03e41d55390a5dab2ab9945eef331edb2eddd72f Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:39 2011 -0800 staging: ath6kl: remove-typedef AR6K_HCI_BRIDGE_INFO remove-typedef -s AR6K_HCI_BRIDGE_INFO \ "struct ar6k_hci_bridge_info" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 69c44f42f6467441cc413ccbabbb9deeb82d16c4 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:38 2011 -0800 staging: ath6kl: remove-typedef AR6K_GMBOX_INFO remove-typedef -s AR6K_GMBOX_INFO \ "struct ar6k_gmbox_info" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 89c625bef65fd245692bc884ae8268f6d5b60da9 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:37 2011 -0800 staging: ath6kl: remove-typedef AR6K_GMBOX_CTRL_REGISTERS remove-typedef -s AR6K_GMBOX_CTRL_REGISTERS \ "struct ar6k_gmbox_ctrl_registers" drivers/staging/ath6k Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 495abc7995ffff39ba4333ad8e382017dc2192f8 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:36 2011 -0800 staging: ath6kl: remove-typedef AR6K_DEVICE remove-typedef -s AR6K_DEVICE \ "struct ar6k_device" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 26da4b510dab790905801e99c83230ea517d7eab Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:35 2011 -0800 staging: ath6kl: remove-typedef AR6K_ASYNC_REG_IO_BUFFER remove-typedef -s AR6K_ASYNC_REG_IO_BUFFER \ "struct ar6k_async_reg_io_buffer" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 06265442028254cce5a6f19dfa0bab11c88f06fe Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:34 2011 -0800 staging: ath6kl: remove-typedef AR6000_USER_SETKEYS_INFO remove-typedef -s AR6000_USER_SETKEYS_INFO \ "struct ar6000_user_setkeys_info" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 854019a3c6a0435b468e4a3f5e545a770d5cdf6f Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:33 2011 -0800 staging: ath6kl: remove-typedef AR3K_CONFIG_INFO remove-typedef -s AR3K_CONFIG_INFO \ "struct ar3k_config_info" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit ebb1f944f82ca3ee95415cf7cc174375562d6c8d Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:32 2011 -0800 staging: ath6kl: remove-typedef AGGR_INFO remove-typedef -s AGGR_INFO \ "struct aggr_info" drivers/staging/ath6kl/ Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit d8cb316fdc64fefbb7bd00f16dc8d1bdce24c2d3 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:31 2011 -0800 staging: ath6kl: remove-typedef: A_UCHAR remove-typedef -s A_UCHAR u8 drivers/staging/ath6kl/ This uses the remove-typedef utility: http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/remove-typedef Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 395e1cae85283f7bbe767097d78b5e3baa13b131 Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:30 2011 -0800 staging: ath6kl: s|A_MEMCMP|memcmp|g for i in $(find ./drivers/staging/ath6kl/ -name \*.[ch]) ; do \ sed -r -i -e "s/A_MEMCMP/memcmp/g" $i; done Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 05209262bcbece611e559a37b90869f667864e0c Author: Luis R. Rodriguez Date: Thu Mar 10 18:55:29 2011 -0800 staging: ath6kl: s|A_MEMCPY|memcpy|g for i in $(find ./drivers/staging/ath6kl/ -name \*.[ch]) ; do \ sed -r -i -e "s/A_MEMCPY/memcpy/g" $i; done Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 7702c36072072427db2166cc6e68bfc52b4209bb Author: Javier Martinez Canillas Date: Thu Mar 10 18:55:28 2011 -0800 staging: ath6kl: Cast variable to size_t to avoid compile warning The min() macro does strict type-checking so use min_t() instead to silence a compile warning. Cc: Naveen Singh Signed-off-by: Javier Martinez Canillas Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit e49c459c33189cfc7cff581d3c2e7f0074835118 Author: Randy Dunlap Date: Thu Mar 10 16:49:56 2011 -0800 usb-storage: fix menu ordering Move the USB_STORAGE_ENE_UB6250 entry so that it stays under the USB_STORAGE menu. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 0074f59b51a2882ce3b8e3922c52f4c547bd56b7 Author: Randy Dunlap Date: Thu Mar 10 16:48:36 2011 -0800 usb-storage: ene_ub6250 depends on USB_STORAGE Fix ene_ub6250 build: it uses usb_storage driver interfaces, so it should depend on USB_STORAGE. ene_ub6250.c:(.text+0x14ff19): undefined reference to `usb_stor_reset_resume' ene_ub6250.c:(.text+0x14ffb1): undefined reference to `usb_stor_bulk_transfer_buf' ene_ub6250.c:(.text+0x14ffdd): undefined reference to `usb_stor_bulk_srb' ene_ub6250.c:(.text+0x14fff1): undefined reference to `usb_stor_bulk_transfer_sg' ene_ub6250.c:(.text+0x1503dd): undefined reference to `usb_stor_set_xfer_buf' ene_ub6250.c:(.text+0x15048e): undefined reference to `usb_stor_access_xfer_buf' ene_ub6250.c:(.text+0x150723): undefined reference to `usb_stor_probe1' ene_ub6250.c:(.text+0x150795): undefined reference to `usb_stor_probe2' ene_ub6250.c:(.text+0x1507af): undefined reference to `usb_stor_disconnect' drivers/built-in.o:(.data+0x10224): undefined reference to `usb_stor_suspend' drivers/built-in.o:(.data+0x10230): undefined reference to `usb_stor_pre_reset' drivers/built-in.o:(.data+0x10234): undefined reference to `usb_stor_post_reset' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 8b0fb6f872477dfd218e43b073543e4913b6d785 Author: Dan Carpenter Date: Thu Mar 10 11:31:33 2011 +0300 USB: ene_ub6250: fix memory leak in ene_load_bincode() "buf" gets allocated twice in a row. It's the second allocation which is correct. The first one should be removed. Signed-off-by: Dan Carpenter Acked-by: huajun li Signed-off-by: Greg Kroah-Hartman commit fbf9865c6d96f4a131092d2018056e86113e5cea Author: Robert Morell Date: Wed Mar 9 16:28:57 2011 -0800 USB: ehci: tegra: Align DMA transfers to 32 bytes The Tegra2 USB controller doesn't properly deal with misaligned DMA buffers, causing corruption. This is especially prevalent with USB network adapters, where skbuff alignment is often in the middle of a 4-byte dword. To avoid this, allocate a temporary buffer for the DMA if the provided buffer isn't sufficiently aligned. Signed-off-by: Robert Morell Signed-off-by: Benoit Goby Signed-off-by: Greg Kroah-Hartman commit 79ad3b5add4a683af02d1b51ccb699d1b01f1fbf Author: Benoit Goby Date: Wed Mar 9 16:28:56 2011 -0800 usb: host: Add EHCI driver for NVIDIA Tegra SoCs The Tegra 2 SoC has 3 EHCI compatible USB controllers. This patch adds the necessary glue to allow the ehci-hcd driver to work on Tegra 2 SoCs. The platform data is used to configure board-specific phy settings and to configure the operating mode, as one of the ports may be used as a otg port. For additional power saving, the driver supports powering down the phy on bus suspend when it is used, for example, to connect an internal device that use an out-of-band remote wakeup mechanism (e.g. a gpio). Signed-off-by: Benoit Goby Signed-off-by: Greg Kroah-Hartman commit 91525d084e8f078330c949362f8084b06e69fd41 Author: Benoit Goby Date: Wed Mar 9 16:28:55 2011 -0800 ARM: tegra: Add support for Tegra USB PHYs Interface used by Tegra's gadget driver and ehci driver to power on and configure the USB PHYs. Signed-off-by: Benoit Goby Signed-off-by: Greg Kroah-Hartman commit ee398ba97dd76ed53bed548dec648d918af4004c Author: Benoit Goby Date: Wed Mar 9 16:28:54 2011 -0800 usb: otg: Add ulpi viewport access ops Add generic access ops for controllers with a ulpi viewport register (e.g. Chipidea/ARC based controllers). Signed-off-by: Benoit Goby Signed-off-by: Greg Kroah-Hartman commit d0781383038e983a63843a9a6a067ed781db89c1 Author: wangyanqing Date: Fri Mar 11 06:24:38 2011 -0800 USB: serial: ch341: add new id I picked up a new DAK-780EX(professional digitl reverb/mix system), which use CH341T chipset to communication with computer on 3/2011 and the CH341T's vendor code is 1a86 Looking up the CH341T's vendor and product id's I see: 1a86 QinHeng Electronics 5523 CH341 in serial mode, usb to serial port converter CH341T,CH341 are the products of the same company, maybe have some common hardware, and I test the ch341.c works well with CH341T Cc: Linus Torvalds Cc: stable Signed-off-by: Greg Kroah-Hartman commit 752d57a8b7b97423bffa3452638aa0fd3c3bb9d1 Author: Paul Bolle Date: Fri Mar 11 18:03:52 2011 +0100 USB: Only treat lasting over-current conditions as errors On a laptop I see these errors on (most) resumes: hub 3-0:1.0: over-current change on port 1 hub 3-0:1.0: over-current change on port 2 Since over-current conditions can disappear quite quickly it's better to downgrade that message to debug level, recheck for an over-current condition a little later and only print and over-current condition error if that condition (still) exists when it's rechecked. Add similar logic to hub over-current changes. (That code is untested, as those changes do not occur on this laptop.) Signed-off-by: Paul Bolle Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0dfeefbc93e38c3a9bd6d4e579cc5a76d3f13dc2 Author: Hubert Feurstein Date: Thu Mar 10 10:06:37 2011 +0100 ehci-atmel: fix section mismatch warning Fix the following section mismatch warning: WARNING: drivers/usb/built-in.o(.data+0x74c): Section mismatch in reference from the variable ehci_atmel_driver to the function .init.text:ehci_atmel_drv_probe() The variable ehci_atmel_driver references the function __init ehci_atmel_drv_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Hubert Feurstein Signed-off-by: Nicolas Ferre Signed-off-by: Greg Kroah-Hartman commit c5cb09b6f898609922f9b873661f6cbc26cb29e1 Author: Rob Landley Date: Wed Mar 9 16:02:37 2011 -0600 Cleanup: Factor out some cut-and-paste code. Factor out some cut-and-paste code in options parsing. Saves about 800 bytes on x86-64. Signed-off-by: Rob Landley Signed-off-by: Trond Myklebust commit c12bacec458bef16d843c052f38422862f3da8fe Author: Rob Landley Date: Wed Mar 9 15:54:13 2011 -0600 cleanup: save 60 lines/100 bytes by combining two mostly duplicate functions. Eliminate two mostly duplicate functions (nfs_parse_simple_hostname() and nfs_parse_protected_hostname()) and instead just make the calling function (nfs_parse_devname()) do everything. Signed-off-by: Rob Landley Signed-off-by: Trond Myklebust commit 7ec10f26e1fd5fcceb9c96e508c1292a816199f7 Author: Konstantin Khlebnikov Date: Tue Feb 22 00:28:34 2011 +0300 NFS: account direct-io into task io accounting Account NFS direct-io reads and writes into Task I/O Accounting. Do it before complition to handle aio. NFS have unusual direct-io implementation, thus accounting in generic code does not work. Signed-off-by: Konstantin Khlebnikov Signed-off-by: Trond Myklebust commit f8628220bb395104697be9c447c1085846dfc97c Author: Kevin Coffman Date: Thu Mar 3 00:51:41 2011 +0000 gss:krb5 only include enctype numbers in gm_upcall_enctypes Make the value in gm_upcall_enctypes just the enctype values. This allows the values to be used more easily elsewhere. Signed-off-by: Kevin Coffman Signed-off-by: Trond Myklebust commit 5c635e09cec0feeeb310968e51dad01040244851 Author: Tom Tucker Date: Wed Feb 9 19:45:34 2011 +0000 RPCRDMA: Fix FRMR registration/invalidate handling. When the rpc_memreg_strategy is 5, FRMR are used to map RPC data. This mode uses an FRMR to map the RPC data, then invalidates (i.e. unregisers) the data in xprt_rdma_free. These FRMR are used across connections on the same mount, i.e. if the connection goes away on an idle timeout and reconnects later, the FRMR are not destroyed and recreated. This creates a problem for transport errors because the WR that invalidate an FRMR may be flushed (i.e. fail) leaving the FRMR valid. When the FRMR is later used to map an RPC it will fail, tearing down the transport and starting over. Over time, more and more of the FRMR pool end up in the wrong state resulting in seemingly random disconnects. This fix keeps track of the FRMR state explicitly by setting it's state based on the successful completion of a reg/inv WR. If the FRMR is ever used and found to be in the wrong state, an invalidate WR is prepended, re-syncing the FRMR state and avoiding the connection loss. Signed-off-by: Tom Tucker Signed-off-by: Trond Myklebust commit bd7ea31b9e8a342be76e0fe8d638343886c2d8c5 Author: Tom Tucker Date: Wed Feb 9 19:45:28 2011 +0000 RPCRDMA: Fix to XDR page base interpretation in marshalling logic. The RPCRDMA marshalling logic assumed that xdr->page_base was an offset into the first page of xdr->page_list. It is in fact an offset into the xdr->page_list itself, that is, it selects the first page in the page_list and the offset into that page. The symptom depended in part on the rpc_memreg_strategy, if it was FRMR, or some other one-shot mapping mode, the connection would get torn down on a base and bounds error. When the badly marshalled RPC was retransmitted it would reconnect, get the error, and tear down the connection again in a loop forever. This resulted in a hung-mount. For the other modes, it would result in silent data corruption. This bug is most easily reproduced by writing more data than the filesystem has space for. This fix corrects the page_base assumption and otherwise simplifies the iov mapping logic. Signed-off-by: Tom Tucker Signed-off-by: Trond Myklebust commit b064eca2cf6440bf9d5843b24cc4010624031694 Author: Trond Myklebust Date: Tue Feb 22 15:44:32 2011 -0800 NFSv4: Send unmapped uid/gids to the server when using auth_sys The new behaviour is enabled using the new module parameter 'nfs4_disable_idmapping'. Note that if the server rejects an unmapped uid or gid, then the client will automatically switch back to using the idmapper. Signed-off-by: Trond Myklebust commit 3ddeb7c5c61d0d6bfd837487d3454ffdb788bb91 Author: Trond Myklebust Date: Tue Feb 22 15:44:31 2011 -0800 NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattr This will be required in order to switch uid/gid mapping back on if the admin has tried to disable it. Note that we also propagate NFS4ERR_BADNAME at the same time, in order to work around a Linux server bug. Signed-off-by: Trond Myklebust commit e4fd72a17d2703cfd626c55893ac4ca7e7d81ce9 Author: Trond Myklebust Date: Tue Feb 22 15:44:31 2011 -0800 NFSv4: cleanup idmapper functions to take an nfs_server argument ...instead of the nfs_client. Signed-off-by: Trond Myklebust commit f0b851689a5da2354f19bcbbac30cd2cab45c4a1 Author: Trond Myklebust Date: Tue Feb 22 15:44:31 2011 -0800 NFSv4: Send unmapped uid/gids to the server if the idmapper fails Signed-off-by: Trond Myklebust commit 5cf36cfdc8caa2724738ad0842c5c3dd02f309dc Author: Trond Myklebust Date: Tue Feb 22 15:44:31 2011 -0800 NFSv4: If the server sends us a numeric uid/gid then accept it Signed-off-by: Trond Myklebust commit 75247affd7930cc3dcf57f850f0d7898379ef3b3 Author: Benny Halevy Date: Tue Feb 22 15:56:01 2011 -0800 NFSv4.1: reject zero layout with zeroed stripe unit Allowing stripe_unit==0 causes the client to crash later on when dividing by zero. Reported-by: Marc Eshel Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit 36fe432d33e078caee5c954e15e929819c2cacae Author: Fred Isaman Date: Thu Mar 3 15:13:49 2011 +0000 NFSv4.1: Clear lseg pointer in ->doio function Now that we have access to the pointer, clear it immediately after the put, instead of in caller. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit c76069bda0f17cd3e153e54d9ac01242909c6b15 Author: Fred Isaman Date: Thu Mar 3 15:13:48 2011 +0000 NFSv4.1: rearrange ->doio args This will make it possible to clear the lseg pointer in the same function as it is put, instead of in the caller nfs_pageio_doio(). Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit a69aef1496726ed88386dad65abfcc8cd3195304 Author: Fred Isaman Date: Thu Mar 3 15:13:47 2011 +0000 NFSv4.1: pnfs filelayout driver write Allows the pnfs filelayout driver to write to the data servers. Note that COMMIT to data servers will be implemented in a future patch. To avoid improper behavior, for the moment any WRITE to a data server that would also require a COMMIT to the data server is sent NFS_FILE_SYNC. Signed-off-by: Andy Adamson Signed-off-by: Dean Hildebrand Signed-off-by: Fred Isaman Signed-off-by: Mingyang Guo Signed-off-by: Oleg Drokin Signed-off-by: Ricardo Labiaga Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 7ffd10640dc008f6d5a375bd6450755745c63c7d Author: Fred Isaman Date: Thu Mar 3 15:13:46 2011 +0000 NFSv4.1: remove GETATTR from ds writes Any WRITE compound directed to a data server needs to have the GETATTR calls suppressed. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 0382b74409c6b9ef12c952b50bb44f557a361a43 Author: Andy Adamson Date: Thu Mar 3 15:13:45 2011 +0000 NFSv4.1: implement generic pnfs layer write switch Signed-off-by: Andy Adamson Signed-off-by: Boaz Harrosh Signed-off-by: Dean Hildebrand Signed-off-by: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Mike Sager Signed-off-by: Ricardo Labiaga Signed-off-by: Tao Guo Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 44b83799a922a153957c65ccfc985a8c902958c8 Author: Fred Isaman Date: Thu Mar 3 15:13:44 2011 +0000 NFSv4.1: trigger LAYOUTGET for writes Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 5053aa568d4017aeb1fa35247d4ad96be262920f Author: Fred Isaman Date: Thu Mar 3 15:13:43 2011 +0000 NFSv4.1: Send lseg down into nfs_write_rpcsetup We grab the lseg sent in from the doio function and attach it to each struct nfs_write_data created. This is how the lseg will be sent to the layout driver. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit b029bc9b0880cbaf999f580c0ea8f06dd274fc77 Author: Fred Isaman Date: Thu Mar 3 15:13:42 2011 +0000 NFSv4.1: add callback to nfs4_write_done Add callback that pnfs layout driver can use to do its own handling of data server WRITE response. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit d138d5d17be6a60d883e8bd4e22bc218d3adfab3 Author: Andy Adamson Date: Thu Mar 3 15:13:41 2011 +0000 NFSv4.1: rearrange nfs_write_rpcsetup Reorder nfs_write_rpcsetup, preparing for a pnfs entry point. Signed-off-by: Andy Adamson Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 80fe2b192dbc53261e385dc26d90f5195f1c62e7 Author: Fred Isaman Date: Tue Mar 1 01:34:23 2011 +0000 NFSv4.1: lseg documentation Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 568e8c494ded95a28c5dd8b79b4d3ffb95b6d845 Author: Andy Adamson Date: Tue Mar 1 01:34:22 2011 +0000 NFSv4.1: turn off pNFS on ds connection failure If a data server is unavailable, go through MDS. Mark the deviceid containing the data server as a negative cache entry. Do not try to connect to any data server on a deviceid marked as a negative cache entry. Mark any layout that tries to use the marked deviceid as failed. Inodes with a layout marked as fails will not use the layout for I/O, and will not perform any more layoutgets. Inodes without a layout will still do layoutget, but the layout will get marked immediately. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit ea8eecdd11ee6becd09c095c8efa88aa7df95961 Author: Christoph Hellwig Date: Tue Mar 1 01:34:21 2011 +0000 NFSv4.1 move deviceid cache to filelayout driver No need for generic cache with only one user. Keep a simple hash of deviceids in the filelayout driver. Signed-off-by: Christoph Hellwig Acked-by: Andy Adamson Signed-off-by: Trond Myklebust commit cbdabc7f8bf14ca1d40ab1cb86f64b3bc09716e8 Author: Andy Adamson Date: Tue Mar 1 01:34:20 2011 +0000 NFSv4.1: filelayout async error handler Use our own async error handler. Mark the layout as failed and retry i/o through the MDS on specified errors. Update the mds_offset in nfs_readpage_retry so that a failed short-read retry to a DS gets correctly resent through the MDS. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit dc70d7b3189597f313df7bd2da849cfc39063b15 Author: Andy Adamson Date: Tue Mar 1 01:34:19 2011 +0000 NFSv4.1: filelayout read Attempt a pNFS file layout read by setting up the nfs_read_data struct and calling nfs_initiate_read with the data server rpc client and the filelayout rpc call ops. Error handling is implemented in a subsequent patch. Signed-off-by: Andy Adamson Signed-off-by: Dean Hildebrand Signed-off-by: Fred Isaman Signed-off-by: Fred Isaman Signed-off-by: Mingyang Guo Signed-off-by: Oleg Drokin Signed-off-by: Ricardo Labiaga Tested-by: Guo Mingyang Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit cfe7f4120f8b1b9465c333d1e42efd4669b1799f Author: Fred Isaman Date: Tue Mar 1 01:34:18 2011 +0000 NFSv4.1: filelayout i/o helpers Prepare for filelayout_read_pagelist with helper functions that find the correct data server, filehandle, and offset. Signed-off-by: Andy Adamson Signed-off-by: Dean Hildebrand Signed-off-by: Fred Isaman Signed-off-by: Marc Eshel Signed-off-by: Mike Sager Signed-off-by: Oleg Drokin Signed-off-by: Tao Guo Signed-off-by: Tigran Mkrtchyan Signed-off-by: Tigran Mkrtchyan Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit d83217c13531fd59730d77b5c2284e90e56c0a50 Author: Andy Adamson Date: Tue Mar 1 01:34:17 2011 +0000 NFSv4.1: data server connection Introduce a data server set_client and init session following the nfs4_set_client and nfs4_init_session convention. Once a new nfs_client is on the nfs_client_list, the nfs_client cl_cons_state serializes access to creating an nfs_client struct with matching properties. Use the new nfs_get_client() that initializes new clients. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 64419a9b20938d9070fdd8c58c2fa23c911915f8 Author: Andy Adamson Date: Tue Mar 1 01:34:16 2011 +0000 NFSv4.1: generic read Separate the rpc run portion of nfs_read_rpcsetup into a new function nfs_initiate_read that is called for normal NFS I/O. Add a pNFS read_pagelist function that is called instead of nfs_intitate_read for pNFS reads. Signed-off-by: Andy Adamson Signed-off-by: Boaz Harrosh Signed-off-by: Dean Hildebrand Signed-off-by: Fred Isaman Signed-off-by: Fred Isaman Signed-off-by: Mike Sager Signed-off-by: Mingyang Guo Signed-off-by: Ricardo Labiaga Signed-off-by: Tao Guo Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit bae724ef95b0d0a1f4518f5451e7c8aabc41f820 Author: Fred Isaman Date: Tue Mar 1 01:34:15 2011 +0000 NFSv4.1: shift pnfs_update_layout locations Move the pnfs_update_layout call location to nfs_pageio_do_add_request(). Grab the lseg sent in the doio function to nfs_read_rpcsetup and attach it to each nfs_read_data so it can be sent to the layout driver. Signed-off-by: Andy Adamson Signed-off-by: Andy Adamson Signed-off-by: Dean Hildebrand Signed-off-by: Fred Isaman Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy Signed-off-by: Boaz Harrosh Signed-off-by: Oleg Drokin Signed-off-by: Tao Guo Signed-off-by: Trond Myklebust commit 94ad1c80e28f9700c84b4d28d1e5302ddf63a6fd Author: Fred Isaman Date: Tue Mar 1 01:34:14 2011 +0000 NFSv4.1: coelesce across layout stripes Add a pg_test layout driver hook which is used to avoid coelescing I/O across layout stripes. Signed-off-by: Andy Adamson Signed-off-by: Andy Adamson Signed-off-by: Dean Hildebrand Signed-off-by: Fred Isaman Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy Signed-off-by: Boaz Harrosh Signed-off-by: Oleg Drokin Signed-off-by: Tao Guo Signed-off-by: Trond Myklebust commit d684d2ae10a4f95d3035abf698d7d611ff2cd279 Author: Fred Isaman Date: Tue Mar 1 01:34:13 2011 +0000 NFSv4.1: lseg refcounting Prepare put_lseg and get_lseg to be called from the pNFS I/O code. Pull common code from pnfs_lseg_locked to call from pnfs_lseg. Inline pnfs_lseg_locked into it's only caller. Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit 94de8b27d0dcb2608d56a7e5c2941b87e6da7ce3 Author: Andy Adamson Date: Tue Mar 1 01:34:12 2011 +0000 NFSv4.1: add MDS mount DS only check The DS only role cannot be used to mount. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit d6fb79d433d0a34c36bdf74eaf90857193a6261f Author: Andy Adamson Date: Tue Mar 1 01:34:11 2011 +0000 NFSv4.1: new flag for lease time check Data servers cannot send nfs4_proc_get_lease_time. but still need to setup state renewal. Add the NFS_CS_CHECK_LEASE_TIME bit to indicate if the lease time can be checked. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit d3b4c9d76738df49a7db7682c2518a0ef9f7391d Author: Andy Adamson Date: Tue Mar 1 01:34:10 2011 +0000 NFSv4.1: new flag for state renewal check Data servers not sharing a session with the mount MDS always have an empty cl_superblocks list. Replace the cl_superblocks empty list check to see if it is time to shut down renewd with the NFS_CS_STOP_RENEW bit which is not set by such a data server. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 89d1ea65798953b251e399b17f32d31033889ae0 Author: Andy Adamson Date: Tue Mar 1 01:34:09 2011 +0000 NFSv4.1: send zero stateid seqid on v4.1 i/o Data servers require a zero stateid seqid, and there is no advantage to not doing the same for all NFSv4.1 Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 45a52a02072b2a7e265f024cfdb00127e08dd9f2 Author: Andy Adamson Date: Tue Mar 1 01:34:08 2011 +0000 NFS move nfs_client initialization into nfs_get_client Now nfs_get_client returns an nfs_client ready to be used no matter if it was found or created. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit bf9c1387ca80deac792c9ecf1c64dfcc5d1cc768 Author: Andy Adamson Date: Tue Mar 1 01:34:07 2011 +0000 NFSv4.1: put_layout_hdr can remove nfsi->layout Prevents an Oops triggered by CB_LAYOUTRECALL and LAYOUTGET race on a pnfs_layout_hdr first pnfs_layout_segment. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 6f78befc417dd7122249706b49520da29ba58451 Author: Andy Adamson Date: Tue Mar 1 01:34:06 2011 +0000 NFSv4: remove CONFIG_NFS_V4 from nfs_read_data Cleanup nfs_read_data. We also won't use CONFIG_NFS_V4_1 for additional NFSv4.1 fields in subsequent patches. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 136028967a283929c6f01518d0700b73fa622d56 Author: Fred Isaman Date: Fri Feb 11 15:42:38 2011 +0000 NFS: change nfs_writeback_done to return void The return values are not used by any callers. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 83762c56c1ba7c5b4b92fb32d570661633228bc6 Author: Fred Isaman Date: Fri Feb 11 15:42:37 2011 +0000 NFS: remove pointless if statement in nfs_direct_write_result The code was doing nothing more in either branch of the if. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit eabf5baaaaf41b6a0273043cfb06d53dca67acef Author: Fred Isaman Date: Fri Feb 11 15:42:36 2011 +0000 RPC: clarify rpc_run_task error handling rpc_run_task can only fail if it is not passed in a preallocated task. However, that is not at all clear with the current code. So remove several impossible to occur failure checks. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit cee6a5372f8804f58acc87f07816f64db36718e2 Author: Fred Isaman Date: Fri Feb 11 15:42:35 2011 +0000 RPC: remove check for impossible condition in rpc_make_runnable queue_work() only returns 0 or 1, never a negative value. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit f49f9baac8f63de9cbc17a0a84e04060496e8e76 Author: Fred Isaman Date: Thu Feb 3 18:28:52 2011 +0000 pnfs: fix pnfs lock inversion of i_lock and cl_lock The pnfs code was using throughout the lock order i_lock, cl_lock. This conflicts with the nfs delegation code. Rework the pnfs code to avoid taking both locks simultaneously. Currently the code takes the double lock to add/remove the layout to a nfs_client list, while atomically checking that the list of lsegs is empty. To avoid this, we rely on existing serializations. When a layout is initialized with lseg count equal zero, LAYOUTGET's openstateid serialization is in effect, making it safe to assume it stays zero unless we change it. And once a layout's lseg count drops to zero, it is set as DESTROYED and so will stay at zero. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 9f52c2525e09854ed6aa4cbd83915a56226d86c1 Author: Fred Isaman Date: Thu Feb 3 18:28:51 2011 +0000 pnfs: do not need to clear NFS_LAYOUT_BULK_RECALL flag We do not need to clear the NFS_LAYOUT_BULK_RECALL, as setting it guarantees that NFS_LAYOUT_DESTROYED will be set once any outstanding io is finished. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 38511722446993d926861696194c39ef135d85a4 Author: Fred Isaman Date: Thu Feb 3 18:28:50 2011 +0000 pnfs: avoid incorrect use of layout stateid The code could violate the following from RFC5661, section 12.5.3: "Once a client has no more layouts on a file, the layout stateid is no longer valid and MUST NOT be used." This can occur when a layout already has a lseg, starts another non-everlapping LAYOUTGET, and a CB_LAYOUTRECALL for the existing lseg is processed before we hit pnfs_layout_process(). Solve by setting, each time the client has no more lsegs for a file, a flag which blocks further use of the layout and triggers its removal. This also fixes a second bug which occurs in the same instance as above. If we actually use pnfs_layout_process, we add the new lseg to the layout, but the layout has been removed from the nfs_client list by the intervening CB_LAYOUTRECALL and will not be added back. Thus the newly acquired lseg will not be properly returned in the event of a subsequent CB_LAYOUTRECALL. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 81266baf04ce80b088a7fa0dcf3b9f5e79023dd2 Author: John W. Linville Date: Mon Mar 7 16:32:59 2011 -0500 ath5k: implement ieee80211_ops->{get,set}_ringparam set_ringparam only allows changes to tx ring at this time. Signed-off-by: John W. Linville commit 38c091590f6ed78fcaf114c14ce133e5b3f717e6 Author: John W. Linville Date: Mon Mar 7 16:19:18 2011 -0500 mac80211: implement support for cfg80211_ops->{get,set}_ringparam Signed-off-by: John W. Linville commit 6d55da53db3d9b911f69f2ce1e5fb8943eafe057 Author: Lai Jiangshan Date: Tue Dec 21 17:55:18 2010 +0800 plist: Add priority list test Add test code for checking plist when the kernel is booting. Signed-off-by: Lai Jiangshan LKML-Reference: <4D107986.1010302@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit bf6a9b8336ba12672755c2ae898b0abe42c7a5ac Author: Lai Jiangshan Date: Tue Dec 21 17:55:14 2010 +0800 plist: Shrink struct plist_head struct plist_head is used in struct task_struct as well as struct rtmutex. If we can make it smaller, it will also make these structures smaller as well. The field prio_list in struct plist_head is seldom used and we can get its information from the plist_nodes. Removing this field will decrease the size of plist_head by half. Signed-off-by: Lai Jiangshan LKML-Reference: <4D107982.9090700@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 017f2b239dabb2740b91df162e004371b861f371 Author: Lai Jiangshan Date: Tue Dec 21 17:55:10 2010 +0800 futex,plist: Remove debug lock assignment from plist_node The original code uses &plist_node->plist as the fake head of the priority list for plist_del(), these debug locks in the fake head are needed for CONFIG_DEBUG_PI_LIST. But now we always pass the real head to plist_del(), the debug locks in plist_node will not be used, so we remove these assignments. Acked-by: Darren Hart Signed-off-by: Lai Jiangshan LKML-Reference: <4D10797E.7040803@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 2e12978a9f7a7abd54e8eb9ce70a7718767b8b2c Author: Lai Jiangshan Date: Wed Dec 22 14:18:50 2010 +0800 futex,plist: Pass the real head of the priority list to plist_del() Some plist_del()s in kernel/futex.c are passed a faked head of the priority list. It does not fail because the current code does not require the real head in plist_del(). The current code of plist_del() just uses the head for checking, so it will not cause a bad result even when we use a faked head. But it is undocumented usage: /** * plist_del - Remove a @node from plist. * * @node: &struct plist_node pointer - entry to be removed * @head: &struct plist_head pointer - list head */ The document says that the @head is the "list head" head of the priority list. In futex code, several places use "plist_del(&q->list, &q->list.plist);", they pass a fake head. We need to fix them all. Thanks to Darren Hart for many suggestions. Acked-by: Darren Hart Signed-off-by: Lai Jiangshan LKML-Reference: <4D11984A.5030203@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit c7ecea24e26037fdfe9cbe83c9821689336f70d5 Author: Tony Lindgren Date: Fri Mar 11 11:39:51 2011 -0800 omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected Fix compile when CONFIG_OMAP_MUX is not selected Signed-off-by: Tony Lindgren commit 573efc2babf76422ebc5b373562a4c40d715b88e Author: R Sricharan Date: Fri Mar 11 06:04:46 2011 +0000 omap4: board-omap4panda: Initialise the serial pads Use the mux framework to initialise the serial pads. Signed-off-by: sricharan Signed-off-by: Tony Lindgren commit 626dda8a4e17bb2b0f16dd8db5173f20f48d2d22 Author: R Sricharan Date: Fri Mar 11 06:04:45 2011 +0000 omap3: board-3430sdp: Initialise the serial pads Use the mux framework to initialise the serial pads. Signed-off-by: sricharan Signed-off-by: Tony Lindgren commit dae335265561bf6ade66be494888a24b6419e345 Author: R Sricharan Date: Fri Mar 11 06:04:44 2011 +0000 omap4: board-4430sdp: Initialise the serial pads Use the mux framework to initialise the serial pads. Signed-off-by: sricharan Signed-off-by: Tony Lindgren commit 8aee6039465c9887af6a4babfa5b52f8bc96b43d Author: Tony Lindgren Date: Fri Mar 11 11:32:26 2011 -0800 omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init Add macro for defining static pins in the board file. We can now start implementing pin multiplexing in the platform init code for devices that call omap_hwmod_mux_init. Currently that is only implemented for serial.c. Signed-off-by: Tony Lindgren commit 86c79bf45f380c6efd907e95f993146b2b975232 Author: R Sricharan Date: Fri Mar 11 11:32:25 2011 -0800 omap2+: mux: Remove the use of IDLE flag Currently OMAP_DEVICE_PAD_IDLE flag is used to mux pins dynamically. This can be simplified by using the enabled state variable of each pad. This also fixes the issue of the static pads not getting muxed after idling and disable/enable state transitions. Signed-off-by: sricharan Signed-off-by: Tony Lindgren commit 029268e4c124a38b11ae965849ea2dfef724a568 Author: Tony Lindgren Date: Fri Mar 11 11:32:25 2011 -0800 omap2+: Add separate list for dynamic pads to mux This avoids going through the list unnecessarily when idling devices for runtime PM. Based on an earlier patch by sricharan . Signed-off-by: sricharan Signed-off-by: Tony Lindgren commit 1f940bdfc0d03265d178d9dfd840d854819f797d Author: Jens Axboe Date: Fri Mar 11 20:17:08 2011 +0100 block: fixup plugging stubs for !CONFIG_BLOCK They used an older prototype, fix it up. Reported-by: Randy Dunlap Signed-off-by: Jens Axboe commit 3677713b799155c96637cdef3fa025e42f3fcf48 Author: John W. Linville Date: Mon Mar 7 16:17:59 2011 -0500 wireless: add support for ethtool_ops->{get,set}_ringparam Signed-off-by: John W. Linville commit 266af4c745952e9bebf687dd68af58df553cb59d Author: Johannes Berg Date: Thu Mar 10 20:13:26 2011 -0800 iwlagn: support off-channel TX Add support to iwlagn for off-channel TX. The microcode API for this is a bit strange in that it uses a hacked-up scan command, so the scan code needs to change quite a bit to accomodate that and be able to send it out. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 808118cb41dfe12a1ac0e35515ac4d91b170bdf9 Author: Jason Young Date: Thu Mar 10 16:43:19 2011 -0800 mac80211: do not enable ps if 802.1x controlled port is unblocked If dynamic_ps is disabled, enabling power save before the 4-way handshake completes may delay the station from being authorized to send/receive traffic, i.e. increase roaming times. It also may result in a failed 4-way handshake depending on the AP's timing requirements and beacon interval, and the station's listen interval. To fix this, prevent power save from being enabled while the station isn't authorized and recalculate power save whenever the station's authorized state changes. Signed-off-by: Jason Young Acked-by: Johannes Berg Signed-off-by: John W. Linville commit d89dba7a275f40757d27ba16c8bc6aa424656bbe Author: Dan Carpenter Date: Thu Mar 10 18:23:26 2011 +0300 libertas: fix write past end of array in mesh_id_get() defs.meshie.val.mesh_id is 32 chars long. It's not supposed to be NUL terminated. This code puts a terminator on the end to make it easier to print to sysfs. The problem is that if the mesh_id fills the entire buffer the original code puts the terminator one spot past the end. The way the original code was written, there was a check to make sure that maxlen was less than PAGE_SIZE. Since we know that maxlen is at most 34 chars, I just removed the check. Signed-off-by: Dan Carpenter Acked-by: Dan Williams Signed-off-by: John W. Linville commit 23952ec92850bcdc91b8167fa95ec05dd59a80ea Author: Vivek Natarajan Date: Thu Mar 10 11:05:43 2011 +0530 ath9k_hw: Increase the wait count for nf load. Increasing the wait count makes the nf load pass in most of the cases. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 75e03512455827eb2c09e057578ae23178a93cf8 Author: Vivek Natarajan Date: Thu Mar 10 11:05:42 2011 +0530 ath9k_hw: Fix PLL initialization for AR9485. Increase the delay to make sure the initialization of pll passes. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 7ea1362c5d49c5761ce9fc3a4bbb090813134d03 Author: Vivek Natarajan Date: Thu Mar 10 11:05:41 2011 +0530 ath9k_hw: Improve idle power consumption for AR9485. Set some GPIO pins to Pull-down mode to save power. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 2e286947f1294239527c11f9f466ddce6466455b Author: Felix Fietkau Date: Wed Mar 9 01:48:12 2011 +0100 ath9k: remove support for the FIF_PROMISC_IN_BSS filter flag The hardware rx filter flag triggered by FIF_PROMISC_IN_BSS is overly broad and covers even frames with PHY errors. When this flag is enabled, this message shows up frequently during scanning or hardware resets: ath: Could not stop RX, we could be confusing the DMA engine when we start RX up Since promiscuous mode is usually not particularly useful, yet enabled by default by bridging (either used normally in 4-addr mode, or with hacks for various virtualization software), we should sacrifice it for better reliability during normal operation. This patch leaves it enabled if there are active monitor mode interfaces, since it's very useful for debugging. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 5f6722ee63a45d4ad3412743d161ec54d6c32ccc Author: Grazvydas Ignotas Date: Sun Mar 6 19:23:37 2011 +0200 wl1251: fix elp_work race condition While working on PS I've noticed elp_work is kicking rather often, and sometimes the chip is put to sleep before 5ms delay expires. This seems to happen because by the time wl1251_ps_elp_wakeup is called elp_work might still be pending. After wakeup is done, the processing may take some time, during which 5ms might expire and elp_work might get scheduled. In this case, ss soon as 1st thread finishes work and releases the mutex, elp_work will then put the device to sleep without 5ms delay. In addition 1st thread will queue additional elp_work needlessly. Fix this by cancelling work in wl1251_ps_elp_wakeup instead. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit d0c331aff99ca75f9aa0f794cf68b572d8ec7c5a Author: Grazvydas Ignotas Date: Sun Mar 6 19:23:36 2011 +0200 wl1251: remove wl1251_ps_set_elp function wl1251_ps_set_elp() only does acx_sleep_auth call and takes the chip from/to ELP, however all callers of wl1251_ps_set_mode() have already taken the chip out of ELP and puts it back to ELP when they finish. This makes ELP calls (and register writes they result in) superfluous. So remove wl1251_ps_set_elp function and call acx_sleep_auth directly. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit eba2ed9c9636d9e7ed203a2498ed230b48341709 Author: Tao Ma Date: Fri Mar 11 20:13:54 2011 +0100 block: remove obsolete comments for blkdev_issue_zeroout. barrier is already removed, so remove the obsolete comments in blkdev_issue_zeroout. Cc: Jens Axboe Signed-off-by: Tao Ma Signed-off-by: Jens Axboe commit 805f6b5e1cbfedfb9b3d354013e7f4b13a79270f Author: Tao Ma Date: Fri Mar 11 20:11:59 2011 +0100 blktrace: Use rq->cmd_flags directly in blk_add_trace_rq. In blk_add_trace_rq, we only chose the minor 2 bits from request's cmd_flags and did some check for discard. so most of other flags(e.g, REQ_SYNC) are missing. For example, with a sync write after blkparse we get: 8,16 1 1 0.001776503 7509 A WS 1349632 + 1024 <- (8,17) 1347584 8,16 1 2 0.001776813 7509 Q WS 1349632 + 1024 [dd] 8,16 1 3 0.001780395 7509 G WS 1349632 + 1024 [dd] 8,16 1 5 0.001783186 7509 I W 1349632 + 1024 [dd] 8,16 1 11 0.001816987 7509 D W 1349632 + 1024 [dd] 8,16 0 2 0.006218192 0 C W 1349632 + 1024 [0] Since now we have integrated the flags of both bio and request, it is safe to pass rq->cmd_flags directly to __blk_add_trace. With this patch, after a sync write we get: 8,16 1 1 0.001776900 5425 A WS 1189888 + 1024 <- (8,17) 1187840 8,16 1 2 0.001777179 5425 Q WS 1189888 + 1024 [dd] 8,16 1 3 0.001780797 5425 G WS 1189888 + 1024 [dd] 8,16 1 5 0.001783402 5425 I WS 1189888 + 1024 [dd] 8,16 1 11 0.001817468 5425 D WS 1189888 + 1024 [dd] 8,16 0 2 0.005640709 0 C WS 1189888 + 1024 [0] Signed-off-by: Tao Ma Acked-by: Jeff Moyer Signed-off-by: Jens Axboe commit 409ec36c320d580a036045e603f96286c362c609 Merge: 1b7fe59 8d5eab5 Author: John W. Linville Date: Fri Mar 11 14:11:11 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 978eb516a4e1a1b47163518d6f5d5e81ab27a583 Author: Stephen M. Cameron Date: Fri Mar 11 20:07:38 2011 +0100 cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation This bit got lost somewhere along the way. Without this, panic. Signed-off-by: Stephen M. Cameron Cc: stable@kernel.org Signed-off-by: Jens Axboe commit 957c2ec558caff09a3bdf333871fc617830f063d Author: Stephen M. Cameron Date: Fri Mar 11 20:06:09 2011 +0100 cciss: export resettable host attribute This attribute, requested by Redhat, allows kexec-tools to know whether the controller can honor the reset_devices kernel parameter and actually reset the controller. For kdump to work properly it is necessary that the reset_devices parameter be honored. This attribute enables kexec-tools to warn the user if they attempt to designate a non-resettable controller as the dump device. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 9a9fb12a4832bdf22751e21df298ef3559643b43 Author: Subhasish Ghosh Date: Mon Mar 7 14:06:57 2011 +0000 davinci: macro rename DA8XX_LPSC0_DMAX to DA8XX_LPSC0_PRUSS. DMAX is an internal name for the module which is known as PRUSS in TI public documentation. This patch just gets the code in sync with TI documentation. Signed-off-by: Subhasish Ghosh Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit b688c2fba51615b9746b1357925e18c85c57abd5 Author: Sergei Shtylyov <[sshtylyov@ru.mvista.com]> Date: Fri Feb 25 12:26:36 2011 +0530 davinci: DA850 EVM: kill useless variable Commit 75e2ea643fe43d5aa836475acee5bd97cd9ea4bf (davinci: DA850/OMAP-L138 EVM expander setup and UI card detection) introduced a useless variable: it's always set to 1 before it's checked in da850_evm_setup_nor_nand()... Signed-off-by: Sergei Shtylyov Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 16a3c8320a19467e26f7194dc2e21c63635ee157 Author: Sekhar Nori Date: Thu Feb 24 10:53:27 2011 +0530 davinci: add spi devices support for da830/omap-l137/am17x evm This patch adds the on-board SPI flash device to the DA830/OMAP-L137/AM17x EVM. It also registers the SPI flash device to the MTD subsystem. Based on SPI flash device support for MityDSP-L138F platform. Signed-off-by: Sekhar Nori [michael.williamson@criticallink.com: moved da830evm_spi0_pdata to devices-da8xx.c] [michael.williamson@criticallink.com: moved da830evm_init_spi0 to devices-da8xx.c] Signed-off-by: Michael Williamson Signed-off-by: Kevin Hilman commit fdce5568066e1173c9323f021c7ade6859b8234d Author: Sekhar Nori Date: Thu Feb 24 10:39:27 2011 +0530 davinci: add spi devices support for da850/omap-l138/am18x evm This patch adds the on-board SPI flash device to the DA850/OMAP-L138/AM18x EVM. It also registers the SPI flash device to the MTD subsystem. Based on SPI flash device support for MityDSP-L138F platform. Signed-off-by: Sekhar Nori [michael.williamson@criticallink.com: moved da850_evm_spi1_pdata to devices-da8xx.c] [michael.williamson@criticallink.com: moved da850evm_init_spi1 to devices-da8xx.c] Signed-off-by: Michael Williamson Signed-off-by: Kevin Hilman commit dd561c6a77edd5a106484901d8a5d3d5eb4a54b5 Author: Michael Williamson <[michael.williamson@criticallink.com]> Date: Thu Feb 24 10:22:47 2011 +0530 davinci: add spi devices support for MityDSP-L138/MityARM-1808 platform This patch adds support for accessing the on board SPI NOR FLASH device for MityDSP-L138 and MityARM-1808 SoMs. Signed-off-by: Michael Williamson Tested-by: Michael Williamson Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 54ce6883d29630ff334bee4256a25e3f8719a181 Author: Michael Williamson <[michael.williamson@criticallink.com]> Date: Thu Feb 24 10:18:28 2011 +0530 davinci: da8xx: add spi resources and registration routine Add IO resource structures, platform data, and a registration routine in order to support spi device on DA850/OMAP-L138/AM18x and DA830/OMAP-L137/AM17x platforms. Signed-off-by: Michael Williamson Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 12d35cf374a2ca116481d2bc2dcf6f89854646dd Author: Michael Williamson Date: Tue Feb 22 13:37:00 2011 +0000 davinci: da850: add spi device clock definitions Add spi clock information for da850. Signed-off-by: Michael Williamson Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 4918b40dc8b0e3addf3178f2dded99e149f5ad31 Author: Michael Williamson Date: Tue Feb 22 13:36:59 2011 +0000 davinci: da830: fix driver name for spi clocks The spi driver name called out for the da830 spi clock list is not correct, fix it. Signed-off-by: Michael Williamson Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit e38c2b22264319ac0ccc63d0a2366f8b6c33e32e Author: Michael Williamson Date: Tue Feb 22 13:36:57 2011 +0000 davinci: da8xx: clean up magic numbers in devices-da8xx.c Extract magic numbers from DMA resource initializers to #defines. Signed-off-by: Michael Williamson Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit e647198069b43fc5494b34c9a81c47566a764eb4 Author: Michael Williamson Date: Tue Feb 22 13:36:56 2011 +0000 davinci: remove unused DA830_edma_ch enum The DA830_edma_ch enum set is not used. Remove it. Signed-off-by: Michael Williamson Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 883ae7992c09435927dda642b61f1455fceb5b85 Author: Ike Panhc Date: Wed Feb 23 21:39:59 2011 +0800 ideapad: read brightness setting on brightness key notify BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=25922 On ideapad Y530, the brightness key notify will be blocked if the last notify is not responsed by getting the brightness value. Read value when we get the notify shall fix the problem and will not have any difference on other ideapads. Signed-off-by: Ike Panhc Signed-off-by: Matthew Garrett commit fc2ff592b5b41f3f32e790dd124eeb3bc80706c8 Author: Ivan Djelic Date: Fri Mar 11 11:05:34 2011 +0100 mtd: nand: enable software BCH ECC in nand simulator This patch adds option 'bch' to nandsim, which can be used to enable software BCH ECC (introduced in previous patches) and select BCH error correction capability. Signed-off-by: Ivan Djelic Signed-off-by: David Woodhouse commit 193bd40026443835e1b96c79d5efe559d01509ae Author: Ivan Djelic Date: Fri Mar 11 11:05:33 2011 +0100 mtd: nand: add software BCH ECC support This patch adds software BCH ECC support to mtd, in order to handle recent NAND device ecc requirements (4 bits or more). It does so by adding a new ecc mode (NAND_ECC_SOFT_BCH) for use by board drivers, and a new Kconfig option to enable BCH support. It relies on the generic BCH library introduced in a previous patch. When a board driver uses mode NAND_ECC_SOFT_BCH, it should also set fields chip->ecc.size and chip->ecc.bytes to select BCH ecc data size and required error correction capability. See nand_bch_init() documentation for details. It has been tested on the following platforms using mtd-utils, UBI and UBIFS: x86 (with nandsim), arm926ejs. Signed-off-by: Ivan Djelic Signed-off-by: David Woodhouse commit 0d9596958d0be59e6bb373b5e6bc0729cbba5110 Merge: a2358a7 5e7c58d Author: Tony Lindgren Date: Fri Mar 11 09:39:58 2011 -0800 Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 Merge: 94a06b7 a08572a Author: Tony Lindgren Date: Fri Mar 11 09:20:03 2011 -0800 Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus Conflicts: arch/arm/mach-omap2/pm34xx.c commit 171b3be9c42e97cd4530706654242f6a3efb6ac3 Author: Arnaldo Carvalho de Melo Date: Fri Mar 11 13:36:01 2011 -0300 perf symbol: Move sym_entry->skip to symbol->ignore While going thru each of the sym_entry fields looking to reduce it to the set of entries needed when in an active symbols list, 'skip' should really be in symbol, as we set it when loading the symtab. And the space used by the basic symbol allocation remains the same as we had 5 bytes of padding. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 878b439dccd064d6908800fab0b47bd3c3a87ebb Author: Arnaldo Carvalho de Melo Date: Fri Mar 11 13:13:36 2011 -0300 perf symbols: Rename dso->origin to dso->symtab_type And the DSO__ORIG_ enum to SYMTAB__, to clarify that this is about from where the symtab was obtained. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8b8ba4a9a5b04916858f79cee71873f973931649 Author: Arnaldo Carvalho de Melo Date: Fri Mar 11 12:38:48 2011 -0300 perf top: Remove redundant syme->origin field We can get it from syme->map->dso->kernel (that should be renamed to origin, but leave this for another patch). Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit ec52d9765a0f3603c62b4238482bf38897e4d42f Author: Arnaldo Carvalho de Melo Date: Fri Mar 11 10:11:48 2011 -0300 perf top: Remove redundant perf_top->sym_counter We can get that counter index from perf_top->sym_evsel->idx instead. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 865d794d1f144d0f93796840d01696cd70647a8a Merge: c914955 3ff84a7 Author: Pekka Enberg Date: Fri Mar 11 18:11:19 2011 +0200 Merge branch 'slab/urgent' into slab/next commit c9149556756d56c68451a4a8735c37e7062fd3d7 Merge: d71f606 5bfe53a Author: Pekka Enberg Date: Fri Mar 11 18:10:45 2011 +0200 Merge branch 'slab/rcu' into slab/next Conflicts: mm/slub.c commit 5bfe53a77e8a3ffce4a10003c75f464a138e272d Author: Lai Jiangshan Date: Thu Mar 10 15:22:24 2011 +0800 slab,rcu: don't assume the size of struct rcu_head The size of struct rcu_head may be changed. When it becomes larger, it may pollute the data after struct slab. Acked-by: Christoph Lameter Signed-off-by: Lai Jiangshan Signed-off-by: Pekka Enberg commit da9a638c6f8fc0633fa94a334f1c053f5e307177 Author: Lai Jiangshan Date: Thu Mar 10 15:22:00 2011 +0800 slub,rcu: don't assume the size of struct rcu_head The size of struct rcu_head may be changed. When it becomes larger, it will pollute the page array. We reserve some some bytes for struct rcu_head when a slab is allocated in this situation. Changed from V1: use VM_BUG_ON instead BUG_ON Acked-by: Christoph Lameter Signed-off-by: Lai Jiangshan Signed-off-by: Pekka Enberg commit ab9a0f196f2f4f080df54402493ea3dc31b5243e Author: Lai Jiangshan Date: Thu Mar 10 15:21:48 2011 +0800 slub: automatically reserve bytes at the end of slab There is no "struct" for slub's slab, it shares with struct page. But struct page is very small, it is insufficient when we need to add some metadata for slab. So we add a field "reserved" to struct kmem_cache, when a slab is allocated, kmem_cache->reserved bytes are automatically reserved at the end of the slab for slab's metadata. Changed from v1: Export the reserved field via sysfs Acked-by: Christoph Lameter Signed-off-by: Lai Jiangshan Signed-off-by: Pekka Enberg commit 86b32122fd54addc9af01f8b919c65d3f49090a3 Author: Konrad Rzeszutek Wilk Date: Wed Mar 9 22:03:16 2011 -0500 xen/e820: Don't mark balloon memory as E820_UNUSABLE when running as guest and fix overflow. If we have a guest that asked for: memory=1024 maxmem=2048 Which means we want 1GB now, and create pagetables so that we can expand up to 2GB, we would have this E820 layout: [ 0.000000] BIOS-provided physical RAM map: [ 0.000000] Xen: 0000000000000000 - 00000000000a0000 (usable) [ 0.000000] Xen: 00000000000a0000 - 0000000000100000 (reserved) [ 0.000000] Xen: 0000000000100000 - 0000000080800000 (usable) Due to patch: "xen/setup: Inhibit resource API from using System RAM E820 gaps as PCI mem gaps." we would mark the memory past the 1GB mark as unusuable resulting in: [ 0.000000] BIOS-provided physical RAM map: [ 0.000000] Xen: 0000000000000000 - 00000000000a0000 (usable) [ 0.000000] Xen: 00000000000a0000 - 0000000000100000 (reserved) [ 0.000000] Xen: 0000000000100000 - 0000000040000000 (usable) [ 0.000000] Xen: 0000000040000000 - 0000000080800000 (unusable) which meant that we could not balloon up anymore. We could balloon the guest down. The fix is to run the code introduced by the above mentioned patch only for the initial domain. We will have to revisit this once we start introducing a modified E820 for PCI passthrough so that we can utilize the P2M identity code. We also fix an overflow by having UL instead of ULL on 32-bit machines. [v2: Ian pointed to the overflow issue] Signed-off-by: Konrad Rzeszutek Wilk commit 8a5ec0ba42c4919e2d8f4c3138cc8b987fdb0b79 Author: Christoph Lameter Date: Fri Feb 25 11:38:54 2011 -0600 Lockless (and preemptless) fastpaths for slub Use the this_cpu_cmpxchg_double functionality to implement a lockless allocation algorithm on arches that support fast this_cpu_ops. Each of the per cpu pointers is paired with a transaction id that ensures that updates of the per cpu information can only occur in sequence on a certain cpu. A transaction id is a "long" integer that is comprised of an event number and the cpu number. The event number is incremented for every change to the per cpu state. This means that the cmpxchg instruction can verify for an update that nothing interfered and that we are updating the percpu structure for the processor where we picked up the information and that we are also currently on that processor when we update the information. This results in a significant decrease of the overhead in the fastpaths. It also makes it easy to adopt the fast path for realtime kernels since this is lockless and does not require the use of the current per cpu area over the critical section. It is only important that the per cpu area is current at the beginning of the critical section and at the end. So there is no need even to disable preemption. Test results show that the fastpath cycle count is reduced by up to ~ 40% (alloc/free test goes from ~140 cycles down to ~80). The slowpath for kfree adds a few cycles. Sadly this does nothing for the slowpath which is where the main issues with performance in slub are but the best case performance rises significantly. (For that see the more complex slub patches that require cmpxchg_double) Kmalloc: alloc/free test Before: 10000 times kmalloc(8)/kfree -> 134 cycles 10000 times kmalloc(16)/kfree -> 152 cycles 10000 times kmalloc(32)/kfree -> 144 cycles 10000 times kmalloc(64)/kfree -> 142 cycles 10000 times kmalloc(128)/kfree -> 142 cycles 10000 times kmalloc(256)/kfree -> 132 cycles 10000 times kmalloc(512)/kfree -> 132 cycles 10000 times kmalloc(1024)/kfree -> 135 cycles 10000 times kmalloc(2048)/kfree -> 135 cycles 10000 times kmalloc(4096)/kfree -> 135 cycles 10000 times kmalloc(8192)/kfree -> 144 cycles 10000 times kmalloc(16384)/kfree -> 754 cycles After: 10000 times kmalloc(8)/kfree -> 78 cycles 10000 times kmalloc(16)/kfree -> 78 cycles 10000 times kmalloc(32)/kfree -> 82 cycles 10000 times kmalloc(64)/kfree -> 88 cycles 10000 times kmalloc(128)/kfree -> 79 cycles 10000 times kmalloc(256)/kfree -> 79 cycles 10000 times kmalloc(512)/kfree -> 85 cycles 10000 times kmalloc(1024)/kfree -> 82 cycles 10000 times kmalloc(2048)/kfree -> 82 cycles 10000 times kmalloc(4096)/kfree -> 85 cycles 10000 times kmalloc(8192)/kfree -> 82 cycles 10000 times kmalloc(16384)/kfree -> 706 cycles Kmalloc: Repeatedly allocate then free test Before: 10000 times kmalloc(8) -> 211 cycles kfree -> 113 cycles 10000 times kmalloc(16) -> 174 cycles kfree -> 115 cycles 10000 times kmalloc(32) -> 235 cycles kfree -> 129 cycles 10000 times kmalloc(64) -> 222 cycles kfree -> 120 cycles 10000 times kmalloc(128) -> 343 cycles kfree -> 139 cycles 10000 times kmalloc(256) -> 827 cycles kfree -> 147 cycles 10000 times kmalloc(512) -> 1048 cycles kfree -> 272 cycles 10000 times kmalloc(1024) -> 2043 cycles kfree -> 528 cycles 10000 times kmalloc(2048) -> 4002 cycles kfree -> 571 cycles 10000 times kmalloc(4096) -> 7740 cycles kfree -> 628 cycles 10000 times kmalloc(8192) -> 8062 cycles kfree -> 850 cycles 10000 times kmalloc(16384) -> 8895 cycles kfree -> 1249 cycles After: 10000 times kmalloc(8) -> 190 cycles kfree -> 129 cycles 10000 times kmalloc(16) -> 76 cycles kfree -> 123 cycles 10000 times kmalloc(32) -> 126 cycles kfree -> 124 cycles 10000 times kmalloc(64) -> 181 cycles kfree -> 128 cycles 10000 times kmalloc(128) -> 310 cycles kfree -> 140 cycles 10000 times kmalloc(256) -> 809 cycles kfree -> 165 cycles 10000 times kmalloc(512) -> 1005 cycles kfree -> 269 cycles 10000 times kmalloc(1024) -> 1999 cycles kfree -> 527 cycles 10000 times kmalloc(2048) -> 3967 cycles kfree -> 570 cycles 10000 times kmalloc(4096) -> 7658 cycles kfree -> 637 cycles 10000 times kmalloc(8192) -> 8111 cycles kfree -> 859 cycles 10000 times kmalloc(16384) -> 8791 cycles kfree -> 1173 cycles Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit d3f661d69a486db0e0e6343b452f45d91b4b3656 Author: Christoph Lameter Date: Fri Feb 25 11:38:52 2011 -0600 slub: Get rid of slab_free_hook_irq() The following patch will make the fastpaths lockless and will no longer require interrupts to be disabled. Calling the free hook with irq disabled will no longer be possible. Move the slab_free_hook_irq() logic into slab_free_hook. Only disable interrupts if the features are selected that require callbacks with interrupts off and reenable after calls have been made. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 1a757fe5d4234293d6a3acccd7196f1386443956 Author: Christoph Lameter Date: Fri Feb 25 11:38:51 2011 -0600 slub: min_partial needs to be in first cacheline It is used in unfreeze_slab() which is a performance critical function. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 2a6c5176ecc87eaeb5b1e6d8e64deb9430f4e602 Merge: a5abba9 b9ec40a Author: Pekka Enberg Date: Fri Mar 11 17:42:05 2011 +0200 Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into slub/lockless commit 5e7c58dc8d9b7f31d418cf98c6a8cad84b86f510 Author: Jean Pihet Date: Thu Mar 3 11:25:43 2011 +0100 perf: add OMAP support for the new power events The patch adds the new power management trace points for the OMAP architecture. The trace points are for: - default idle handler. Since the cpuidle framework is instrumented in the generic way there is no need to add trace points in the OMAP specific cpuidle handler; - SoC clocks changes (enable, disable, set_rate), - power domain states: the desired target state and -if different- the actually hit state. Because of the generic nature of the changes, OMAP3 and OMAP4 are supported. Tested on OMAP3 with suspend/resume, cpuidle, basic DVFS. Signed-off-by: Jean Pihet Acked-by: Paul Walmsley Signed-off-by: Kevin Hilman commit a271e58cfbe345f71d39ebbae063ad2d68892470 Author: Shweta Gulati Date: Sat Mar 5 15:22:26 2011 +0530 OMAP4: Add IVA OPP enteries. This Patch adds OPP enteries for IVA in OMAP4 OPP Table Tested on OMAP4430 SDP Board. Signed-off-by: Shweta Gulati Acked-by: Nishanth Menon Signed-off-by: Kevin Hilman commit d9a2012d32922ef235106469caff3e79dd9e6f09 Author: Shweta Gulati Date: Thu Mar 10 10:23:49 2011 +0530 OMAP4: Update Voltage Rail Values for MPU, IVA and CORE Update MPU, IVA and CORE voltage Rail values obtained from OMAP4430 Data Manual Operating Condition Addendum_v0.4. Tested on OMAP4430 SDP Board. Signed-off-by: Shweta Gulati Acked-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 273032f7822fe4fb0b585219385a744732e86707 Author: Shweta Gulati Date: Sat Mar 5 15:21:21 2011 +0530 OMAP4: Enable 800 MHz and 1 GHz MPU-OPP Almost all OMAP4 boards support OPP 800 MHz and OPP 1 GHz. Enable them in OPP Table. For small minority of boards which use OMAP4430-800 MHz device OPP 1GHz is not supported, OPP 1GHz should be disabled from board file. Signed-off-by: Shweta Gulati Acked-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 15f13e23e818c9de81003f37430eb648abae9107 Author: Vishwanath BS Date: Sat Mar 5 15:57:22 2011 +0530 OMAP3+: OPP: Replace voltage values with Macros Since all voltage data is now centralized in oppxxx_data.c, we can replace the values in the opp table with the macros used for voltage values. This will avoid opp table and voltage layer having conflicting values. Signed-off-by: Vishwanath BS Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 89d8d32060de17c23f761df74799c7c07b79dd01 Author: David Woodhouse Date: Fri Mar 11 15:17:41 2011 +0000 mtd: fix printf format warnings, mostly lack of %zd for size_t, in mtdswap Signed-off-by: David Woodhouse commit 7e79443ce250776b8477426127acdac15c567f22 Author: Takashi Iwai Date: Fri Mar 11 15:45:32 2011 +0100 ALSA: atiixp - Fix wrong time-out checks during ac-link reset The time-out in snd_atiixp_aclink_reset() is wrongly checked, and it resulted in exiting from the loop at the first iteration. Reported-by: Amir Shamsuddin Signed-off-by: Takashi Iwai commit 629286b9561982e90a6d49893a1c641e71b6a2a3 Author: Xiaochen Wang Date: Thu Mar 10 22:31:39 2011 +0800 mtd: sm_rtl: check kmalloc return value Because malloc/kzalloc may fail, we should check kmalloc/kzalloc return value in sm_create_sysfs_attributes(), mtd/sm_rtl.c and do error handling. Meanwhile, we should check sm_create_sysfs_attributes return value. Signed-off-by: Xiaochen Wang Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 1065cda8a1a57d0d3bfccdce1a655a84439d24e0 Author: Steffen Sledz Date: Thu Mar 10 09:05:12 2011 +0100 mtd: cfi: add support for AMIC flashes (e.g. A29L160AT) Signed-off-by: Steffen Sledz Signed-off-by: David Woodhouse commit 437aa565e2656776a7104aaacd792fe789ea8b2d Author: Ivan Djelic Date: Fri Mar 11 11:05:32 2011 +0100 lib: add shared BCH ECC library This is a new software BCH encoding/decoding library, similar to the shared Reed-Solomon library. Binary BCH (Bose-Chaudhuri-Hocquenghem) codes are widely used to correct errors in NAND flash devices requiring more than 1-bit ecc correction; they are generally better suited for NAND flash than RS codes because NAND bit errors do not occur in bursts. Latest SLC NAND devices typically require at least 4-bit ecc protection per 512 bytes block. This library provides software encoding/decoding, but may also be used with ASIC/SoC hardware BCH engines to perform error correction. It is being currently used for this purpose on an OMAP3630 board (4bit/8bit HW BCH). It has also been used to decode raw dumps of NAND devices with on-die BCH ecc engines (e.g. Micron 4bit ecc SLC devices). Latest NAND devices (including SLC) can exhibit high error rates (typically a dozen or more bitflips per hour during stress tests); in order to minimize the performance impact of error correction, this library implements recently developed algorithms for fast polynomial root finding (see bch.c header for details) instead of the traditional exhaustive Chien root search; a few performance figures are provided below: Platform: arm926ejs @ 468 MHz, 32 KiB icache, 16 KiB dcache BCH ecc : 4-bit per 512 bytes Encoding average throughput: 250 Mbits/s Error correction time (compared with Chien search): average worst average (Chien) worst (Chien) ---------------------------------------------------------- 1 bit 8.5 µs 11 µs 200 µs 383 µs 2 bit 9.7 µs 12.5 µs 477 µs 728 µs 3 bit 18.1 µs 20.6 µs 758 µs 1010 µs 4 bit 19.5 µs 23 µs 1028 µs 1280 µs In the above figures, "worst" is meant in terms of error pattern, not in terms of cache miss / page faults effects (not taken into account here). The library has been extensively tested on the following platforms: x86, x86_64, arm926ejs, omap3630, qemu-ppc64, qemu-mips. Signed-off-by: Ivan Djelic Signed-off-by: David Woodhouse commit 2c1c5f199482356c00f70b6f2f368c3455d1230c Author: Baruch Siach Date: Wed Mar 9 16:12:20 2011 +0200 mtd: mxc_nand: fix OOB corruption when page size > 2KiB When page size is 4KiB, ecc.total is set to 8*9, and this causes nand_write_page_hwecc() to read past the initialized part of the eccpos array, which corrupts chip->oob_poi with bogus values from ecc_calc. Fix this by creating a proper nand_ecclayout for 4KiB flashes. Signed-off-by: Baruch Siach Acked-by: Sascha Hauer Signed-off-by: David Woodhouse commit f43272c482661bc88347bba237976eecfc1dbf5b Author: Sandeep Paulraj Date: Mon Mar 7 13:50:44 2011 -0500 mtd: DaVinci: Removed header file that is not required The DaVinci NAND driver was including the mach-types.h header file. This prevented the DaVinci NAND driver from getting used in a DSP only device. The linux port on c6x devices can make use of the same driver and does not define a corresponding header file. This header file was required in the driver because earlier there was code dependent on a machine_* check. This piece of code has now been factored out and is in arch/arm/mach-davinci/aemif.c Thus removing the header file is harmless Signed-off-by: Sandeep Paulraj Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 4332c116869ceca58638beabd9e9a5d7db4cef83 Author: Lei Wen Date: Thu Mar 3 11:27:01 2011 +0800 mtd: pxa3xx_nand: clean the keep configure code Use nand_scan_ident to unify the need of mtd member initilization for both normal detection and keep configuration method. Signed-off-by: Lei Wen Signed-off-by: Haojian Zhuang Signed-off-by: David Woodhouse commit 401e67e225f350757e11e39392dcc6a0fddcea63 Author: Lei Wen Date: Mon Feb 28 10:32:14 2011 +0800 mtd: pxa3xx_nand: mtd scan id process could be defined by driver itself Different NAND driver may require its unique detection. For pxa3xx_nand, it use its self id database to get the necessary info. Signed-off-by: Lei Wen Signed-off-by: Haojian Zhuang Signed-off-by: David Woodhouse commit 4eb2da8994042d68e84e31138788429a102da2ea Author: Lei Wen Date: Mon Feb 28 10:32:13 2011 +0800 mtd: pxa3xx_nand: unify prepare command Make the interface simpler which could make both debug and enhancement easier. Signed-off-by: Lei Wen Signed-off-by: Haojian Zhuang Signed-off-by: David Woodhouse commit 38caf7f68e6b4ad84094095887a490e3fa2ec501 Author: Lei Wen Date: Mon Feb 28 10:32:12 2011 +0800 mtd: pxa3xx_nand: discard wait_for_event,write_cmd,__readid function Since we have rework the irq process, we don't need additional delay in wait_for_event. Also write_cmd and __readid is also discarded for the same reason. Signed-off-by: Lei Wen Signed-off-by: Haojian Zhuang Acked-by: Eric Miao Signed-off-by: David Woodhouse commit f8155a404db95656f1519b28fdb96cb68f8b2364 Author: Lei Wen Date: Mon Feb 28 10:32:11 2011 +0800 mtd: pxa3xx_nand: rework irq logic Enable all irq when we start the nand controller, and put all the transaction logic in the pxa3xx_nand_irq. By doing this way, we could dramatically increase the performance by avoid unnecessary delay. Signed-off-by: Lei Wen Signed-off-by: Haojian Zhuang Signed-off-by: David Woodhouse commit e353a20afaee1e3e67fc4fa663a76c68a4c1fb74 Author: Lei Wen Date: Thu Mar 3 11:08:30 2011 +0800 mtd: pxa3xx_nand: make scan procedure more clear The previous probe function is some kind of big part. This patch seperate the resource allocation to keep the probe process more clear than before. Signed-off-by: Lei Wen Signed-off-by: Haojian Zhuang Signed-off-by: David Woodhouse commit e70727e442eb61581f836a9a0ca0c3b70d8a3ff2 Author: David Lambert Date: Mon Mar 7 12:00:46 2011 +0200 mtd: speedtest: fix integer overflow 32-bit integers used in 'calc_speed()' may overflow and lead to incorrect results. Use 64-bit integers instead. Signed-off-by: David Lambert Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 5d9d9936209e589569a97985285b3282310cf2db Author: Baruch Siach Date: Wed Mar 2 16:47:55 2011 +0200 mtd: mxc_nand: fix read past buffer end Signed-off-by: Baruch Siach Acked-by: Sascha hauer Signed-off-by: David Woodhouse commit 74f1b7244e502c5a98906a5dcc5ec389aacd25e6 Author: John Ogness Date: Mon Feb 28 13:12:46 2011 +0100 mtd: omap3: nand: report corrected ecc errors The number of corrected ECC errors should be reported since other MTD systems make use of this information (such as UBI data scrubbing). Signed-off-by: John Ogness Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit bea9312839c51853a2837336405c829b0bf18f88 Author: Tracey Dent Date: Sat Feb 26 11:15:13 2011 -0500 jffs2: remove a trailing white space in commentaries Signed-off-by: Tracey Dent Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 775adc3d44c8076d3e475fabebb61c08421c4421 Author: Jason Liu Date: Fri Feb 25 13:06:18 2011 +0800 mtd: nand: fix a typo in a commentary Signed-off-by: Jason Liu Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit c93ff6bf16523d33e991a1fadde1b8d63eb7cd2c Author: Roman Tereshonkov Date: Thu Feb 17 13:44:42 2011 +0200 mtd: omap: add new variable to platform data to control onenand unlocking New variable skip_initial_unlocking is added to the omap_onenand_platform_data. This is used to inform the onenand driver to skip onenand unlocking when it is initialized. Signed-off-by: Roman Tereshonkov Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit b3dcfd35244e1cb8dc8dfa5c05013b133dbb437a Author: Roman Tereshonkov Date: Thu Feb 17 13:44:41 2011 +0200 mtd: onenand: add new option to control initial onenand unlocking A new option ONENAND_SKIP_INITIAL_UNLOCKING is added. This allows to disable initial onenand unlocking when the driver is initialized. Signed-off-by: Roman Tereshonkov Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit dcfb81d61da1367e52f7f7e3ceff0d0044c3c7ee Author: David Griego Date: Tue Nov 30 15:32:05 2010 +0530 mtd: NOR flash driver for OMAP-L137/AM17x OMAP-L137/AM17x has limited number of dedicated EMIFA address pins, enough to interface directly to an SDRAM. If a device such as an asynchronous flash needs to be attached to the EMIFA, then either GPIO pins or a chip select may be used to control the flash device's upper address lines. This patch adds support for the NOR flash on the OMAP-L137/ AM17x user interface daughter board using the latch-addr-flash MTD mapping driver which allows flashes to be partially physically addressed. The upper address lines are set by a board specific code which is a separate patch. Signed-off-by: David Griego Signed-off-by: Aleksey Makarov Signed-off-by: Sergei Shtylyov Signed-off-by: Savinay Dharmappa Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit a321590246202f2598aca2f4ef63b992e8fc97ef Author: Jarkko Lavinen Date: Mon Feb 14 16:16:11 2011 +0200 mtd: Add mtdswap block driver Add a driver for allowing an mtd device to be used as a block device for swapping. The block device is volatile, and the mapping of swapped pages is not stored on flash. Signed-off-by: Jarkko Lavinen Tested-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 115ee88c15b55859a8b59c5dccb3882bbd47e542 Author: Jarkko Lavinen Date: Mon Feb 14 16:16:10 2011 +0200 mtd_blkdevs: Set the maximum discards size Set max_discard_sectors to UINT_MAX. Signed-off-by: Jarkko Lavinen Tested-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit c7519dbf6f4b4408229d279d799c938ffdd06f21 Author: Jarkko Lavinen Date: Mon Feb 14 16:16:09 2011 +0200 mtd_blkdevs: Add background processing support Add a new background method into mtd_blktrans_ops, add background support into mtd_blktrans_thread(), and add mtd_blktrans_cease_background(). If the mtd blktrans dev has the background support, the thread will call background function when the request queue becomes empty. The background operation may run as long as needs to until mtd_blktrans_cease_background() tells to stop. Signed-off-by: Jarkko Lavinen Tested-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 13ce77f46c79a3839e4c2ff9722c9416c165f498 Author: Anatolij Gustschin Date: Thu Feb 10 16:01:46 2011 +0100 mtd: cfi: fix writebufsize initialization When initializing mtd->writebufsize, we must take into account possible flash chip interleaving. Wrong writebufsize initialization caused UBIFS recovery issues resulting in unmountable UBIFS file system on NOR flash partitions. Signed-off-by: Anatolij Gustschin Acked-by: Guillaume LECERF Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit d8f90b2c9d521500bcd4a1ecdcdb283bfdd2186f Author: Yoshihiro Shimoda Date: Wed Feb 9 17:00:33 2011 +0900 mtd: m25p80: add support for M25PX64 Signed-off-by: Yoshihiro Shimoda Signed-off-by: David Woodhouse commit 4085bcc682e1276ab4ac2da9866daadf944d7167 Author: Roman Tereshonkov Date: Tue Feb 8 12:02:40 2011 +0200 mtd: tests: add multiblock erase test to the mtd_speedtest New multiblock erase speed test is added to mtd_speedtest. It consists of 2-, 4-, 8-, 16-, 32- and 64-blocks at once multiblock erase tests. Signed-off-by: Roman Tereshonkov Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit fc7fe7691c6bbd5f8f51a87e759770975c648410 Author: Adrian Hunter Date: Tue Feb 8 12:02:39 2011 +0200 mtd: tests: add count parameter to mtd_speedtest By default mtd_speedtest uses all the eraseblocks of the MTD partition being tested. For large partitions a smaller number is sufficient and makes running the test quicker. For that reason, add a parameter 'count' to specify the maximum number of eraseblocks to use for testing. Signed-off-by: Adrian Hunter Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit e6da85685b2dec1e69e58366c22d1f883d6da575 Author: Roman Tereshonkov Date: Tue Feb 8 12:02:42 2011 +0200 mtd: onenand_base: onenand_verify bugfix for writepage non-aligned address In onenand_verify function the address can be writepage non-aligned. When a page is read for comparing the right offset should be used for "this->verify_buf" to get the right matching with compared "buf" buffer. Signed-off-by: Roman Tereshonkov Signed-off-by: Adrian Hunter Acked-by: Kyungmin Park Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit b085058fe556328443f982d892c9657b3aff9d4a Author: Adrian Hunter Date: Tue Feb 8 12:02:38 2011 +0200 mtd: OneNAND: return read error for 4KiB page read When reading using the 4KiB page read function, I/O errors could be ignored if more than 1 page was read at a time. Signed-off-by: Adrian Hunter Acked-by: Kyungmin Park Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 7912a5e7f37512d8d105785046137435b70347ce Author: Stanislav Fomichev Date: Mon Feb 7 23:48:25 2011 +0300 mtd: nand: fix pointer NULL pointer dereferencing In 'verify_bbt_descr()', first check the "bd" pointer, then dereference it. Comments amended by Artem. Signed-off-by: Stanislav Fomichev Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 7b7e905ec2ec511e06279181ca95a892db21e292 Author: Roman Tereshonkov Date: Thu Feb 3 13:45:56 2011 +0200 mtd: tests: print correct values The ebcnt and pgcnt variable initialization is moved before printk which uses them. Signed-off-by: Roman Tereshonkov Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 3ee7451a023dd197fcfc1ba46dcce6d8ec5e1b78 Author: Julia Lawall Date: Wed Feb 2 18:13:36 2011 +0100 mtd: ts5500_flash: avoid calling map_destroy on NULL map_destroy dereferences its argument. The call is furthermore only reachable when this argument is NULL. Thus the call is dropped. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression *x; @@ *if (x == NULL) { ... * map_destroy(x); ... return ...; } // Signed-off-by: Julia Lawall Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit f17f12ce9dd6ec0a8e1f415ecdbaebfce0207464 Author: Mathias Krause Date: Sun Jan 30 10:31:48 2011 +0100 mtd: phram: fix memory leak Commit 4f678a58 (mtd: fix memory leaks in phram_setup) missed two cases where the memory allocated for name would be leaked. This commit frees the memory when register_device() fails and on unregister_devices(). Signed-off-by: Mathias Krause Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 07be303d22ac7e067b8a7172a4043ebe32b74b33 Author: Artem Bityutskiy Date: Wed Feb 2 08:53:55 2011 +0200 mtd: mtdram: initialize writebufsize field Set the 'mtd->writebufsize' field to 64 to mimic modern CFI flashes. Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 37a23c20181aaddb8019f0a57bcda334412b89f8 Author: Gabor Juhos Date: Tue Jan 25 11:20:26 2011 +0100 mtd: m25p80: add support for the EON EN25F32 chip Signed-off-by: Gabor Juhos Signed-off-by: David Woodhouse commit 771df61949cf2d6ae9ff07e209c80693cdbc9302 Author: Holger Brunck Date: Mon Jan 24 17:45:42 2011 +0100 mtd: adapt writebufsize calculation for concat If different chips with different writebufsize are concatenated, the writebufsize from the concat device has to be taken from the device with the largest writebuffer. This writebufsize is used later on in the UBI layer for the min I/O size. Signed-off-by: Holger Brunck Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit cbc6c5e73dfa598b1fa5e67cef28096186e2a7cd Author: Hong Xu Date: Tue Jan 18 14:36:05 2011 +0800 mtd: atmel_nand: Add DMA support to access Nandflash Some SAM9 chips have the ability to perform DMA between CPU and SMC controller. This patch adds DMA support for SAM9RL, SAM9G45, SSAM9G46,AM9M10, SAM9M11. Signed-off-by: Hong Xu Tested-by: Ryan Mallon Acked-by: Ryan Mallon Signed-off-by: David Woodhouse commit 7f53f12f02b0b60af373a07fcac62b578381308e Author: H Hartley Sweeten Date: Tue Jan 11 18:46:10 2011 -0600 mtd: mtd_blkdevs: local symbols should be static The function blktrans_dev_release and blktrans_dev_put are only used locally in this file and should be static. Signed-off-by: H Hartley Sweeten Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit ca91facf6babe548b5386993bb2820b7dc9b743d Author: H Hartley Sweeten Date: Tue Jan 11 18:37:25 2011 -0600 mtd: local symbols should be static The three backing_dev_info symbols are only used in this file and should be static. Signed-off-by: H Hartley Sweeten Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 83025c824fce44b6d007b9bbc506c4189fb89da1 Author: Jamie Iles Date: Tue Jan 11 12:43:49 2011 +0000 mtd: mpc5121_nfc: don't treat NULL clk as an error clk_get() returns a struct clk cookie to the driver and some platforms may return NULL if they only support a single clock. clk_get() has only failed if it returns a ERR_PTR() encoded pointer. Signed-off-by: Jamie Iles Reviewed-by: Wolfram Sang Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit f53fdebcc3e1e5d15ffd0b1204d5944b4ceb8a07 Author: Dmitry Eremin-Solenikov Date: Tue Jan 11 14:33:39 2011 +0300 mtd: drop MTD_CONCAT from Kconfig entirely As there are no more dependencies on MTD_CONCAT or CONFIG_MTD_CONCAT, drop this entry from Kconfig entirely. Signed-off-by: Dmitry Eremin-Solenikov Acked-by: Stefan Roese Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 06f2ae3c91ea04b0d640e0dd9cf69a265f5ecda6 Author: Dmitry Eremin-Solenikov Date: Tue Jan 11 14:33:38 2011 +0300 CRIS: stop checking for MTD_CONCAT As MTD_CONCAT support is becoming an integral part of MTD core, there is no need for it's special treatment. So stop checking for MTD_CONCAT availability. Acked by Jesper Nilsson for merging this via the MTD tree. Signed-off-by: Dmitry Eremin-Solenikov Acked-by: Stefan Roese Signed-off-by: Jesper Nilsson Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit a8adc3f01b9a757a0d290b2987af6b998697399f Author: Dmitry Eremin-Solenikov Date: Tue Jan 11 14:33:37 2011 +0300 mtd: drop CONFIG_MTD_CONCAT ifdefs As MTD_CONCAT is becoming a part of mtd core, it's now meaningless to to check for it in ifdefs. Drop such references from MTD code. Signed-off-by: Dmitry Eremin-Solenikov Acked-by: Stefan Roese Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit e1d6ee722285278b427007fc3fa4421a0c1b3b3c Author: Dmitry Eremin-Solenikov Date: Tue Jan 11 14:33:36 2011 +0300 mtd: drop MTD_CONCAT dependencies from Kconfig As MTD_CONCAT is becoming a part of mtd core, it's no longer necessary to depend on it in Kconfig scripts. Drop such references. Signed-off-by: Dmitry Eremin-Solenikov Acked-by: Stefan Roese Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 4d42942cff0785d8a153bafcd62b6870726cd5f1 Author: Dmitry Eremin-Solenikov Date: Tue Jan 11 14:33:35 2011 +0300 mtd: make MTD_CONCAT support mandatory Move mtdconcat to be an integral part of the mtd core. It's a tiny bit of code, which bears 'say Y if you don't know what to do' note in the Kconfig. OTOH there are several ugly ifdefs depending on the MTD_CONCAT. So, making MTD_CONCAT support mandatory will allow us to clean up code a lot. Kconfig entry is changed to be a bool defaulting to Y, so all code pieces depending on it, will have MTD_CONCAT Kconfig symbol and CONFIG_MTD_CONCAT define. This will be removed in one of next patches. Signed-off-by: Dmitry Eremin-Solenikov Acked-by: Stefan Roese Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 966a7f0dc4de57cf52467968e4244d218a5c3506 Author: Paul Bolle Date: Fri Mar 11 11:41:06 2011 +0100 ALSA: intel8x0m: append 'm' to "r_intel8x0" Appending an 'm' will distinguish it from a similar struct in intel8x0.c Signed-off-by: Paul Bolle Signed-off-by: Takashi Iwai commit a6e8509f2172a6ac764a82763fce64836a108a14 Author: Paul Bolle Date: Fri Mar 11 11:37:55 2011 +0100 ALSA: intel8x0m: add 'm' as "suffix" to static functions Adding an 'm' will distinguish them from identical names in intel8x0.c. Signed-off-by: Paul Bolle Signed-off-by: Takashi Iwai commit 5cd2ad81f912c8535491f541108b655f4552dff9 Author: Paul Bolle Date: Fri Mar 11 11:24:52 2011 +0100 ALSA: intel8x0m: wait a bit before warm reset check At every resume a laptop I use prints this message (at KERN_ERR level): ALSA sound/pci/intel8x0m.c:904: AC'97 warm reset still in progress? [0x2] The thing to note here is that 0x2 corresponds to ICH_AC97COLD. Ie, what seems to be happening is that the register involved indicated a warm reset for some time (as the ICH_AC97WARM bit was set) but by the time the warning is printed, and that same register is checked again, that bit is already cleared and only the ICH_AC97COLD bit is still set. It turns out a warm reset needs some time to settle, but it is currently checked right away. The test therefore fails the first time it is done and schedule_timeout_uninterruptible() will be called. Once we return from that jiffies is already (far) past end_time on this laptop, so we exit the loop, print a warning, and exit the function while the warm reset actually succeeded. A way to fix this is to call usleep_range() after writing to the register involved. A handful of tests suggest 500 usecs is a safe value. (This might punish the "finish cold reset" case, but on this laptop such a cold reset apparently never happens, so I can't say for sure.) While we're at it drop the extra single tick from end_time, as it looks rather silly. Signed-off-by: Paul Bolle Signed-off-by: Takashi Iwai commit 88a8516a2128a6d078a106ead48092240e8a138f Author: Oliver Neukum Date: Fri Mar 11 14:51:12 2011 +0100 ALSA: usbaudio: implement USB autosuspend Devices are autosuspended if no pcm nor midi channel is open Mixer devices may be opened. This way they are active when in use to play or record sound, but can be suspended while users have a mixer application running. [Small clean-ups using static inline by tiwai] Signed-off-by: Oliver Neukum Signed-off-by: Takashi Iwai commit edf7de31c25ce72f163bf7d1fc0d2711869d073c Author: Oliver Neukum Date: Fri Mar 11 13:19:43 2011 +0100 ALSA: usbaudio: fix suspend/resume - ESHUTDOWN must be correctly handled - the optional interrupt endpoint's URB must be stopped and restarted Signed-off-by: Oliver Neukum Signed-off-by: Takashi Iwai commit cce18a947967ed028e5301bce84cbaff395489a6 Author: Steve Sakoman Date: Wed Mar 9 18:08:06 2011 -0600 OMAP: Add gpio-keys support for Overo This patch adds support for the standard push buttons available on Overo expansion boards. Signed-off-by: Steve Sakoman Acked-by: Tony Lindgren Signed-off-by: Tomi Valkeinen commit 7c94f68d7b490c7787c6b97c5b2d6d56d57b071c Author: Steve Sakoman Date: Wed Mar 9 18:08:05 2011 -0600 OMAP: Add gpio-leds support for Overo This patch adds support for the standard LEDs on the Overo COM and expansion boards Signed-off-by: Steve Sakoman Acked-by: Tony Lindgren Signed-off-by: Tomi Valkeinen commit cc99a0861fa1c72335dc91a2e06d0b431911d55e Merge: bc3a8a0 382225e Author: Takashi Iwai Date: Fri Mar 11 14:48:09 2011 +0100 Merge branch 'fix/misc' into topic/misc commit ca0a6a6473f69f1773c97755840587262d841883 Author: Steve Sakoman Date: Sat Mar 5 10:12:26 2011 -0600 omap: overo: Add regulator for ads7846 The ads7846 driver now requires a regulator. This patch adds the necessary regulator to the overo board file. Without it, the following error occurs (and the touchscreen will not function): ads7846 spi1.0: unable to get regulator: -19 Signed-off-by: Steve Sakoman Acked-by: Tony Lindgren Signed-off-by: Tomi Valkeinen commit ea75159ee6f00bd809f57a58e5505dc362382cc8 Author: Taneja, Archit Date: Tue Mar 8 05:50:35 2011 -0600 OMAP4: DSS2: Clock source changes for OMAP4 On OMAP3, the pixel clock for the LCD manager was derived through DISPC_FCLK as: Lcd Pixel clock = DISPC_FCLK / lcd / pcd Where lcd and pcd are divisors in the DISPC_DIVISOR register. On OMAP4, the pixel clocks for LCD1 and LCD2 managers are derived from 2 new clocks named LCD1_CLK and LCD2_CLK. The pixel clocks are calculated as: Lcd_o Pixel clock = LCDo_CLK / lcdo /pcdo, o = 1, 2 Where lcdo and pcdo registers are divisors in DISPC_DIVISORo registers. LCD1_CLK and LCD2_CLK can have DSS_FCLK, and the M4 divider clocks of DSI1 PLL and DSI2 PLL as clock sources respectively. Introduce functions to select and get the clock source for these new clocks. Modify DISPC functions get the correct lck and pck rates based on the clock source of these clocks. Since OMAP2/3 don't have these clocks, force OMAP2/3 to always have the LCD_CLK source as DSS_CLK_SRC_FCK by introducing a dss feature. Introduce clock source names for OMAP4 and some register field changes in DSS_CTRL on OMAP4. Currently, LCD2_CLK can only have DSS_FCLK as its clock source as DSI2 PLL functionality hasn't been introduced yet. BUG for now if DSI2 PLL is selected as clock. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 66534e8e936a0b926863df90054dc59826d70528 Author: Taneja, Archit Date: Tue Mar 8 05:50:34 2011 -0600 OMAP2PLUS: DSS2: Cleanup clock source related code Clean up some of the DSS functions which select/get clock sources, use switch to select the clock source members since more clock sources will be introduced later on. Remove the use of macro CONFIG_OMAP2_DSS_DSI in dispc_fclk_rate, use a dummy inline for function for dsi_get_pll_hsdiv_dispc_rate() instead for code clarity. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 7b12d7b66bac4ff51aeea0029734b7a921cbe817 Author: Steve Sakoman Date: Sat Mar 5 07:58:39 2011 -0600 OMAP: DSS2: Add DSS2 support for Overo This patch adds DSS2 support for DVI, S-video, the 480x272 Samsung LTE430WQ-F0C panel, and the 320x240 LG.Philips LB035Q02 panel. Signed-off-by: Steve Sakoman Signed-off-by: Tomi Valkeinen commit 7654b4d3f4d2e2bc5b60990fc121891b95b33be5 Author: Steve Sakoman Date: Sat Mar 5 07:58:38 2011 -0600 OMAP: DSS2: Add support for LG Philips LB035Q02 panel This patch adds support for the Gumstix Palo35 expansion board which utilizes the 320 x 240 pixel LG.Philips LB035Q02 LCD Panel Signed-off-by: Steve Sakoman Signed-off-by: Tomi Valkeinen commit b9cb0984a6e6a09a4bcdc11ebc9f0eb71e5b6c85 Author: Tomi Valkeinen Date: Fri Mar 4 18:19:54 2011 +0200 OMAP: DSS2: fix omap_dispc_register_isr() fail path Fix handling of error in omap_dispc_register_isr() in case there are no free isr slots available. Reported-by: Ben Tucker Signed-off-by: Tomi Valkeinen commit 0cf35df353e8c36d4be0da2d7483896de599f397 Author: Murthy, Raghuveer Date: Thu Mar 3 09:28:00 2011 -0600 OMAP4: DSS2: Using dss_features to set independent core clock divider Using dss_features to select independent core clock divider and setting it. Added the register used, to DISPC context save and restore group ----------------------------------------------------------------------- In OMAP4, the minimum DISPC_CORE_CLK required can be expressed as: DISPC_CORE_CLK >= max(PCLK1*HSCALE1, PCLK2*HSCALE2, ...) Where PCLKi is the pixel clock generated by MANAGERi and HSCALEi is the maximum horizontal downscaling done through MANAGERi Based on the usecase, core clk can be increased or decreased at runtime to save power. Such mechanism are not yet implemented. Hence, we set the core clock divisor to 1, to support maximum range of resolutions ------------------------------------------------------------------------ Signed-off-by: Raghuveer Murthy Signed-off-by: Tomi Valkeinen commit ce7fa5eb1e815e79e4dd5db42d0d1f8c9d96925b Author: Murthy, Raghuveer Date: Thu Mar 3 09:27:59 2011 -0600 OMAP: DSS2: Renaming register macro DISPC_DIVISOR(ch) The OMAP4 DISPC_DIVISOR1 is backward compatible to OMAP3xxx DISPC_DIVISOR. However DISPC_DIVISOR is also provided in OMAP4, to control DISPC_CORE_CLK independent of Primary and Secondary display clocks. Renamed DISPC_DIVISOR(ch) to DISPC_DIVISORo(ch), to facilitate introduction of DISPC_DIVISOR register, which is specific for OMAP4. OMAP4 has 3 registers DISPC_DIVISOR, DISPC_DIVISOR1 and DISPC_DIVISOR2. Also updated, all the usages of DISPC_DIVISOR(ch) to DISPC_DIVISORo(ch). Use DISPC_DIVISORo(ch) when DISPC_DIVISOR1 or DISPC_DIVISOR2 has to be configured OMAP4 TRM uses DISPC_DIVISORo generically to refer to DISPC_DIVISOR1 and DISPC_DIVISOR2 Signed-off-by: Raghuveer Murthy Signed-off-by: Tomi Valkeinen commit 5c6366e14d9d4466ae34a1ccbc08dd8738909c1f Author: Murthy, Raghuveer Date: Thu Mar 3 09:27:58 2011 -0600 OMAP: DSS2: Adding dss_features for independent core clk divider In OMAP3xxx DISPC_DIVISOR register has a logical clock divisor (lcd_div) field. The lcd_div is common, for deciding the DISPC core functional clock frequency, and the final pixel clock frequency for LCD display. In OMAP4, there are 2 LCD channels, hence two divisor registers, DISPC_DIVISOR1 and DISPC_DIVISOR2. Also, there is a third register DISPC_DIVISOR. The DISPC_DIVISOR in OMAP4 is used to configure lcd_div exclusively for core functional clock configuration. For pixel clock configuration of primary and secondary LCDs, lcd_div of DISPC_DIVISOR1 and DISPC_DIVISOR2 are used respectively Signed-off-by: Archit Taneja Signed-off-by: Raghuveer Murthy Signed-off-by: Tomi Valkeinen commit 85604b0a247615157cedfec46b9cbfde2884f80f Author: Tomi Valkeinen Date: Thu Mar 3 13:16:23 2011 +0200 HACK: OMAP: DSS2: add delay after enabling clocks On omap4 the registers may not be accessible right after enabling the clocks. At some point this will be handled by pm_runtime, but, for the time begin, adding a small delay after clk_enable() should make things work. Signed-off-by: Tomi Valkeinen commit f2988ab9f4a2bf5e24f37d20eab1aad6862953d3 Author: Tomi Valkeinen Date: Wed Mar 2 10:06:48 2011 +0200 HACK: OMAP: DSS2: Fix OMAP2_DSS_USE_DSI_PLL When using OMAP2_DSS_USE_DSI_PLL, which selects DSI PLL as source clock for DISPC, the DSI needs the vdds_dsi regulator. Latest regulator changes broke this, causing the the code to not acquire the regulator when using OMAP2_DSS_USE_DSI_PLL. This patch acquires the vdds_dsi regulator in dsi_pll_init(), fixing the issue. This is is just a quick hack to get the OMAP2_DSS_USE_DSI_PLL option working. There shouldn't be any other downside in this solution than some extra lines of code. OMAP2_DSS_USE_DSI_PLL is itself a big hack, and should be removed, and the feature itself should be implemented in a more sane way. However, the solution is not trivial, and people are using DSI PLL to get more exact pixel clocks, so this hack is an acceptable temporary solution for the time being. Signed-off-by: Tomi Valkeinen commit bc6d4b1d3d9b7568fe88f5bb80d0266a7ef624cc Author: Archit Taneja Date: Tue Mar 1 13:59:46 2011 +0530 OMAP: DSS2: Use request / release calls in Taal for DSI Virtual Channels. Taal driver used to take a hard coded Macro for Virtual Channel and the VC_ID. The Taal panel driver now requests for a Virtual channel through the omap_dsi_request_vc() call in taal_probe(). The channel number returned by the request_vc() call is used for sending command and data to the Panel. The DSI driver automatically configures the Virtual Channel's source to either Video Port or L4 Slave port based on what the panel driver is using it for. The driver uses omap_dsi_release_vc() to free the VC specified by the panel. taal_remove() or when a request_vc() call fails. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 5ee3c1445dd89342ca8498c14afef82d0f76c794 Author: Archit Taneja Date: Wed Mar 2 12:35:53 2011 +0530 OMAP: DSS2: Functions to request/release DSI VCs Introduce functions which request and release VC's. This will be used in panel drivers in their probes. omap_dsi_request_vc() takes in the pointer to the omap_dss_device, the VC_ID parameter which goes into the header of the DSI packets, and returns a Virtual channel number (or virtual channel register set) which it can use. omap_dsi_set_vc_id() takes the omap_dss_device pointer, the Virtual Channel number and the VC_ID that needs to be set for the specifed Virtual Channel. omap_dsi_release_vc() takes the omap_dss_device pointer and the Virtual Channel number that needs to be made free. Initialisation of VC parameters is done in dsi_init(). Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 0a5835185420160f4fe8a6e1d1e42cd7efa07dc7 Author: Tomi Valkeinen Date: Wed Mar 2 12:48:35 2011 +0200 OMAP: DSS2: Remove unneeded cpu_is_xxx checks cpu_is_omapxxx() was used previously to select the supported interfaces. Now that the interfaces are platform devices, we no longer need to do the check when registering the driver. Thus we can just remove the checks. Signed-off-by: Tomi Valkeinen commit 587b5e8269fab583e4e9d2d6bbdc77b289ac78a7 Author: Tomi Valkeinen Date: Wed Mar 2 12:47:54 2011 +0200 OMAP: DSS2: Move DPI & SDI init into DSS plat driver DPI and SDI are different from the other interfaces as they are not hwmods and there is not platform driver for them. They could be said to be a part of DSS or DISPC modules, although it's not a clear definition. This patch moves DPI and SDI initialization into DSS platform driver, making the code more consistent: omap_dss_probe() only initializes platform drivers now. Signed-off-by: Tomi Valkeinen commit 277b2881c3c0d97e214487fbd677b0590fb4acf3 Author: Tomi Valkeinen Date: Wed Mar 2 12:32:48 2011 +0200 OMAP: DSS2: Remove pdev argument from dpi_init dpi_init() does not use the pdev argument for anything. Remove it. Signed-off-by: Tomi Valkeinen commit 42c9dee82129d965bc8ca02170150817317c0135 Author: Tomi Valkeinen Date: Wed Mar 2 12:29:27 2011 +0200 OMAP: DSS2: Remove FB_OMAP_BOOTLOADER_INIT support FB_OMAP_BOOTLOADER_INIT does not work, and it was only partially implemented for SDI. This patch removes support for FB_OMAP_BOOTLOADER_INIT to clean up the code and to remove any assumptions that FB_OMAP_BOOTLOADER_INIT would work. Proper implementation is much more complex, requiring early boot time register and clock handling to keep the DSS running. Signed-off-by: Tomi Valkeinen commit 1bb478350670fadf708d3cbd6137c32dfbe3fd5f Author: Archit Taneja Date: Thu Feb 24 14:17:30 2011 +0530 OMAP2PLUS: DSS2: DSI: Generalize DSI PLL Clock Naming DSI PLL output clock names have been made more generic. The clock name describes what the source of the clock and what clock is used for. Some of DSI PLL parameters like dividers and DSI PLL source have also been made more generic. dsi1_pll_fclk and dsi2_pll_fclk have been changed as dsi_pll_hsdiv_dispc_clk and dsi_pll_hsdiv_dsi_clk respectively. Also, the hsdividers are now named regm_dispc and regm_dsi instead of regm3 and regm4. Functions and macros named on the basis of these clock names have also been made generic. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 067a57e48e302863eb2d5ac0900ae9ae65dbc8c3 Author: Archit Taneja Date: Wed Mar 2 11:57:25 2011 +0530 OMAP2PLUS: DSS2: Use dss features to get clock source names of current OMAP Clock source names vary across OMAP2/3 and OMAP4, the clock source enum names have been made generic in the driver, but for purposes of debugging and dumping clock sources, it is better to preserve the actual TRM name of the clock. Introduce a dss feature function 'dss_feat_get_clk_source_name()' which returns a string with the TRM clock name for the current OMAP in use. The OMAP specific name is printed along the generic name within brackets. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 88134fa138b90518819b750891ffecc13f5f4886 Author: Archit Taneja Date: Thu Jan 6 10:44:10 2011 +0530 OMAP2PLUS: DSS2: Make members of dss_clk_source generic The enum members of 'dss_clk_source' have clock source names specific to OMAP2/3. Change the names to more generic terms such that they now describe where the clocks come from and what they are used for. Also, change the enum member names to have "DSS_CLK_SRC" instead of "DSS_SRC" for more clarity. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 819d807c59af10cce1dcbb13539c2fb100953fcd Author: Archit Taneja Date: Tue Mar 1 11:54:00 2011 +0530 OMAP2PLUS: DSS2: FEATURES: Function to Provide the max fck supported The maximum supported frequency for DSS has increased from 173 to 186 Mhz on OMAP4. Introduce a dss feature function to get the max_fck to replace DISPC_MAX_FCK macro. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 87a7484b6a9ceaa9e7a9a238154b02ed4495f26a Author: Archit Taneja Date: Wed Mar 2 11:19:50 2011 +0530 OMAP2PLUS: DSS2: FEATURES: DISPC overlay code cleanup Add dss_features and register fields to incorporate changes in DISPC pipelines between OMAP3 and OMAP4. Register fields added: FEAT_REG_HORIZONTALACCU, FEAT_REG_VERTICALACCU DSS Features added: FEAT_LINEBUFFERSPLIT, FEAT_ROWREPEATENABLE, FEAT_RESIZECONF _dispc_set_scaling() and _dispc_set_rotation_attrs() have been cleaned up. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 08a0a657949e723f0cbb6a33b1c706134d5a6d78 Author: Jarkko Nikula Date: Tue Mar 1 02:40:37 2011 -0600 omapfb: Fix linker error in drivers/video/omap/lcd_2430sdp.c There is a linker error from lcd_2430sdp.c if CONFIG_TWL4030_CORE is not set. This can be triggered on OMAP2 builds when OMAP3 or OMAP4 are not set. drivers/built-in.o: In function `sdp2430_panel_disable': drivers/video/omap/lcd_2430sdp.c:123: undefined reference to `twl_i2c_write_u8' drivers/video/omap/lcd_2430sdp.c:124: undefined reference to `twl_i2c_write_u8' drivers/built-in.o: In function `sdp2430_panel_enable': drivers/video/omap/lcd_2430sdp.c:110: undefined reference to `twl_i2c_write_u8' drivers/video/omap/lcd_2430sdp.c:112: undefined reference to `twl_i2c_write_u8' Fix this by selecting the TWL4030_CORE for MACH_OMAP_2430SDP when building with CONFIG_FB_OMAP as there is no own Kconfig entry for lcd_2430 and it is compiled always when both MACH_OMAP_2430SDP and FB_OMAP are set. Signed-off-by: Jarkko Nikula Signed-off-by: Tomi Valkeinen commit a1a0dccaea9e036200dc0b1070af1bfae06690fb Author: Semwal, Sumit Date: Tue Mar 1 02:42:14 2011 -0600 OMAP2PLUS:DSS2: Use opt_clock_available from pdata hwmod databases provide information about which optional clocks are available for a given platform. This is available via a function pointer opt_clock_enable in pdata. Use this information during get/enable/disable/put of clocks. Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit fd4b34f60736a20c5acd81cbb3083a0c60ae058e Author: Semwal, Sumit Date: Tue Mar 1 02:42:13 2011 -0600 OMAP2PLUS:DSS2: add opt_clock_available in pdata Provide a function in pdata to allow dss submodules to check if a given clock is available on a platform as an optional clock. Signed-off-by: Senthilvadivu Guruswamy (based on implementation from Senthil) Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit 4b6b7fa2d3677d1d86780c73fe2284147713e3b1 Author: Tomi Valkeinen Date: Wed Jun 2 15:09:37 2010 +0300 OMAP: DSS2: DSI: remove unused function dsi_reset_tx_fifo() was not used. Furthermore, OMAP errata states that TX FIFO flush is not functional, so the function wouldn't even have worked. Signed-off-by: Tomi Valkeinen commit 4a0ab8df3e35da4d12df0631b2daae683dafe46c Author: Tomi Valkeinen Date: Thu Oct 28 15:29:33 2010 +0300 OMAP: DSS2: Remove unused list There was an unused list defined in display.c. Remove it. Signed-off-by: Tomi Valkeinen commit 0897cc21036c4da0337d8ebcbe7d4b7bb81cf2ca Author: Janorkar, Mayuresh Date: Thu Feb 24 03:39:17 2011 -0600 OMAP: OMAPFB: Adding help for FB_OMAP_LCD_VGA option CONFIG_FB_OMAP_LCD_VGA option is present in drivers/video/omap There is no explaination about what this flag does. Lets add information about it. FB_OMAP_LCD_VGA flag sets resolution of display to VGA (640 X 480). The default resolution of 3430 LDP is 320 X 240. Signed-off-by: Mayuresh Janorkar Signed-off-by: Tomi Valkeinen commit 6ec549e50b192105ede7bb289a31da6f6e1a61e9 Author: Tomi Valkeinen Date: Thu Feb 24 14:18:50 2011 +0200 OMAP: DSS2: Check for SDI HW before accessing SDI registers Only OMAP 3430 hardware has SDI support. The availability of SDI HW can be found out by checking if the LCD channel supports SDI displays. This patch checks for SDI HW support before accessing SDI registers, which fixes a crash on OMAP4 when SDI SW support is compiled in. Signed-off-by: Tomi Valkeinen commit f8df01f1a47ea6e503f5ba8d782fc6fb53bb40e8 Author: Tomi Valkeinen Date: Thu Feb 24 14:21:25 2011 +0200 OMAP: DSS2: FEATURES: Remove DSI & SDI from OMAP2 OMAP2 doesn't support SDI or DSI. Remove them from omap2_dss_supported_displays. Signed-off-by: Tomi Valkeinen commit 4e777dd765b7c10eb66532330cf3fe6ae0b477b0 Author: Tomi Valkeinen Date: Thu Feb 24 14:20:31 2011 +0200 OMAP: DSS2: FEATURES: Remove SDI from 3630 displays OMAP 3630 does not support SDI. Split omap3_dss_supported_displays into 3430 and 3630 entries, and remove the SDI from 3630 entry. Signed-off-by: Tomi Valkeinen commit e528e3a8b4e005e6e2c9e50fdee1ab7e84cf1e27 Author: Tomi Valkeinen Date: Thu Feb 24 13:59:13 2011 +0200 OMAP: DSS2: Clean up a switch-case Support for the display interface was checked in a separate switch-case. There's no reason for that, and this patch handles the fail code path in the same switch-case where the display initialization is done. Signed-off-by: Tomi Valkeinen commit d0030452b5057570db47e953433f689e4a5475b5 Author: Samreen Date: Thu Feb 24 06:26:40 2011 +0000 OMAP2/3/4: DSS2: Enable Display SubSystem as modules Enabling all the display interface options to be built as module And enabling all the display panels to be built as modules. Signed-off-by: Samreen Acked-by: Tony Lindgren Signed-off-by: Tomi Valkeinen commit 830e6384e100dc758392c41f68c807c002945928 Author: Tomi Valkeinen Date: Wed Feb 23 16:34:17 2011 +0200 MAINTAINERS: Update OMAP DSS maintainer Signed-off-by: Tomi Valkeinen commit affe360d13e54b415cde2f11cee02369b4ed54bd Author: archit taneja Date: Wed Feb 23 08:41:03 2011 +0000 OMAP: DSS2: Have separate irq handlers for DISPC and DSI Currently, the core DSS platform device requests for an irq line for OMAP2 and OMAP3. Make DISPC and DSI platform devices request for a shared IRQ line. On OMAP3, the logical OR of DSI and DISPC interrupt lines goes to the MPU. There is a register DSS_IRQSTATUS which tells if the interrupt came from DISPC or DSI. On OMAP2, there is no DSI, only DISPC interrupts goto the MPU. There is no DSS_IRQSTATUS register. Hence, it makes more sense to have separate irq handlers corresponding to the DSS sub modules instead of having a common handler. Since on OMAP3 the logical OR of the lines goes to MPU, the irq line is shared among the IRQ handlers. The hwmod irq info has been removed for DSS to DISPC and DSI for OMAP2 and OMAP3 hwmod databases. The Probes of DISPC and DSI now request for irq handlers. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 371e2081447ce2bc6a25c20b513b9ba33cf5769e Author: Janorkar, Mayuresh Date: Tue Feb 22 07:35:13 2011 -0600 OMAPFB: Adding a check for timings in set_def_mode When omapfb.mode is passed through bootargs, when omapfb is setting mode, it would check if timings passed are fine for panel attached to it. It makes use of check_timing API provided by the panel. In current code if check_timing API is not available for attached panel, OMAPFB would return -EINVAL and BPP sent via bootargs will not have any effect. In case of panels like TAAL panel, omapfb or any other driver should not be allowed to change the timings. So bpps sent via bootargs will not have an effect. In such case we can check only the x_res and y_res with the panels resolution and if they match go ahead and set the bpps. The bpp value sent via bootarg would have an effect. Signed-off-by: Mayuresh Janorkar Signed-off-by: Tomi Valkeinen commit 09dc89cb3123d102e1615fab9e3d65a70402d061 Author: Tomi Valkeinen Date: Tue Feb 22 16:39:47 2011 +0200 OMAP: DSS2: Support for Samsung LTE430WQ-F0C Add support for Samsung LTE430WQ-F0C to panel-generic-dpi. Signed-off-by: Tomi Valkeinen commit 5f42f2ce63f5ecbd9bc744b9c25d9786e9a8e3b4 Author: Tomi Valkeinen Date: Tue Feb 22 15:53:46 2011 +0200 OMAP: DSS2: Delay regulator_get() calls DSS submodules DPI/SDI/DSI/VENC require a regulator to function. However, if the board doesn't use, say, SDI, the board shouldn't need to configure vdds_sdi regulator required by the SDI module. Currently the regulators are acquired when the DSS driver is loaded. This means that if the kernel is configured with SDI, vdds_sdi regulator is needed for all boards. This patch changes the DSS driver to acquire the regulators only when a display of particular type is initialized. For example, vdds_sdi is acquired when sdi_init_display() is called. Signed-off-by: Tomi Valkeinen commit ac425ed5fb0b6564d4eeee9fb13ef0c1f6da8e8f Author: Jani Nikula Date: Wed Feb 16 04:53:44 2011 -0600 OMAP: DSS2: Fix def_disp module param description MODULE_PARM_DESC() takes the name of the actual module parameter, not the name of the variable, as input. Fix the module parameter description for def_disp. Signed-off-by: Jani Nikula Signed-off-by: Tomi Valkeinen commit 545376e734a6b0a4c66efb7616724ae4dbb2e57a Author: Mayuresh Janorkar Date: Thu Jan 27 11:17:04 2011 +0000 OMAP4: DSS2: Add hwmod device names for OMAP4. Add hwmod device names for OMAP4; this enables device build for omap4 dss hwmod IPs. Signed-off-by: Sumit Semwal Signed-off-by: Mayuresh Janorkar Signed-off-by: Tomi Valkeinen commit 3f3aa06c46796cd2dc0f71d7d2f41bb75f7e97ff Author: Mayuresh Janorkar Date: Tue Feb 15 22:54:29 2011 -0600 OMAP2PLUS: DSS2: Add OMAP4 Kconfig support Enable DSS2 and OMAPFB for OMAP4 in Kconfig Signed-off-by: Mayuresh Janorkar Signed-off-by: Tomi Valkeinen commit f38190d61fe378d8eaf21b160c22e78b3b925747 Author: Sumit Semwal Date: Mon Jan 31 16:27:46 2011 +0000 OMAP4: DSS2: clocks: Add ick as dummy clock DSS code uses ick as one of the clocks in clk_get/clk_put. OMAP4 clock database doesn't have ick for DSS, so adding ick as dummy clock. This is needed for backward compatibility with OMAP2/3. Once pm_runtime* APIs get introduced in DSS, this will be revisited. Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit c7642f67e5bd71f91d165620f601f00c7c9802c9 Author: Archit Taneja Date: Mon Jan 31 16:27:45 2011 +0000 OMAP2PLUS: DSS2: Generalize external clock names in struct dss of dss.c The dss struct in dss.c has omap2/3 specific clock names. Making them generic, to increase readability and extendability. Signed-off-by: Sumit Semwal Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 6af9cd1431db952a7f9f8931497c9989a48b07df Author: Archit Taneja Date: Mon Jan 31 16:27:44 2011 +0000 OMAP2PLUS: DSS2: Generalize naming of PRCM related clock enums in DSS driver enum dss_clock structure is replaced with generic names that could be used across OMAP2420, 2430, 3xxx, 44xx platforms. Signed-off-by: Sumit Semwal Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 872462cdfc74e7b93c09870128d9bb436d4e9804 Author: Sumit Semwal Date: Mon Jan 31 16:27:43 2011 +0000 OMAP2PLUS: clocks: Align DSS clock names and roles Currently, clock database has tuples for DSS2. Because of this, the clock names are different across different OMAP platforms. This patch aligns the DSS2 clock names and roles across OMAP 2420, 2430, 3xxx, 44xx platforms in the clock databases, hwmod databases for opt-clocks, and DSS clock handling. This ensures that clk_get/put/enable/disable APIs in DSS can use uniform role names. Signed-off-by: Sumit Semwal Acked-by: Paul Walmsley Signed-off-by: Tomi Valkeinen commit ef631f82500390b3dfc20b16214e53c443d675a4 Author: Senthilvadivu Guruswamy Date: Tue Feb 15 23:14:00 2011 -0600 OMAP2,3: DSS2: Get DSS IRQ from platform device DSS IRQ number can be obtained from platform_get_irq(). This API in turn picks the right IRQ number belonging to HW IP from the hwmod database. So hardcoding of IRQ number could be removed. This IRQ is stored in dss_irq as part of dss structure, and freed it in dss_exit(). Reviewed-by: Paul Walmsley Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit ea9da36a304eed585fc5ef89c0f1c460eca61b48 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:22:04 2011 +0000 OMAP2,3: DSS2: Use platform device to get baseaddr DSS, DISPC, DSI, RFBI, VENC baseaddr can be obtained from platform_get_resource(). This API in turn picks the right silicon baseaddr from the hwmod database. So hardcoding of base addr could be removed. Reviewed-by: Paul Walmsley Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Sumit Semwal Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Tomi Valkeinen commit a06b62f8004bd95c132fa312e8593c9a10f466ec Author: Sumit Semwal Date: Mon Jan 24 06:22:03 2011 +0000 OMAP2,3: DSS2: replace printk with dev_dbg in init This patch replaces printk's in the init/probe functions to dev_dbg for boot time optimization. Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit c8aac01b7bd1109795586db11ea7f12ab1e2d163 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:22:02 2011 +0000 OMAP2, 3: DSS2: DSI: create platform_driver, move init, exit to driver Hwmod adaptation design requires each of the DSS HW IP to be a platform driver. So a platform_driver for DSI is created and init exit methods are moved from core.c to its driver probe,remove. pdev member has to be maintained by its own drivers. Also, vdds_dsi regulator handling is copied to dsi.c, since vdds_dsi regulator is needed by dpi_init() too. Board files are updated accordingly to add 2 instances of vdds_dsi regulator. DSI platform driver is registered from inside omap_dss_probe, in the order desired. Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit 30ea50c9f5166a375b4dc0109d18a5d21bab5711 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:22:01 2011 +0000 OMAP2, 3: DSS2: VENC: create platform_driver, move init, exit to driver Hwmod adaptation design requires each of the DSS HW IP to be a platform driver. So a platform_driver for VENC is created and init exit methods are moved from core.c to its driver probe,remove. pdev member has to be maintained by its own drivers. Also, venc_vdda_dac reading is moved to venc.c. VENC platform driver is registered from inside omap_dss_probe, in the order desired. Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit 060b6d9cbab03f1379dbe00393ab26d6eb371ce2 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:22:00 2011 +0000 OMAP2, 3: DSS2: DISPC: create platform_driver, move init, exit to driver Hwmod adaptation design requires each of the DSS HW IP to be a platform driver. So a platform_driver for DISPC is created and init exit methods are moved from core.c to its driver probe,remove. pdev member has to be maintained by its own drivers. DISPC platform driver is registered from inside omap_dss_probe, in the order desired. Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit 3448d500f7002a5ee374ec92d954b1667cbf72a4 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:21:59 2011 +0000 OMAP2, 3: DSS2: RFBI: create platform_driver, move init, exit to driver Hwmod adaptation design requires each of the DSS HW IP to be a platform driver. So a platform_driver for RFBI is created and init exit methods are moved from core.c to its driver probe,remove. pdev member has to be maintained by its own drivers. RFBI platform driver is registered from inside omap_dss_probe, in the order desired. Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit 8b9cb3a8f39d0864c925c5cd5c2c54cfd85ad551 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:21:58 2011 +0000 OMAP2, 3: DSS2: Move clocks from core driver to dss driver All clock management is moved to dss platform driver. clk_get/put APIs use dss device instead of core platform device. Hwmod adaptation design requires each of the DSS HW IP to be a platform driver. So the device name is changed from omapdss to omapdss_dss in 2420, 2430, 3xxx clock database files. Now the core driver "omapdss" only takes care of panel registration with the custom bus. core driver also uses the clk_enable() / clk_disable() APIs exposed by DSS for clock management. DSS driver would do clock management of clocks needed by DISPC, RFBI, DSI, VENC TODO: The clock content would be adapted to omap_hwmod in a seperate series. Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit 96c401bcb83a182a4f332f2f64ee6530ba35511a Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:21:57 2011 +0000 OMAP2, 3: DSS2: DSS: create platform_driver, move init, exit to driver Hwmod adaptation design requires each of the DSS HW IP to be a platform driver. So a platform_driver of DSS is created and init exit methods are moved from core.c to its driver probe,remove. pdev member has to be maintained by its own drivers. DSS platform driver is registered from inside omap_dss_probe, in the order desired. Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit cf07f5316215972e987c63b0a75a922c89813781 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:21:56 2011 +0000 OMAP2,3: DSS2: Build omap_device for each DSS HWIP Looks up the hwmod database for each of the given DSS HW IP and builds omap_device which inturn does the platform device register for each of DSS HW IP Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit 8ba775ca0d375ab42404ffd7a1a38326a7b21321 Author: Sumit Semwal Date: Mon Jan 24 06:21:48 2011 +0000 OMAP2, 3: DSS2: remove forced clk-disable from omap_dss_remove As part of omap hwmod changes, DSS will not be the only controller of its clocks. hwmod initialization also enables the interface clocks, and manages them. So, when DSS is built as a module, omap_dss_remove doesn't try to disable all clocks that have a higher usecount. Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit e7a12b6406a478b5c9085091b5015cb3e1683958 Author: Tomi Valkeinen Date: Thu Feb 24 09:02:28 2011 +0200 OMAP: 3430SDP: Remove unused vdda_dac supply Remove extra vdda_dac supply definition. It was a leftover from conflict resolution. Signed-off-by: Tomi Valkeinen commit d9936bb3952a08d701f7b03f8f62d158f94d8085 Author: Thomas Gleixner Date: Fri Mar 11 14:15:35 2011 +0100 genirq: Add desc->irq_data accessor We have accessors for all fields in irq_data based on irq_desc, but not for irq_data itself. Signed-off-by: Thomas Gleixner commit a110f4ef810ee29d810876df725f41d66629733e Author: Marek Belisko Date: Wed Mar 9 21:46:20 2011 +0100 ASoC: mini2440: Fix uda134x codec problem. ASoC audio for mini2440 platform in current kenrel doesn't work. First problem is samsung_asoc_dma device is missing in initialization. Next problem is with codec. Codec is initialized but never probed because no platform_device exist for codec driver. It leads to errors during codec binding to asoc dai. Next problem was platform data which was passed from board to asoc main driver but not passed to codec when called codec_soc_probe(). Following patch should fix issues. But not sure if in correct way. Please review. Signed-off-by: Marek Belisko Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit 27380fb83079bc7bd644e1115bb001dfdcec307f Author: Mark Brown Date: Fri Mar 11 12:07:31 2011 +0000 ASoC: Fix spacing in MAX8950 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 64c25a92e865f06ad8782fbdaa1e2a97d50acf73 Author: Vasily Khoruzhick Date: Fri Mar 11 11:05:38 2011 +0200 ASoC: PXA: Z2: Fix codec pin name MONO was renamed to MONO1. Signed-off-by: Vasily Khoruzhick Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit 5f3822c48a96e50ee4183b38e72581428eff8308 Author: Vasily Khoruzhick Date: Fri Mar 11 11:05:37 2011 +0200 ASoC: PXA: z2: Mute internal speaker when headphones are connected Signed-off-by: Vasily Khoruzhick Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0e45cab64449660fe83bb71208ab43b8d22a5648 Author: Christian Glindkamp Date: Wed Mar 9 11:20:04 2011 +0100 ASoC: Add MAX9850 codec driver This patch adds ASoC support for the MAX9850 codec with headphone amplifier. Supported features: - Playback - 16, 20 and 24 bit audio - 8k - 48k sample rates - DAPM Signed-off-by: Christian Glindkamp Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d6a079e82efd5fcbb1c7295f22e123c2cc748018 Author: Dave Chinner Date: Fri Mar 11 11:52:25 2011 +0000 GFS2: introduce AIL lock The log lock is currently used to protect the AIL lists and the movements of buffers into and out of them. The lists are self contained and no log specific items outside the lists are accessed when starting or emptying the AIL lists. Hence the operation of the AIL does not require the protection of the log lock so split them out into a new AIL specific lock to reduce the amount of traffic on the log lock. This will also reduce the amount of serialisation that occurs when the gfs2_logd pushes on the AIL to move it forward. This reduces the impact of log pushing on sequential write throughput. Signed-off-by: Dave Chinner Signed-off-by: Steven Whitehouse commit 8d7718aa082aaf30a0b4989e1f04858952f941bc Author: Michel Lespinasse Date: Thu Mar 10 18:50:58 2011 -0800 futex: Sanitize futex ops argument types Change futex_atomic_op_inuser and futex_atomic_cmpxchg_inatomic prototypes to use u32 types for the futex as this is the data type the futex core code uses all over the place. Signed-off-by: Michel Lespinasse Cc: Darren Hart Cc: Peter Zijlstra Cc: Matt Turner Cc: Russell King Cc: David Howells Cc: Tony Luck Cc: Michal Simek Cc: Ralf Baechle Cc: "James E.J. Bottomley" Cc: Benjamin Herrenschmidt Cc: Martin Schwidefsky Cc: Paul Mundt Cc: "David S. Miller" Cc: Chris Metcalf Cc: Linus Torvalds LKML-Reference: <20110311025058.GD26122@google.com> Signed-off-by: Thomas Gleixner commit 37a9d912b24f96a0591773e6e6c3642991ae5a70 Author: Michel Lespinasse Date: Thu Mar 10 18:48:51 2011 -0800 futex: Sanitize cmpxchg_futex_value_locked API The cmpxchg_futex_value_locked API was funny in that it returned either the original, user-exposed futex value OR an error code such as -EFAULT. This was confusing at best, and could be a source of livelocks in places that retry the cmpxchg_futex_value_locked after trying to fix the issue by running fault_in_user_writeable(). This change makes the cmpxchg_futex_value_locked API more similar to the get_futex_value_locked one, returning an error code and updating the original value through a reference argument. Signed-off-by: Michel Lespinasse Acked-by: Chris Metcalf [tile] Acked-by: Tony Luck [ia64] Acked-by: Thomas Gleixner Tested-by: Michal Simek [microblaze] Acked-by: David Howells [frv] Cc: Darren Hart Cc: Peter Zijlstra Cc: Matt Turner Cc: Russell King Cc: Ralf Baechle Cc: "James E.J. Bottomley" Cc: Benjamin Herrenschmidt Cc: Martin Schwidefsky Cc: Paul Mundt Cc: "David S. Miller" Cc: Linus Torvalds LKML-Reference: <20110311024851.GC26122@google.com> Signed-off-by: Thomas Gleixner commit 522d7decc0370070448a8c28982c8dfd8970489e Author: Michel Lespinasse Date: Thu Mar 10 18:47:31 2011 -0800 futex: Remove redundant pagefault_disable in futex_atomic_cmpxchg_inatomic() kernel/futex.c disables page faults before calling futex_atomic_cmpxchg_inatomic(), so there is no need to do it again within that function. Signed-off-by: Michel Lespinasse Cc: Darren Hart Cc: Peter Zijlstra Cc: Matt Turner Cc: Russell King Cc: David Howells Cc: Tony Luck Cc: Michal Simek Cc: Ralf Baechle Cc: "James E.J. Bottomley" Cc: Benjamin Herrenschmidt Cc: Martin Schwidefsky Cc: Paul Mundt Cc: "David S. Miller" Cc: Chris Metcalf Cc: Linus Torvalds LKML-Reference: <20110311024731.GB26122@google.com> Signed-off-by: Thomas Gleixner commit c0c9ed15042ceac7c485813012a0a97316101b57 Author: Thomas Gleixner Date: Fri Mar 11 11:51:22 2011 +0100 futex: Avoid redudant evaluation of task_pid_vnr() The result is not going to change under us, so no need to reevaluate this over and over. Seems to be a leftover from the mechanical mass conversion of task->pid to task_pid_vnr(tsk). Signed-off-by: Thomas Gleixner commit 3cbdd7533148f00444013700af89548b8cf32646 Author: Takashi Iwai Date: Fri Aug 29 16:09:01 2008 +0200 ALSA: Add snd_ctl_activate_id() Added a new API function snd_ctl_activate_id() for activate / inactivate the control element dynamically. Signed-off-by: Takashi Iwai Signed-off-by: Mark Brown commit 70d279a7e2a6e308530822ba2bf4134cc0f5c091 Author: Bruce Allan Date: Sat Feb 26 03:12:19 2011 +0000 e1000e: bump version number Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 4a29e15515ea56b8ec78ebb77529b1ad5c268bb9 Author: Bruce Allan Date: Fri Mar 4 09:07:01 2011 +0000 e1000e: do not suggest the driver supports Wake-on-ARP The driver doesn't support Wake-on-ARP, so don't advertise through ethtool that it does. Cleanup some coding style issues in the same functions. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 23e4f061306798dfb1941bd2f399949b705822c6 Author: Bruce Allan Date: Fri Feb 25 07:44:51 2011 +0000 e1000e: disable jumbo frames on 82579 when MACsec enabled in EEPROM If/when an OEM enables MACsec in the 82579 EEPROM, disable jumbo frames support in the driver due to an interoperability issue in hardware that prevents jumbo packets from being transmitted or received. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 6cc7aaed70c96c3933fbacbad582fc79b7d6e335 Author: Bruce Allan Date: Fri Feb 25 06:25:18 2011 +0000 e1000e: do not toggle LANPHYPC value bit when PHY reset is blocked When PHY reset is intentionally blocked on 82577/8/9, do not toggle the LANPHYPC value bit (essentially performing a hard power reset of the device) otherwise the PHY can be put into an unknown state. Cleanup whitespace in the same function. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 1effb45cca29e22e4b2209bb567770b7e20a3a2b Author: Bruce Allan Date: Fri Feb 25 06:58:03 2011 +0000 e1000e: extend EEE LPI timer to prevent dropped link The link can be unexpectedly dropped when the timer for entering EEE low- power-idle quiet state expires too soon. The timer needs to be extended from 196usec to 200usec after every LCD (PHY) reset to prevent this from happening. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher commit 5661aeb08edcef6799861f92817f593c1fd7b272 Author: Bruce Allan Date: Fri Feb 25 06:36:25 2011 +0000 e1000e: extend timeout for ethtool link test diagnostic With some PHYs supported by this driver, link establishment can take a little longer when connected to certain switches. Extend the timeout to reduce the number of false diagnostic failures, and cleanup a code style issue in the same function. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit d8d5f8aebb857f979fbe9099c9acc2ed486706be Author: Bruce Allan Date: Fri Feb 25 07:09:37 2011 +0000 e1000e: magic number cleanup - ETH_ALEN Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit ef5ab89cf7edc2e2cb996d62201a2b356d5e9286 Author: Bruce Allan Date: Thu Feb 10 08:17:21 2011 +0000 e1000e: use dev_kfree_skb_irq() instead of dev_kfree_skb() Based on a report and patch originally submitted by Prasanna Panchamukhi. Use dev_kfree_skb_irq() in e1000_clean_jumbo_rx_irq() since this latter function is called only in interrupt context. This avoids "Warning: kfree_skb on hard IRQ" messages. Cc: "Prasanna S. Panchamukhi" Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 23633b13ff7e1e1380bd2e11c49eb5ddbdf37ea9 Author: Lior Levy Date: Wed Mar 2 06:42:37 2011 +0000 ixgbevf: remove Tx hang detection Removed Tx hang detection mechanism from ixgbevf. This mechanism has no affect and can cause false alarm messages in some cases. Especially when VF Tx rate limit is turned on. The same mechanism was removed recently from igbvf. Signed-off-by: Lior Levy Signed-off-by: Jeff Kirsher commit e4a7b7b0c98efcdcc4c1f6eb10925dec1fbc4016 Author: Benjamin Marzinski Date: Fri Mar 11 00:49:09 2011 -0600 GFS2: fix block allocation check for fallocate GFS2 fallocate wasn't properly checking if a blocks were already allocated. In write_empty_blocks(), if a page didn't have buffer_heads attached, GFS2 was always treating it as if there were no blocks allocated for that page. GFS2 now calls gfs2_block_map() to check if the blocks are allocated before writing them out. Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit fa1bbdea300a15ec7c1186a5e53de33a5b1672f5 Author: Bob Peterson Date: Thu Mar 10 11:41:57 2011 -0500 GFS2: Optimize glock multiple-dequeue code This is a small patch that optimizes multiple glock dequeue operations. It changes the unlock order to be more efficient and makes it easier for lock debugging tools to unravel. It also eliminates the need for the temp variable x, although that would likely be optimized out. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit e9bce845c0cee1a492e5cee6a827ae71140fe8b3 Author: Yi Zou Date: Wed Mar 9 08:48:03 2011 +0000 net: add proper documentation for previously added net_device_ops for FCoE Add proper documentation for previously added net_device_ops ops for FCoE. Signed-off-by: Yi Zou Signed-off-by: Jeff Kirsher commit e2444d92083cc1ceb07487425897d6d51a13e9dd Author: Emil Tantilov Date: Thu Jan 27 09:14:18 2011 +0000 ixgb: convert to new VLAN model Based on a patch from Jesse Gross This switches the ixgb driver to use the new VLAN interfaces. In doing this, it completes the work begun in ae54496f9e8d40c89e5668205c181dccfa9ecda1 allowing the use of hardware VLAN insertion without having a VLAN group configured. CC: Jesse Gross Signed-off-by: Emil Tantilov Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit f91f9cd505f92e4227ffda7e5799a33d4f34bf36 Author: Oskar Schirmer Date: Thu Feb 17 16:43:02 2011 +0100 arm: tcc8k: Fix bus clock calculation There are two dividers used to derive bus clock from system clock: system clock is divided by SCKDIV+1, then by BCKDIV+1. SCKDIV divider has been ignored up to now, which is no problem as long as it is 0. Take SCKDIV into account for bus clock calculation. Signed-off-by: Oskar Schirmer Cc: bigeasy@linutronix.de Signed-off-by: Thomas Gleixner commit cfeeb2f99867c075f3a1a6ac59c0a42e1cd741b0 Author: Oskar Schirmer Date: Thu Feb 17 16:43:01 2011 +0100 arm: tcc8k: Fix indent, coding syle Remove double definition of ACLKUSBH, change parameter name in root_clk_disable, as there is no reason to have a different name than in root_clk_enable. No functional change. Signed-off-by: Oskar Schirmer Cc: bigeasy@linutronix.de Signed-off-by: Thomas Gleixner commit 25d7a6003b5c76b735fdfc3dc5030d9d9c93844e Author: Oskar Schirmer Date: Thu Feb 17 16:43:00 2011 +0100 arm: tcc8k: Avoid reading clock register twice There is no reason why in case of PLL2 the configuration register should be read twice, while for PLL0/1 using the value previously read is used. Do the same for PLL2. Signed-off-by: Oskar Schirmer Cc: bigeasy@linutronix.de Signed-off-by: Thomas Gleixner commit fe03a9f7bb89e920e60fd1bb074adab2eed2bf48 Author: Hans J. Koch Date: Thu Feb 17 16:42:59 2011 +0100 arm: tcc8k: Fix clock rate calculation The calculation of the best divider value for a requested clock rate always returned a value that was slightly too large. It was also not protected against possible divisions by zero. Request for very low, but non zero rates would cause the ACLK divisor field to overflow. Catch this situation by using the maximum value. The internal function aclk_set_rate() calculates the correct divider value, but doesn't write it back to the register. Add the write back. Signed-off-by: Hans J. Koch Signed-off-by: Oskar Schirmer Cc: bigeasy@linutronix.de Signed-off-by: Thomas Gleixner commit 85922e54a3a14a6aee6c0b1fc67d81ef0c60fc9c Author: Oskar Schirmer Date: Thu Feb 17 16:42:58 2011 +0100 arm: tcc8k: Choose PLL settings conforming to board layout The evaluation board is driven with 1.2V core voltage, so system clock must not exceed 192 MHz, bus clock must not exceed 110 MHz. Choose appropriate values and set DTCMWAIT accordingly. Adapt UART setting to avoid console log interruption and wait for the specified locking time of 300us to pass. Signed-off-by: Oskar Schirmer Cc: bigeasy@linutronix.de Signed-off-by: Thomas Gleixner commit 30d913556b25db11f2537f4412487c6e81dc0374 Author: Oskar Schirmer Date: Thu Feb 17 16:42:51 2011 +0100 arm: tcc8k: Add missing include If NAND is enabled we better have the include around. Signed-off-by: Oskar Schirmer Signed-off-by: Thomas Gleixner commit 2bcf002159c2aedd5c0ab5a21c3ea73fec87ff8d Author: Artem Bityutskiy Date: Thu Mar 10 16:26:32 2011 +0200 UBIFS: do not check data crc by default Change the default UBIFS behavior WRT data CRC checking. Currently, UBIFS checks data CRC when reading, which slows it down quite a bit, and this is the default option. However, it looks like in average user does not need this feature and would prefer faster read speed over extra reliability. And this seems to be de-facto standard that file-systems do not check data CRC every time they read from the media. Thus, make UBIFS default behavior so that it does not check data CRC. This corresponds to the no_chk_data_crc mount option. Those users who need extra protection can always enable it using the chk_data_crc option. Please, read more information about this feature here: http://www.linux-mtd.infradead.org/doc/ubifs.html#L_checksumming Signed-off-by: Artem Bityutskiy commit cce3f612fedcbeee61977497b99bbf68a4082b6b Author: Artem Bityutskiy Date: Wed Mar 9 13:36:23 2011 +0200 UBIFS: simplify UBIFS Kconfig menu Remove debug message level and debug checks Kconfig options as they proved to be useless anyway. We have sysfs interface which we can use for fine-grained debugging messages and checks selection, see Documentation/filesystems/ubifs.txt for mode details. Signed-off-by: Artem Bityutskiy commit 6342aaebda9b94e3cd101ba13eee690ac6577124 Author: Artem Bityutskiy Date: Tue Mar 8 14:26:47 2011 +0200 UBIFS: print max. index node size Improve debugging messages by printing the maximum index node size on mount. Signed-off-by: Artem Bityutskiy commit d882962f6af2b484b62a7fb05ef959e1bf355fc4 Author: Matthew L. Creech Date: Fri Mar 4 17:55:02 2011 -0500 UBIFS: handle allocation failures in UBIFS write path Running kernel 2.6.37, my PPC-based device occasionally gets an order-2 allocation failure in UBIFS, which causes the root FS to become unwritable: kswapd0: page allocation failure. order:2, mode:0x4050 Call Trace: [c787dc30] [c00085b8] show_stack+0x7c/0x194 (unreliable) [c787dc70] [c0061aec] __alloc_pages_nodemask+0x4f0/0x57c [c787dd00] [c0061b98] __get_free_pages+0x20/0x50 [c787dd10] [c00e4f88] ubifs_jnl_write_data+0x54/0x200 [c787dd50] [c00e82d4] do_writepage+0x94/0x198 [c787dd90] [c00675e4] shrink_page_list+0x40c/0x77c [c787de40] [c0067de0] shrink_inactive_list+0x1e0/0x370 [c787de90] [c0068224] shrink_zone+0x2b4/0x2b8 [c787df00] [c0068854] kswapd+0x408/0x5d4 [c787dfb0] [c0037bcc] kthread+0x80/0x84 [c787dff0] [c000ef44] kernel_thread+0x4c/0x68 Similar problems were encountered last April by Tomasz Stanislawski: http://patchwork.ozlabs.org/patch/50965/ This patch implements Artem's suggested fix: fall back to a mutex-protected static buffer, allocated at mount time. I tested it by forcing execution down the failure path, and didn't see any ill effects. Artem: massaged the patch a little, improved it so that we'd not allocate the write reserve buffer when we are in R/O mode. Signed-off-by: Matthew L. Creech Signed-off-by: Artem Bityutskiy commit 137ee20ddd10fdc20600c389fe63edab0c39cb1a Merge: 4a0b166 1c0b04d Author: Ingo Molnar Date: Fri Mar 11 09:28:31 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 25874a299ef8037df03ce4ada570bc4e42f9748f Author: Henrik Kretzschmar Date: Fri Mar 11 08:02:36 2011 +0100 x86: Clean up apic.c and apic.h This patch moves some functions and variables into init sections, makes a function static and removes some lines of cruft. Signed-off-by: Henrik Kretzschmar Acked-by: Cyrill Gorcunov LKML-Reference: <1299826956-8607-2-git-send-email-henne@nachtwindheim.de> Signed-off-by: Ingo Molnar commit ec8df88f6bd808db47ac7a06c96dcc90d7ed6ecc Author: Henrik Kretzschmar Date: Fri Mar 11 08:02:35 2011 +0100 x86: Remove superflous goal definition of tsc_sync The extra tsc_sync.o goal definition is superflous. CONFIG_X86_64_SMP depends on CONFIG_SMP and tsc_sync.o is already in the definition of CONFIG_SMP. Signed-off-by: Henrik Kretzschmar Acked-by: Cyrill Gorcunov LKML-Reference: <1299826956-8607-1-git-send-email-henne@nachtwindheim.de> Signed-off-by: Ingo Molnar commit 1d45ac49daa15fd0a64c58744ac9ea6451e607e6 Author: Sylwester Nawrocki Date: Thu Mar 10 21:53:40 2011 +0900 ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control Add common code for MIPI-CSIS and MIPI-DSIM drivers to support their corresponding D-PHY's enable and reset control. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit e24d208de6bc779c6bd97523cde2665a33f2be4d Author: Sylwester Nawrocki Date: Thu Mar 10 21:53:36 2011 +0900 ARM: S5P: Extend MIPI-CSIS platform_data with the PHY control callback Extend MIPI-CSIS driver's platform data structure with a callback for D-PHY enable and reset control. Also add a flag indicating whether the external MIPI-CSI (VDD18_MIPI) power supply should be managed in the driver through the "vdd" power supply. On some boards this regulator may be a fixed voltage regulator without an inhibit function. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 03c4cd397cba38fc621a33c84d9698d39b286036 Author: Sylwester Nawrocki Date: Thu Mar 10 21:52:27 2011 +0900 ARM: S5P: Rename MIPI-CSIS driver header and update Copyright Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 0048a17348645f18cf209483e1f8e46a6dbec971 Author: Sylwester Nawrocki Date: Thu Mar 10 21:49:31 2011 +0900 ARM: S5P: Add platform helpers for camera GPIO configuration Add functions for configuration of the parallel camera bus pins on S5PV210 and Exynos4 SoC. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 6d2f42cc275ba72a47ce6933b18480163ecf2740 Merge: a9518cd 5cd435b Author: Kukjin Kim Date: Fri Mar 11 15:48:52 2011 +0900 Merge branch 'dev/pwm-backlight' into for-next Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c commit a9518cde232960875a1f03ba00c112f56872cf60 Merge: 4dbe846 d73af18 Author: Kukjin Kim Date: Fri Mar 11 15:48:28 2011 +0900 Merge branch 'next-s3c2440-gta02' into for-next commit a08572ae529b1e8de12393eeced661feae8fd44c Merge: 2d403fe c0718df Author: Paul Walmsley Date: Thu Mar 10 22:43:32 2011 -0700 Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-024 Conflicts: arch/arm/mach-omap2/omap_hwmod_3xxx_data.c commit 2d403fe03070b541cc93cfa915f6e6c592cf231c Merge: 21ace54 cc1226e Author: Paul Walmsley Date: Thu Mar 10 22:43:05 2011 -0700 Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110310-024 Conflicts: arch/arm/mach-omap2/omap_hwmod_2430_data.c arch/arm/mach-omap2/omap_hwmod_3xxx_data.c arch/arm/plat-omap/include/plat/omap_hwmod.h commit 21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2 Merge: 694606c da0653f a05dcdb 570b54c 4ce1e5e 5f8662b 8c810e7 692ab1f 478f478 2f4dd59 Author: Paul Walmsley Date: Thu Mar 10 22:41:28 2011 -0700 Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024 commit 2f4dd595f6d60ec3ccbb68def73df457970cf671 Author: Paul Walmsley Date: Thu Mar 10 22:40:06 2011 -0700 OMAP3: wdtimer: Fix CORE idle transition The HW superwised smart idle for wdtimer in OMAP3 prevents CORE power domain idle transitions. Disable it by swithing to SW supervised transitions. This could be a hardware bug in the OMAP3 wdtimer2 block. Signed-off-by: Kalle Jokiniemi Signed-off-by: Paul Walmsley Cc: Benoit Cousson Acked-by: Kevin Hilman commit 0503add9d251db22ba2f610fb8d9b7743a9786da Author: Paul Walmsley Date: Thu Mar 10 22:40:05 2011 -0700 Watchdog: omap_wdt: add fine grain runtime-pm The omap_wdt should only be in full active state when the registers are being accessed. Otherwise the device can be on lower power mode. This patch is based on a patch created by Kalle Jokiniemi: https://patchwork.kernel.org/patch/618231/ which is itself based on a patch created by Atal Shargorodsky: http://lkml.org/lkml/2009/3/10/266. Signed-off-by: Paul Walmsley Signed-off-by: Kalle Jokiniemi Tested-by: Kalle Jokiniemi Cc: Wim Van Sebroeck Acked-by: Wim Van Sebroeck Acked-by: Kevin Hilman commit c0718df4d666cc5fd8837ac93c82995a17bfdbf5 Author: Paul Walmsley Date: Thu Mar 10 22:17:45 2011 -0700 OMAP2+: voltage: reorganize, split code from data This is a first pass at reorganizing mach-omap2/voltage.c: - Separate almost all of the data from the code of mach-omap2/voltage.c. The code remains in mach-omap2/voltage.c. The data goes into one of several places, depending on what type of data it is: - Silicon process/validation data: mach-omap2/opp*_data.c - VC (Voltage Controller) data: mach-omap2/vc*_data.c - VP (Voltage Processor) data: mach-omap2/vp*_data.c - Voltage domain data: mach-omap2/voltagedomains*_data.c The ultimate goal is for all this data to be autogenerated, the same way we autogenerate the rest of our data. - Separate VC and VP common data from VDD-specific VC and VP data. - Separate common voltage.c code from SoC-specific code; reuse common code. - Reorganize structures to avoid unnecessary memory loss due to unpacked fields. There is much left to be done. VC code and VP code should be separated out into vc*.c and vp*.c files. Many fields in the existing structures are superfluous, and should be removed. Some code in voltage.c seems to be duplicated; that code should be moved into functions of its own. Proper voltage domain code should be created, as was done with the powerdomain and clockdomains, and powerdomains should reference voltagedomains. Thanks to Shweta Gulati for comments. Thanks to Rajendra Nayak for finding and fixing some bugs that prevented OMAP4 from booting: https://patchwork.kernel.org/patch/587311/ His patch has been folded into this one to avoid breaking OMAP4 between patches. Thanks also to Kevin Hilman for finding and fixing a compile problem when !CONFIG_PM: http://www.spinics.net/lists/arm-kernel/msg118067.html His patch has also been folded into this one to avoid breaking !CONFIG_PM builds. Signed-off-by: Paul Walmsley Cc: Shweta Gulati Cc: Rajendra Nayak Cc: Kevin Hilman commit 5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf Author: Yoshihiro Shimoda Date: Fri Feb 25 07:40:34 2011 +0000 sh: update sh7757lcr_defconfig - enable SPI bus, MTD, MMCIF, SD, USB host, and USB storage. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 65f63eab38626a79f8a54d13686680a1ea898f72 Author: Yoshihiro Shimoda Date: Fri Feb 25 07:40:27 2011 +0000 sh: add platform_device of tmio_mmc and sh_mmcif to sh7757lcr Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 8ac53ed537a4a32d81279d37476bfaeb2aff15ab Author: Yoshihiro Shimoda Date: Fri Feb 25 07:40:16 2011 +0000 sh: dmaengine support for SH7757 Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 53bc18ef4d8cb287c0667389fa05721aedf54e15 Author: Yoshihiro Shimoda Date: Fri Feb 25 07:39:49 2011 +0000 sh: add mmc clock in clock-sh7757 Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit ceb7afe270c9a41130ffd3560e284f1ba0b2abe0 Author: Yoshihiro Shimoda Date: Fri Feb 25 07:39:32 2011 +0000 sh: add spi_board_info in sh7757lcr Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit d0371667d1393ec6655fa3bdd6e6008cfdea528c Author: Yoshihiro Shimoda Date: Fri Feb 25 07:39:10 2011 +0000 sh: add platform_device for SPI Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 0fe48601d819c838c04121bc8d6fffa3a7aaf8e3 Author: Yoshihiro Shimoda Date: Fri Feb 25 07:38:47 2011 +0000 sh: add USB_ARCH_HAS_EHCI and OHCI for SH7757 Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit c1d0df341fad34f9a763dd1382d256da352d67eb Author: Thomas Renninger Date: Sun Feb 27 21:36:42 2011 +0000 sh: Rename cpuidle states to fit general conventions C0 is known as "busy", "not idle" state. X86 "busy polling" state also got renamed from C0 to "POLL" recently. Let's stay consistent with naming to avoid confusions. Signed-off-by: Thomas Renninger Acked-by: Magnus Damm Signed-off-by: Paul Mundt commit 964a29962c278ddff8a199f23d7c9ef35152a0fe Author: Nishanth Aravamudan Date: Thu Mar 3 15:41:02 2011 +0000 powerpc/pseries: Disable MSI using new interface if possible On upcoming hardware, we have a PCI adapter with two functions, one of which uses MSI and the other uses MSI-X. This adapter, when MSI is disabled using the "old" firmware interface (RTAS_CHANGE_FN), still signals an MSI-X interrupt and triggers an EEH. We are working with the vendor to ensure that the hardware is not at fault, but if we use the "new" interface (RTAS_CHANGE_MSI_FN) to disable MSI, we also automatically disable MSI-X and the adapter does not appear to signal any stray MSI-X interrupt. Signed-off-by: Nishanth Aravamudan Acked-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 94a06b74e724caabcf0464c81527cfbcae0c8aff Merge: 0dde52a 9062511 Author: Tony Lindgren Date: Thu Mar 10 18:54:14 2011 -0800 Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit 4dbe8460e4c0ec7a242b6ac657be271ed86972c6 Merge: f461279 1d017fe Author: Kukjin Kim Date: Fri Mar 11 11:05:49 2011 +0900 Merge branch 'next-s5p' into for-next commit f4612798a1ca33e4c9b5b9152f4b9b3b23a2da58 Merge: a5abba9 30d8bea Author: Kukjin Kim Date: Fri Mar 11 11:05:46 2011 +0900 Merge branch 'next-exynos4' into for-next commit 30d8bead5a309492d1dae2f6511a0465fe6ad05e Author: Changhwan Youn Date: Fri Mar 11 10:39:57 2011 +0900 ARM: EXYNOS4: Implement kernel timers using MCT The Multi-Core Timer(MCT) of EXYNOS4 is designed for implementing clock source timer and clock event timers. This patch implements 1 clock source timer with 64 bit free running counter of MCT and 2 clock event timers with two of 31-bit tick counters. Signed-off-by: Changhwan Youn Cc: Ben Dooks Cc: Russell King Signed-off-by: Kukjin Kim commit 614a392e1cce882745cdf130fe37fdf86bbd9b9a Author: Changhwan Youn Date: Fri Mar 11 10:39:53 2011 +0900 ARM: EXYNOS4: Add irq definition for kernel global timer This patch adds IRQ_MCT_G0 to irq map. IRQ_MCT_G0 is an interrupt of MCT comparator and used for kernel global timer. Signed-off-by: Changhwan Youn Signed-off-by: Kukjin Kim commit 2b7401590d97951d7b3df67ba7dc4fc2930928f0 Author: Changhwan Youn Date: Fri Mar 11 10:39:35 2011 +0900 ARM: EXYNOS4: Add SYSTIMER IO Address mapping for MCT The MCT(Multi-Core Timer) is used for implementing kernel timers for EXYNOS4210. Signed-off-by: Changhwan Youn Signed-off-by: Kukjin Kim commit 1b7fe59322bef9e7a2c05b64a07a66b875299736 Author: David S. Miller Date: Thu Mar 10 17:01:16 2011 -0800 ipv4: Kill flowi arg to fib_select_multipath() Completely unused. Signed-off-by: David S. Miller commit ff3fccb3d05756ec9fb44350b059d31a5e8e0fdc Author: David S. Miller Date: Thu Mar 10 16:23:24 2011 -0800 ipv4: Remove unnecessary test from ip_mkroute_input() fl->oif will always be zero on the input path, so there is no reason to test for that. Signed-off-by: David S. Miller commit dbdd9a52e38a4a93adfa4d0278801cce4fad98eb Author: David S. Miller Date: Thu Mar 10 16:34:38 2011 -0800 ipv4: Remove redundant RCU locking in ip_check_mc(). All callers are under rcu_read_lock() protection already. Rename to ip_check_mc_rcu() to make it even more clear. Signed-off-by: David S. Miller commit 33175d84ee3fa29991adb80513683e010769e807 Merge: c590893 6dfbd87 Author: David S. Miller Date: Thu Mar 10 14:26:00 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bnx2x/bnx2x_cmn.c commit 3c5ead52ed68406c0ee789024c4ae581be8bcee4 Author: Chris Metcalf Date: Tue Mar 1 13:30:15 2011 -0500 arch/tile: fix deadlock bugs in rwlock implementation The first issue fixed in this patch is that pending rwlock write locks could lock out new readers; this could cause a deadlock if a read lock was held on cpu 1, a write lock was then attempted on cpu 2 and was pending, and cpu 1 was interrupted and attempted to re-acquire a read lock. The write lock code was modified to not lock out new readers. The second issue fixed is that there was a narrow race window where a tns instruction had been issued (setting the lock value to "1") and the store instruction to reset the lock value correctly had not yet been issued. In this case, if an interrupt occurred and the same cpu then tried to manipulate the lock, it would find the lock value set to "1" and spin forever, assuming some other cpu was partway through updating it. The fix is to enforce an interrupt critical section around the tns/store pair. In addition, this change now arranges to always validate that after a readlock we have not wrapped around the count of readers, which is only eight bits. Since these changes make the rwlock "fast path" code heavier weight, I decided to move all the rwlock code all out of line, leaving only the conventional spinlock code with fastpath inlines. Since the read_lock and read_trylock implementations ended up very similar, I just expressed read_lock in terms of read_trylock. As part of this change I also eliminate support for the now-obsolete tns_atomic mode. Signed-off-by: Chris Metcalf commit 9062511097683b4422f023d181b4a8b2db1a7a72 Author: Santosh Shilimkar Date: Sun Jan 23 22:51:09 2011 +0530 OMAP3: PM: Clear the SCTLR C bit in asm code to prevent data cache allocation On the newer ARM processors like CortexA8, CortexA9, the caches can be speculatively loaded while they are getting flushed. Clear the SCTLR C bit to prevent further data cache allocation as part of cache clean routine Signed-off-by: Santosh Shilimkar Signed-off-by: Kevin Hilman commit 46f557cb453b9f3b6dc36b8179c2c36932a2ea64 Author: Santosh Shilimkar Date: Sun Jan 23 21:37:03 2011 +0530 OMAP3: PM: Remove un-necessary cp15 registers form low power cpu context The current code saves few un-necessary registers which are read-only or write-only, unused CP15 registers. Remove them and keep only necessary CP15 registers part of low power context save/restore. Signed-off-by: Santosh Shilimkar Signed-off-by: Kevin Hilman commit c9749a352383d4d2d25eb28062afd1a7eee115b7 Author: Santosh Shilimkar Date: Sun Jan 23 19:33:53 2011 +0530 OMAP3: PM: Allow the cache clean when L1 is lost. When L1 cache is suppose to be lost, it needs to be cleaned before entrering to the low power mode. While at this, also fix few comments and remove un-necessary clean_l2 lable. Signed-off-by: Santosh Shilimkar Signed-off-by: Kevin Hilman commit 8409d57bc342536ffe96acc7cd6c7575d98d3edb Author: Santosh Shilimkar Date: Sun Jan 23 16:04:39 2011 +0530 OMAP3: PM: Fix the MMU on sequence in the asm code Add necessary barriers after enabling MMU. Also use the sane way to load pc and jump to it instead of executing ldma first up. Signed-off-by: Santosh Shilimkar Signed-off-by: Kevin Hilman commit 4444d712fd5b31f2348b57eaa2bbdc5e68c4e1b6 Author: Santosh Shilimkar Date: Sun Jan 23 19:00:34 2011 +0530 OMAP3: PM: Use ARMv7 supported instructions instead of legacy CP15 ones On ARMv7 dsb, dmb instructions are supported and can be used directly instead of their cp15 equivalnet. Also remove the opcodes for smc and use the available instruction directly in OMAP3 low power asm code Signed-off-by: Santosh Shilimkar Signed-off-by: Kevin Hilman commit 8e76a80960bf06c245160a484d5a363ca6b520bb Author: Stephen Boyd Date: Thu Feb 24 10:44:44 2011 -0800 msm: scm: Check for interruption immediately When we're interrupted on the secure side, we should just issue another smc instruction again instead of replaying the arguments to smc. Fix it. Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit 98d4ded60bda17a9ffecd902b03deac52922b788 Author: Stephen Boyd Date: Thu Feb 24 10:44:43 2011 -0800 msm: scm: Fix improper register assignment Assign the registers used in the inline assembly immediately before the inline assembly block. This ensures the compiler doesn't optimize away dead register assignments when it shouldn't. Signed-off-by: Stephen Boyd Acked-by: Nicolas Pitre Signed-off-by: David Brown commit 7e1a68abaef094d5927ffe76bce21d6d8aa87bcb Author: Stephen Boyd Date: Thu Feb 24 10:44:42 2011 -0800 msm: scm: Mark inline asm as volatile We don't want the compiler to remove these asm statements or reorder them in any way. Mark them as volatile to be sure. Signed-off-by: Stephen Boyd Acked-by: Will Deacon Signed-off-by: David Brown commit 7bee976822a78bbb278790c2cd64293568592cdb Author: Ian Campbell Date: Thu Mar 10 16:08:15 2011 +0000 xen: events: propagate irq allocation failure instead of panicking Running out of IRQs need not be fatal to the machine as a whole. Signed-off-by: Ian Campbell Cc: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit 6cb9bf3aaffcdd175574a9d66af4ad69156d0070 Author: Ian Campbell Date: Thu Mar 10 16:08:14 2011 +0000 xen: events: do not workaround too-small nr_irqs With the introduction of e7bcecb7b1d2 "genirq: Make nr_irqs runtime expandable" nr_irqs can grow as necessary to accommodate our allocation requests. Signed-off-by: Ian Campbell Cc: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit 69c358ce377e998e3ababb494c2f8769dfb1715d Author: Ian Campbell Date: Thu Mar 10 16:08:13 2011 +0000 xen: events: remove use of nr_irqs as upper bound on number of pirqs There isn't really much relationship between the two, other than nr_irqs often being the larger of the two. Allows us to remove a nr_irqs sized array, the only users of this array are MSI setup and restore, neither of which are particularly performance critical. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit ca62ce8cde36cde5a31af8f9bb23e6430700e437 Author: Ian Campbell Date: Thu Mar 10 16:08:12 2011 +0000 xen: events: dynamically allocate irq info structures Removes nr_irq sized array allocation at start of day. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 6cb6537d34a146c8f3e232da9ffd79ae1265fed3 Author: Ian Campbell Date: Thu Mar 10 16:08:11 2011 +0000 xen: events: maintain a list of Xen interrupts In a PVHVM kernel not all interrupts are Xen interrupts (APIC interrupts can also be present). Currently we get away with walking over all interrupts because the lookup in the irq_info array simply returns IRQT_UNBOUND and we ignore it. However this array will be going away in a future patch so we need to manually track which interrupts have been allocated by the Xen events infrastructure. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 3d4cfa3736f2f080d3bde4f4329b7b6a7544e093 Author: Ian Campbell Date: Thu Mar 10 16:08:10 2011 +0000 xen: events: push setup of irq<->{evtchn,ipi,virq,pirq} maps into irq_info init functions Encapsulate setup of XXX_to_irq array in the relevant xen_irq_info_*_init function. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 9158c3588a0693ef11208f5961f0d6b0241694d8 Author: Ian Campbell Date: Thu Mar 10 16:08:09 2011 +0000 xen: events: turn irq_info constructors into initialiser functions Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit cb60d11427bbdd42c27edfa2ef1fa6344f455e1d Author: Ian Campbell Date: Thu Mar 10 16:08:08 2011 +0000 xen: events: use per-cpu variable for cpu_evtchn_mask I can't see any reason why it isn't already. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit f4d0635bf8894b7ba43d7a54733f3e26fe6ced2e Author: Ian Campbell Date: Thu Mar 10 16:08:07 2011 +0000 xen: events: refactor GSI pirq bindings functions Following the example set by xen_allocate_pirq_msi and xen_bind_pirq_msi_to_irq: xen_allocate_pirq becomes xen_allocate_pirq_gsi and now only allocates a pirq number and does not bind it. xen_map_pirq_gsi becomes xen_bind_pirq_gsi_to_irq and binds an existing pirq. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 0a85226ff291a59b2d6596b28bbc4fe368ee5266 Author: Ian Campbell Date: Thu Mar 10 16:08:06 2011 +0000 xen: events: rename restore_cpu_pirqs -> restore_pirqs There is nothing per-cpu about this function. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 76465b2dafb8ce471f115b6af80f7a67a1fda377 Author: Ian Campbell Date: Thu Mar 10 16:08:05 2011 +0000 xen: events: remove unused public functions I was unable to find any user of these functions in either the functionality pending for 2.6.39 or the xen/next-2.6.32 branch of xen.git An exception to this was xen_gsi_from_irq which did appear to be used in xen/next-2.6.32's pciback. However in the 2.6.39 version of pciback xen_pirq_from_irq is, correctly AFAICT, used instead. Only a minority of functions in events.h use "extern" so drop it from those places for consistency. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit a0e181167ee4254988c8c89d26ffd8ef4cb7deb0 Author: Ian Campbell Date: Thu Mar 10 16:08:03 2011 +0000 xen: events: fix xen_map_pirq_gsi error return Fix initial value of irq so that first goto out (if pirq or gsi arguments are too large) actually returns an error. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 653378acdd477a299f468e396c7719911ac57881 Author: Ian Campbell Date: Thu Mar 10 16:08:04 2011 +0000 xen: events: simplify comment It is never valid assume any particular relationship between a Xen PIRQ number and and Linux IRQ number so there is no need to hedge when saying so. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit be49472f0460455e8e0d9e6593837e09cbcc9ad7 Author: Ian Campbell Date: Thu Mar 10 16:08:02 2011 +0000 xen: events: separate two unrelated halves of if condition Clarifies which bit the comment applies to. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 3b7bcdf2823a59438301a73af8d0d31439a8f3d9 Author: Keir Fraser Date: Thu Mar 3 10:13:26 2011 +0000 xen: events: Remove redundant clear of l2i at end of round-robin loop Signed-off-by: Keir Fraser Signed-off-by: Ian Campbell [ijc: forward ported from linux-2.6.18-xen.hg 991:9ba6d9f3fbc0] Signed-off-by: Konrad Rzeszutek Wilk commit 24b51c2f2de019a4596415e7bb1e92711127d0e0 Author: Keir Fraser Date: Thu Mar 3 11:06:28 2011 +0000 xen: events: Make round-robin scan fairer by snapshotting each l2 word once only (except for starting l2 word, which we scan in two parts). Signed-off-by: Keir Fraser Signed-off-by: Ian Campbell [ijc: forward ported from linux-2.6.18-xen.hg 990:427276ac595d] Signed-off-by: Konrad Rzeszutek Wilk commit ada6814c878c4d95fc8ca1402e49effbf3cc319a Author: Keir Fraser Date: Thu Mar 3 10:01:11 2011 +0000 xen: events: Clean up round-robin evtchn scan. Also fixes a couple of boundary cases. Signed-off-by: Keir Fraser Signed-off-by: Ian Campbell [ijc: forward ported from linux-2.6.18-xen.hg 988:c88a02a22a05] Signed-off-by: Konrad Rzeszutek Wilk commit f1f4a323d46c90632a4d35d34f1d347ca7cb65f5 Author: Ian Campbell Date: Thu Mar 3 09:29:36 2011 +0000 xen: events: Make last processed event channel a per-cpu variable. Signed-off-by: Ian Campbell [ijc: forward ported from linux-2.6.18-xen.hg 325:b2768401db94] Signed-off-by: Konrad Rzeszutek Wilk commit ab7f863e4183057dc494f3180199934a9637d401 Author: Scott Rixner Date: Thu Mar 3 09:30:08 2011 +0000 xen: events: Process event channels notifications in round-robin order. Avoids fairness issue resulting from domain 0 processing lowest numbered event channel first. Fixes bug #1115 "Event channel port scanning unfair". Bugzilla: http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1115 Signed-off-by: Ian Campbell [ijc: forward ported from linux-2.6.18-xen.hg 324:7fe1c6d02a2b various variables have different names in this tree: l1 -> pending_words l2 -> pending_bits l1i -> word_idx l2i -> bit_idx] Signed-off-by: Konrad Rzeszutek Wilk commit 71eef7d1e3d9df760897fdd2cad6949a8bcf1620 Author: Ian Campbell Date: Fri Feb 18 17:06:55 2011 +0000 xen: events: remove dom0 specific xen_create_msi_irq The function name does not distinguish it from xen_allocate_pirq_msi (which operates on domU and pvhvm domains rather than dom0). Hoist domain 0 specific functionality up into the only caller leaving functionality common to all guest types in xen_bind_pirq_msi_to_irq. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit ca1d8fe9521fb67c95cfa736c08f4bbbc282b5bd Author: Ian Campbell Date: Fri Feb 18 16:43:36 2011 +0000 xen: events: use xen_bind_pirq_msi_to_irq from xen_create_msi_irq Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit f420e010edd84eb2c237fc87b7451e69740fed46 Author: Ian Campbell Date: Fri Feb 18 16:43:35 2011 +0000 xen: events: push set_irq_msi down into xen_create_msi_irq Makes the tail end of this function look even more like xen_bind_pirq_msi_to_irq. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 2e55288f63343f0810f4f0a3004f78037cfb93d3 Author: Ian Campbell Date: Fri Feb 18 16:43:34 2011 +0000 xen: events: update pirq_to_irq in xen_create_msi_irq I don't think this was a deliberate ommision. Makes the tail end of this function look even more like xen_bind_pirq_msi_to_irq. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 8135591e90c81462a6902f6ffa1f1ca021db077a Author: Ian Campbell Date: Fri Feb 18 16:43:33 2011 +0000 xen: events: refactor xen_create_msi_irq slightly Calling PHYSDEVOP_map_pirq earlier simplifies error handling and starts to make the tail end of this function look like xen_bind_pirq_msi_to_irq. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit bf480d952bcf25e8ff7e95d2a23964107513ac51 Author: Ian Campbell Date: Fri Feb 18 16:43:32 2011 +0000 xen: events: separate MSI PIRQ allocation from PIRQ binding to IRQ Split the binding aspect of xen_allocate_pirq_msi out into a new xen_bind_pirq_to_irq function. In xen_hvm_setup_msi_irq when allocating a pirq write the MSI message to signal the PIRQ as soon as the pirq is obtained. There is no way to free the pirq back so if the subsequent binding to an IRQ fails we want to ensure that we will reuse the PIRQ next time rather than leak it. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 5cad61a6ba6f4956a218ffbb64cafcc1daefaca0 Author: Ian Campbell Date: Fri Feb 18 16:43:31 2011 +0000 xen: events: assume PHYSDEVOP_get_free_pirq exists The find_unbound_pirq is called only from xen_allocate_pirq_msi and only if alloc_pirq is true. The only caller which does this is xen_hvm_setup_msi_irqs. The use of this function is gated, in pci_xen_hvm_init, on XENFEAT_hvm_pirqs. The PHYSDEVOP_get_free_pirq interfaces was added to the hypervisor in 22410:be96f6058c05 while XENFEAT_hvm_pirqs was added a couple of minutes prior in 22409:6663214f06ac. Therefore we do not need to concern ourselves with hypervisors which support XENFEAT_hvm_pirqs but not PHYSDEVOP_get_free_pirq. This eliminates the fallback path in find_unbound_pirq which walks to pirq_to_irq array looking for a free pirq. Unlike the PHYSDEVOP_get_free_pirq interface this fallback only looks up a free pirq but does not reserve it. Removing this fallback will simplify locking in the future. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 9a626612c2010699d9909a4c3141d3a38660f3b3 Author: Ian Campbell Date: Fri Feb 18 16:43:30 2011 +0000 xen: pci: collapse apic_register_gsi_xen_hvm and xen_hvm_register_pirq apic_register_gsi_xen_hvm is a tiny wrapper around xen_hvm_register_pirq. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 4b41df7f6e0b5684378d9155773c42a4577e8582 Author: Ian Campbell Date: Fri Feb 18 16:43:29 2011 +0000 xen: events: return irq from xen_allocate_pirq_msi consistent with other similar functions. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit bb5d079aefa828c292c267ed34ed2282947fa233 Author: Ian Campbell Date: Fri Feb 18 16:43:28 2011 +0000 xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi All callers pass this flag so it is pointless. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit ae1635b05fae30804061406010914d85d12431ac Author: Ian Campbell Date: Fri Feb 18 16:43:27 2011 +0000 xen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq available. Cc: Jeremy Fitzhardinge Cc: xen-devel@lists.xensource.com Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 260a7d4cfd26d8bad8ac3a7fce11de47491d7e00 Author: Ian Campbell Date: Fri Feb 18 16:43:26 2011 +0000 xen: pci: only define xen_initdom_setup_msi_irqs if CONFIG_XEN_DOM0 Fixes: CC arch/x86/pci/xen.o arch/x86/pci/xen.c:183: warning: 'xen_initdom_setup_msi_irqs' defined but not used Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 8448f0119a4309ef9626cf8e2dc5abb881e6dc2a Merge: 8054c36 3d74a53 Author: Konrad Rzeszutek Wilk Date: Thu Mar 10 14:42:11 2011 -0500 Merge branch 'stable/pcifront-fixes' into stable/irq.cleanup * stable/pcifront-fixes: pci/xen: When free-ing MSI-X/MSI irq->desc also use generic code. pci/xen: Cleanup: convert int** to int[] pci/xen: Use xen_allocate_pirq_msi instead of xen_allocate_pirq xen-pcifront: Sanity check the MSI/MSI-X values xen-pcifront: don't use flush_scheduled_work() commit 8054c3634cb3cb9d426c8ade934389213b857858 Merge: f5412be 1aa0b51 Author: Konrad Rzeszutek Wilk Date: Thu Mar 10 14:41:43 2011 -0500 Merge branch 'stable/irq.rework' into stable/irq.cleanup * stable/irq.rework: xen/irq: Cleanup up the pirq_to_irq for DomU PV PCI passthrough guests as well. xen: Use IRQF_FORCE_RESUME xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend. xen: Fix compile error introduced by "switch to new irq_chip functions" xen: Switch to new irq_chip functions xen: Remove stale irq_chip.end xen: events: do not free legacy IRQs xen: events: allocate GSIs and dynamic IRQs from separate IRQ ranges. xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq xen:events: move find_unbound_irq inside CONFIG_PCI_MSI xen: handled remapped IRQs when enabling a pcifront PCI device. genirq: Add IRQF_FORCE_RESUME commit e43f055a953721ed1787a039ab5e720755596ea2 Author: David Teigland Date: Thu Mar 10 13:22:34 2011 -0600 dlm: use alloc_workqueue function Replaces deprecated create_singlethread_workqueue(). Signed-off-by: David Teigland commit e3853a90e218bcb2e48d3f403d0962bf54444f5f Author: David Teigland Date: Thu Mar 10 13:07:17 2011 -0600 dlm: increase default hash table sizes Make all three hash tables a consistent size of 1024 rather than 1024, 512, 256. All three tables, for resources, locks, and lock dir entries, will generally be filled to the same order of magnitude. Signed-off-by: David Teigland commit 8fe8f545c6d753ead15e1f4919d39e8f9bb49629 Author: Michel Lespinasse Date: Sun Mar 6 18:07:50 2011 -0800 futex: Update futex_wait_setup comments about locking Reviving a cleanup I had done about a year ago as part of a larger futex_set_wait proposal. Over the years, the locking of the hashed futex queue got improved, so that some of the "rare but normal" race conditions described in comments can't actually happen anymore. Signed-off-by: Michel Lespinasse Cc: Linus Torvalds Cc: Darren Hart Cc: Peter Zijlstra LKML-Reference: <20110307020750.GA31188@google.com> Signed-off-by: Thomas Gleixner commit 5c7707554858eca8903706b6df7cba5c0f802244 Author: Chris Metcalf Date: Tue Mar 1 13:01:49 2011 -0500 drivers/edac: provide support for tile architecture Add tile support for the EDAC driver, which provides unified system error (memory, PCI, etc.) reporting. For now, the TILEPro port reports memory correctable error (CE) only. Signed-off-by: Chris Metcalf commit d91c641233ae09fcccec75313b7f55992668bf8d Author: Chris Metcalf Date: Tue Mar 1 12:49:53 2011 -0500 tile on-chip network driver: sync up with latest fixes Combine the "command" and "completion" locks into a single lock, on each egress queue, to improve efficiency. Support the use of 4KB pages in the "egress queue". Delete the unused "duplicate ACK compression" code. Filter "bad" (i.e. truncated) packets. Avoid corrupting "dev->napi_list", by sequentializing modifications. Deregister for incoming packets during stop, to reduce unexpected interrupts. Also, encourage active NAPI loops to complete before we disable NAPI, which would otherwise crash. Free any pending completions after shutting down LEPP. Use a single, permanently registered, IRQ handler, to avoid situations in which the IRQ handler was firing after being freed, and ignore any "unexpected" interrupts. Drop egress packets, instead of spinning, if the hardware cannot keep up, or is disconnected. Signed-off-by: Chris Metcalf commit 76c567fbba50c3da2f4d40e2e551bab26cfd4381 Author: Chris Metcalf Date: Mon Feb 28 16:37:34 2011 -0500 arch/tile: support 4KB page size as well as 64KB The Tilera architecture traditionally supports 64KB page sizes to improve TLB utilization and improve performance when the hardware is being used primarily to run a single application. For more generic server scenarios, it can be beneficial to run with 4KB page sizes, so this commit allows that to be specified (by modifying the arch/tile/include/hv/pagesize.h header). As part of this change, we also re-worked the PTE management slightly so that PTE writes all go through a __set_pte() function where we can do some additional validation. The set_pte_order() function was eliminated since the "order" argument wasn't being used. One bug uncovered was in the PCI DMA code, which wasn't properly flushing the specified range. This was benign with 64KB pages, but with 4KB pages we were getting some larger flushes wrong. The per-cpu memory reservation code also needed updating to conform with the newer percpu stuff; before it always chose 64KB, and that was always correct, but with 4KB granularity we now have to pay closer attention and reserve the amount of memory that will be requested when the percpu code starts allocating. Signed-off-by: Chris Metcalf commit 09c17eab075ceeafb53935d858c575b6776394d1 Author: Chris Metcalf Date: Mon Feb 28 16:01:09 2011 -0500 arch/tile: add some more VMSPLIT options and use consistent naming This renames 3G_OPT to 2_75G, and adds 2_5G and 2_25G. For memory-intensive applications that are also network-buffer intensive it can be helpful to be able to tune the virtual address of the start of kernel memory. Signed-off-by: Chris Metcalf commit a9e7acfff0a279792918b7b0de74106e576e9988 Author: Thomas Gleixner Date: Thu Mar 10 19:12:24 2011 +0100 hrtimer: Remove empty hrtimer_init_hres_timer() Leftover from earlier implementation. All empty, remove it. Signed-off-by: Thomas Gleixner commit 53370d2e8c0382e3e2aa76def93365ed674e7fc7 Author: Thomas Gleixner Date: Thu Mar 10 18:26:33 2011 +0100 hrtimer: Update hrtimer->state documentation We changed some of the state bits and combinations thereof over time, but never updated the documentation. Signed-off-by: Thomas Gleixner commit 5fb682b0644cd20015d9b0e3ca6921ad5533f4ba Author: Chris Metcalf Date: Mon Feb 28 15:58:39 2011 -0500 arch/tile: fix some comments and whitespace This is a grab bag of changes with no actual change to generated code. This includes whitespace and comment typos, plus a couple of stale comments being removed. Signed-off-by: Chris Metcalf commit 42924355204bd83d799bd151211ae6e014982849 Author: Tony Lindgren Date: Thu Mar 10 09:51:29 2011 -0800 omap: Fix H4 init_irq to not call h4_init_flash There should be no reason to call h4_init_flash this early. It causes problems as things are not yet initialized. Tested-by: Tarun Kanti DebBarma Signed-off-by: Tony Lindgren commit 6f685c5cdd29649cf8cc8f57c72791159f936e07 Author: Dave Martin Date: Thu Mar 3 11:41:12 2011 +0100 ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas Various binutils versions can resolve Thumb-2 branches to locally-defined, preemptible global symbols as short-range "b.n" branch instructions. This is a problem, because there's no guarantee the final destination of the symbol, or any candidate locations for a trampoline, are within range of the branch. For this reason, the kernel does not support fixing up the R_ARM_THM_JUMP11 (102) relocation in modules at all, and it makes little sense to add support. The symptom is that the kernel fails with an "unsupported relocation" error when loading some modules. Until fixed tools are available, passing -fno-optimize-sibling-calls to gcc should prevent gcc generating code which hits this problem, at the cost of a bit of extra runtime stack usage in some cases. The problem is described in more detail at: https://bugs.launchpad.net/binutils-linaro/+bug/725126 Only Thumb-2 kernels are affected. This patch adds a new CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11 config option which adds -fno-optimize-sibling-calls to CFLAGS_MODULE when building a Thumb-2 kernel. Signed-off-by: Dave Martin Acked-by: Nicolas Pitre Signed-off-by: Russell King commit a09e89f67ca56d6fa7634bd0738d64fa61bc3c39 Author: Adam Lackorzynski Date: Thu Mar 10 17:41:56 2011 +0100 ALSA: hda: Prevent writing ICH6_PCIREG_TCSEL on AMD systems azx_init_pci() always writes PCI config register ICH6_PCIREG_TCSEL although this looks to be only defined on Intel systems and has a different meaning on AMD systems. On AMD systems the PCI interrupt pin control register is modified instead. Since the meaning of offset 0x44 in device specific configuration space is unknown for devices by other vendors, we only exclude AMD systems to retain the current behaviour. Signed-off-by: Adam Lackorzynski Signed-off-by: Takashi Iwai commit b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3 Author: Nicolas Pitre Date: Mon Feb 21 06:53:35 2011 +0100 ARM: 6747/1: P2V: Thumb2 support Adding Thumb2 support to the runtime patching of the virt_to_phys and phys_to_virt opcodes. Tested both the 8-bit and the 16-bit fixups, using different placements in memory to exercize all code paths. Signed-off-by: Nicolas Pitre Reviewed-by: Dave Martin Signed-off-by: Russell King commit 8304d6f24cc1221392b6d61fa9d16631cbd6beb7 Author: David Teigland Date: Mon Feb 21 14:58:21 2011 -0600 dlm: record full callback state Change how callbacks are recorded for locks. Previously, information about multiple callbacks was combined into a couple of variables that indicated what the end result should be. In some situations, we could not tell from this combined state what the exact sequence of callbacks were, and would end up either delivering the callbacks in the wrong order, or suppress redundant callbacks incorrectly. This new approach records all the data for each callback, leaving no uncertainty about what needs to be delivered. Signed-off-by: David Teigland commit 0a3fabe30e1a3b2037a12b863b8c45fffce38ee9 Author: David Henningsson Date: Fri Mar 4 16:54:52 2011 +0100 ALSA: HDA: Realtek ALC88x: Do not over-initialize speakers and hp that are primary outputs Do not initialize again the what has already been initialized as multi outs, as this breaks surround speakers. Tested-by: BartÅ‚omiej Å»ogaÅ‚a Cc: Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 7e59e097c09b82760bb0fe08b0fa2b704d76c3f4 Author: David Henningsson Date: Fri Mar 4 14:22:25 2011 +0100 ALSA: HDA: Fixup unnecessary volume control index on Realtek ALC88x Without this change, a volume control named "Surround" or "Side" would get an unnecessary index, causing it to be ignored by the vmaster and PulseAudio. Tested-by: BartÅ‚omiej Å»ogaÅ‚a Cc: Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit ebbeb3d6aa22433c218da6f29fd7b3ebc89b87ea Author: David Henningsson Date: Fri Mar 4 14:08:30 2011 +0100 ALSA: HDA: Fix volume control naming for surround speakers on Realtek auto-parser When more than one pair of internal speakers is present, allow names according to their channels. Tested-by: BartÅ‚omiej Å»ogaÅ‚a Cc: Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 32eea3884debb65ec1da633bc5df5aee23879865 Author: David Henningsson Date: Fri Mar 4 13:37:50 2011 +0100 ALSA: HDA: Enable surround and subwoofer on Lenovo Ideapad Y530 The pin config values would change the association instead of the sequence, this commit fixes that up. Tested-by: BartÅ‚omiej Å»ogaÅ‚a Cc: Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit bc3a8a01def4fb0ec0ef8a20d097277b9c6b2a1f Author: Alexey Fisher Date: Thu Mar 10 14:53:39 2011 +0100 ALSA: usb-audio - Add "cval->res = 384" quirk for Logitech Webcam C600 One more affected devices: Logitech Webcam C600 (046d:0808) Volume range before quirk is 6400, after (also real) is 16. Signed-off-by: Alexey Fisher Signed-off-by: Takashi Iwai commit 80acefff3bc7bd53d46c16c683ab66c0ece20810 Author: Alexey Fisher Date: Thu Mar 10 14:53:38 2011 +0100 ALSA: usb-audio - Add volume range check and warn if it too big Signed-off-by: Alexey Fisher Signed-off-by: Takashi Iwai commit 4a0b1665db09cf2da9ad7d0f12da386373c10bfa Author: Steven Rostedt Date: Wed Mar 9 20:09:26 2011 -0500 tracing: Fix irqoff selftest expanding max buffer If the kernel command line declares a tracer "ftrace=sometracer" and that tracer is either not defined or is enabled after irqsoff, then the irqs off selftest will fail with the following error: Testing tracer irqsoff: ------------[ cut here ]------------ WARNING: at /home/rostedt/work/autotest/nobackup/linux-test.git/kernel/trace/tra ce.c:713 update_max_tr_single+0xfa/0x11b() Hardware name: Modules linked in: Pid: 1, comm: swapper Not tainted 2.6.38-rc8-test #1 Call Trace: [] ? warn_slowpath_common+0x65/0x7a [] ? update_max_tr_single+0xfa/0x11b [] ? warn_slowpath_null+0xf/0x13 [] ? update_max_tr_single+0xfa/0x11b [] ? stop_critical_timing+0x154/0x204 [] ? trace_selftest_startup_irqsoff+0x5b/0xc1 [] ? trace_selftest_startup_irqsoff+0x5b/0xc1 [] ? trace_selftest_startup_irqsoff+0x5b/0xc1 [] ? time_hardirqs_on+0x25/0x28 [] ? trace_hardirqs_on_caller+0x18/0x12f [] ? trace_hardirqs_on+0xb/0xd [] ? trace_selftest_startup_irqsoff+0x5b/0xc1 [] ? register_tracer+0xf8/0x1a3 [] ? init_irqsoff_tracer+0xd/0x11 [] ? do_one_initcall+0x71/0x121 [] ? init_irqsoff_tracer+0x0/0x11 [] ? kernel_init+0x13a/0x1b6 [] ? kernel_init+0x0/0x1b6 [] ? kernel_thread_helper+0x6/0x10 ---[ end trace e93713a9d40cd06c ]--- .. no entries found ..FAILED! What happens is the "ftrace=..." will expand the ring buffer to its default size (from its minimum size) but it will not expand the max ring buffer (the ring buffer to store maximum latencies). When the irqsoff test runs, it will call the ring buffer swap routine that checks if the max ring buffer is the same size as the normal ring buffer, and will fail if it is not. This causes the test to fail. The solution is to expand the max ring buffer before running the self test if the max ring buffer is used by that tracer and the normal ring buffer is expanded. The max ring buffer should be shrunk again after the test is done to save space. Signed-off-by: Steven Rostedt commit 9a24470b2826e4665b1484836c7ae6aba1ddea32 Author: Steven Rostedt Date: Wed Mar 9 14:53:38 2011 -0500 tracing: Align 4 byte ints together in struct tracer Move elements in struct tracer for better alignment. Signed-off-by: Steven Rostedt commit 56355b83e2a24ce7e1870c8479205e2cdd332225 Author: Yuanhan Liu Date: Mon Nov 8 14:05:12 2010 +0800 tracing: Export trace_set_clr_event() Trace events belonging to a module only exists when the module is loaded. Well, we can use trace_set_clr_event funtion to enable some trace event at the module init routine, so that we will not miss something while loading then module. So, Export the trace_set_clr_event function so that module can use it. Signed-off-by: Yuanhan Liu LKML-Reference: <1289196312-25323-1-git-send-email-yuanhan.liu@linux.intel.com> Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Ingo Molnar Signed-off-by: Steven Rostedt commit 31274d72f01604f4b02d933b4f3cac84d2c201fd Author: Jiri Olsa Date: Fri Feb 18 15:52:19 2011 +0100 tracing: Explain about unstable clock on resume with ring buffer warning The "Delta way too big" warning might appear on a system with a unstable shed clock right after the system is resumed and tracing was enabled at time of suspend. Since it's not realy a bug, and the unstable sched clock is working fast and reliable otherwise, Steven suggested to keep using the sched clock in any case and just to make note in the warning itself. v2 changes: - added #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK Signed-off-by: Jiri Olsa LKML-Reference: <20110218145219.GD2604@jolsa.brq.redhat.com> Signed-off-by: Steven Rostedt commit 722b3c74695377d11d18a52f3da08114d37f3f37 Author: Steven Rostedt Date: Fri Feb 11 20:36:02 2011 -0500 ftrace/graph: Trace function entry before updating index Currently the index to the ret_stack is updated and the real return address is saved in the ret_stack. Then we call the trace function. The trace function could decide that it doesn't want to trace this function (ex. set_graph_function does not match) and it will return 0 which means not to trace this call. The normal function graph tracer has this code: if (!(trace->depth || ftrace_graph_addr(trace->func)) || ftrace_graph_ignore_irqs()) return 0; What this states is, if the trace depth (which is curr_ret_stack) is zero (top of nested functions) then test if we want to trace this function. If this function is not to be traced, then return 0 and the rest of the function graph tracer logic will not trace this function. The problem arises when an interrupt comes in after we updated the curr_ret_stack. The next function that gets called will have a trace->depth of 1. Which fools this trace code into thinking that we are in a nested function, and that we should trace. This causes interrupts to be traced when they should not be. The solution is to trace the function first and then update the ret_stack. Reported-by: zhiping zhong Reported-by: wu zhangjin Signed-off-by: Steven Rostedt commit 1274a9c2e91652e28efa45c3e5886ec82f08bfbe Author: Steven Rostedt Date: Fri Feb 11 16:43:33 2011 -0500 ftrace: Add .ref.text as one of the safe areas to trace The section .ref.text will not go away unexpectedly and is safe to trace. Add it to the safe list of sections to allow tracing. Signed-off-by: Steven Rostedt commit 10da37a645b5e915d8572cc2b1f5eb11ada3ea4f Author: David Sharp Date: Fri Dec 3 16:13:26 2010 -0800 tracing: Adjust conditional expression latency formatting. Formatting change only to improve code readability. No code changes except to introduce intermediate variables. Signed-off-by: David Sharp LKML-Reference: <1291421609-14665-13-git-send-email-dhsharp@google.com> [ Keep variable declarations and assignment separate ] Signed-off-by: Steven Rostedt commit ca9da2dd63b0b32de1b693953dff66cadeb6400b Author: David Sharp Date: Fri Dec 3 16:13:23 2010 -0800 tracing: Fix event alignment: skb:kfree_skb Acked-by: Neil Horman Signed-off-by: David Sharp LKML-Reference: <1291421609-14665-10-git-send-email-dhsharp@google.com> Signed-off-by: Steven Rostedt commit ad440ad66f1617194738bf674dfe2d38978ac54d Author: David Sharp Date: Fri Dec 3 16:13:22 2010 -0800 tracing: Fix event alignment: mce:mce_record Signed-off-by: David Sharp LKML-Reference: <1291421609-14665-9-git-send-email-dhsharp@google.com> Signed-off-by: Steven Rostedt commit d5bf2ff07230a4a1b73ecb22363f77c02e1d85ab Author: David Sharp Date: Fri Dec 3 16:13:21 2010 -0800 tracing: Fix event alignment: kvm:kvm_hv_hypercall Acked-by: Avi Kivity Signed-off-by: David Sharp LKML-Reference: <1291421609-14665-8-git-send-email-dhsharp@google.com> Signed-off-by: Steven Rostedt commit b5e3008e489f5a00c6d5db914a4c4338c9ef5e8b Author: David Sharp Date: Fri Dec 3 16:13:20 2010 -0800 tracing: Fix event alignment: module:module_request Acked-by: Li Zefan Signed-off-by: David Sharp LKML-Reference: <1291421609-14665-7-git-send-email-dhsharp@google.com> Signed-off-by: Steven Rostedt commit 140e4f2d1cd816aed196705c036763313c0e4bd3 Author: David Sharp Date: Fri Dec 3 16:13:19 2010 -0800 tracing: Fix event alignment: ftrace:context_switch and ftrace:wakeup Signed-off-by: David Sharp LKML-Reference: <1291421609-14665-6-git-send-email-dhsharp@google.com> Signed-off-by: Steven Rostedt commit e6e1e2593592a8f6f6380496655d8c6f67431266 Author: Steven Rostedt Date: Wed Mar 9 10:41:56 2011 -0500 tracing: Remove lock_depth from event entry The lock_depth field in the event headers was added as a temporary data point for help in removing the BKL. Now that the BKL is pretty much been removed, we can remove this field. This in turn changes the header from 12 bytes to 8 bytes, removing the 4 byte buffer that gcc would insert if the first field in the data load was 8 bytes in size. Signed-off-by: Steven Rostedt commit 23bfdacf4eb525ff3404161429cedaa281c23e47 Author: Will Deacon Date: Thu Mar 10 14:03:01 2011 +0100 ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump The removal of the single-step emulation from ptrace on ARM means that thread_struct no longer has software breakpoint fields in its debug member. This patch fixes the a.out core dump code so that the debug registers are zeroed rather than trying to copy from non-existent fields. Cc: Nicolas Pitre Signed-off-by: Bryan Wu Signed-off-by: Will Deacon Signed-off-by: Russell King commit 80e1b84ffe1354f314fd85c939900b816f394e5a Merge: 4cfeb69 7c2de63 Author: Mark Brown Date: Thu Mar 10 14:16:35 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 1c0b04d10bbe35279c50e3b36cf5b8ec2a0050d8 Author: Arnaldo Carvalho de Melo Date: Wed Mar 9 08:13:19 2011 -0300 perf header: Stop using 'self' Stop using this python/OOP convention, doesn't really helps. Will do more from time to time till we get it cleaned up in all of tools/perf. Suggested-by: Thomas Gleixner LKML-Reference: Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit a91e5431d54f5359fccb5ec2512f252eb217707e Author: Arnaldo Carvalho de Melo Date: Thu Mar 10 11:15:54 2011 -0300 perf session: Use evlist/evsel for managing perf.data attributes So that we can reuse things like the id to attr lookup routine (perf_evlist__id2evsel) that uses a hash table instead of the linear lookup done in the older perf_header_attr routines, etc. Also to make evsels/evlist more pervasive an API, simplyfing using the emerging perf lib. cc: Arun Sharma Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6547250381eb315acff3d52b4872ad775359407c Author: Jiri Olsa Date: Mon Mar 7 21:13:41 2011 +0100 perf top: Don't let events to eat up whole header line Passing multiple events might force out information about pid/tid/cpu. Attached patch leaves 30 characters for this info at the expense of the events' names. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Han Pingtian LKML-Reference: <1299528821-17521-3-git-send-email-jolsa@redhat.com> Signed-off-by: Jiri Olsa Signed-off-by: Arnaldo Carvalho de Melo commit b9a46bba88001504235459c8410f17e6a7e38008 Author: Jiri Olsa Date: Mon Mar 7 21:13:40 2011 +0100 perf top: Fix events overflow in top command The snprintf function returns number of printed characters even if it cross the size parameter. So passing enough events via '-e' parameter will cause segmentation fault. It's reproduced by following command: perf top -e `perf list | grep Tracepoint | awk -F'[' '\ {gsub(/[[:space:]]+/,"",$1);array[FNR]=$1}END{outputs=array[1];\ for (i=2;i<=FNR;i++){ outputs=outputs "," array[i];};print outputs}'` Attached patch is adding SNPRINTF macro that provides the overflow check and returns actuall number of printed characters. Reported-by: Han Pingtian Cc: Han Pingtian Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1299528821-17521-2-git-send-email-jolsa@redhat.com> Signed-off-by: Jiri Olsa Signed-off-by: Arnaldo Carvalho de Melo commit 3afdb0f3528991de0833224f2dba60dc061e01fa Merge: 71d8c5b f7fdaca Author: Russell King Date: Thu Mar 10 13:53:29 2011 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable commit f7fdaca910e6bc13659ecdffc28c97938b752e01 Author: Ilia Mirkin Date: Sun Feb 20 17:10:51 2011 -0500 arm: imx: Zero entire imxdma structure The semantic match that finds the problem: // @@ type T; identifier x; @@ T *x; ... * memset(x, ..., ... * sizeof(x) * ...); // Signed-off-by: Ilia Mirkin Signed-off-by: Sascha Hauer commit bb0a80e394b512028ad6cf4c86157d4f9db5aab8 Author: Richard Zhu Date: Thu Mar 10 14:15:46 2011 +0800 mx51 enchance the sd/mmc HW timing compatibility on mx51 boards. Some cards have the CRC errors in read on mx51 BBG board. Configure the eSDHC pad configurations to level up the compatibility to fix this issue. Signed-off-by: Richard Zhu Tested-by: Shawn Guo Signed-off-by: Sascha Hauer commit 3b0fd9d75598584478d1d3f6551f8a8a9696c34e Author: Alexandre Courbot Date: Wed Feb 16 03:49:01 2011 +0000 fbdev: sh_mobile_lcdcfb: add backlight support Support for backlight devices controlled through board-specific routines. Backlights can be defined per-channel and follow fbdev directives to switch off as the LCD blanks or is turned on/off. Signed-off-by: Alexandre Courbot Signed-off-by: Paul Mundt commit 4ce1e5e14c4ea43f971bd546934ef40b3ae4fcf3 Author: Tero Kristo Date: Thu Mar 10 03:50:54 2011 -0700 omap2/3: dmtimer: Enable autoidle This saves some power. OMAP4 version should check for GPT module ID, as autoidle is only supported on a subset of these. Signed-off-by: Tero Kristo Signed-off-by: Paul Walmsley commit 570b54c7fae65b65320d5a7d4b2249c86eeaa497 Author: Paul Walmsley Date: Thu Mar 10 03:50:09 2011 -0700 OMAP2+: clockdomain: add flag that will block autodeps from being added for a clockdomain Add a new clockdomain flag, CLKDM_NO_AUTODEPS, which, when marked on a clockdomain, will prevent "autodeps" from being associated with the clockdomain. ("Autodeps" are sleep dependencies and wakeup dependencies from/to processor modules that are automatically added to a clockdomain when it is in hardware-supervised idle mode. They are deprecated -- a relic from the old CDP trees -- but are still in use for OMAP3.) Also, prevent the hwmod code from adding or removing initiator dependencies for clockdomains with this flag set. This patch should allow others to test which clockdomains actually still need autodeps. Thanks to Kevin Hilman for noting that the original version should also modify the hwmod code. Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 9599217a06da5f5a95794ca9192c14317d441187 Author: Kishon Vijay Abraham I Date: Thu Mar 10 03:50:08 2011 -0700 OMAP2+: hwmod: add API to handle autoidle mode Create a new API that forms a wrapper to _set_module_autoidle() to modify the AUTOIDLE bit. This API is intended to be used by drivers that requires direct manipulation of the AUTOIDLE bits in SYSCONFIG register. McBSP driver requires autoidle bit to be enabled/disabled while using sidetone feature. Signed-off-by: Kishon Vijay Abraham I Cc: Paul Walmsley Cc: Benoit Cousson [paul@pwsan.com: restrict the hwmod states that the autoidle bit can be changed in; changed function name; dropped "int" from "unsigned int long"] Signed-off-by: Paul Walmsley commit 43b01643355672a266b95c4719f47cd1abac4680 Author: Paul Walmsley Date: Thu Mar 10 03:50:07 2011 -0700 OMAP2+: hwmod: allow board files to prevent devices from being reset upon init Some boards can't tolerate IP blocks being reset when they are initialized. Michael Büsch cites a case with the Nokia N810: http://www.spinics.net/lists/linux-omap/msg47277.html To allow such boards to continue working normally, allow board file maintainers to mark IP blocks to prevent them from being reset upon init. This is done via a hwmod function, omap_hwmod_no_setup_reset(). Signed-off-by: Paul Walmsley Cc: Michael Buesch commit 03567812d81dd87a810b2bd1e804f4001de03da5 Author: Or Gerlitz Date: Thu Jan 13 10:43:40 2011 +0100 drbd: drop code present under #ifdef which is relevant to 2.6.28 and below Signed-off-by: Or Gerlitz Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 7961243b7bdd62d72b47eb2c0bee776c51a8a8e2 Author: Philipp Reisner Date: Wed Mar 2 23:14:44 2011 +0100 drbd: Fixed handling of read errors on a 'VerifyS' node Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 8f21420ebd5ca5a751e2f606b49b0acd2a2af314 Author: Philipp Reisner Date: Tue Mar 1 15:52:35 2011 +0100 drbd: Fixed handling of read errors on a 'VerifyT' node Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 7fde2be93080c028c20078a2d6abec8a95891192 Author: Philipp Reisner Date: Tue Mar 1 11:08:28 2011 +0100 drbd: Implemented real timeout checking for request processing time Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit c5a91619793d444e5103ec5841045bf878718398 Author: Andreas Gruenbacher Date: Tue Jan 25 17:33:38 2011 +0100 drbd: Remove unused function atodb_endio() Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit fdda6544ad4d3284246e717b7108f7f497b45295 Author: Lars Ellenberg Date: Mon Jan 24 15:11:01 2011 +0100 drbd: improve log message if received sector offset exceeds local capacity Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit e99dc367b3aafb1ce2d5d92e94834d07b299e1d7 Author: Lars Ellenberg Date: Mon Jan 24 14:58:39 2011 +0100 drbd: kill dead code This code became obsolete and unused last December with drbd: bitmap keep track of changes vs on-disk bitmap Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 10f6d9926cd17afff9dc03c967706419798b4929 Author: Lars Ellenberg Date: Mon Jan 24 14:47:09 2011 +0100 drbd: don't BUG_ON, if bio_add_page of a single page to an empty bio fails Just deal with it more gracefully, if we fail to add even a single page to an empty bio. We used to BUG_ON() there, but it has been observed in some Xen deployment, so we need to handle that case more robustly now. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 039312b6481e2928f3be19fee94c83327d93e4c7 Author: Philipp Reisner Date: Fri Jan 21 14:13:22 2011 +0100 drbd: Removed left over, now wrong comments Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 873b0d5f98ab70e4df7a62b2ef0305373f88f330 Author: Lars Ellenberg Date: Fri Jan 21 22:53:48 2011 +0100 drbd: serialize admin requests for new verify run with pending bitmap io This is an addendum to drbd: serialize admin requests for new resync with pending bitmap io It avoids a race that could trigger "FIXME" assert log messages. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit e636db5b956950b8b9bfbeb766a637f84bae1e3b Author: Lars Ellenberg Date: Fri Jan 21 17:10:37 2011 +0100 drbd: fix potential imbalance of ap_in_flight When we receive a barrier ack, we walk the ring list of drbd requests in the transfer log of the respective epoch, do some housekeeping, and free those objects. We tried to keep epochs of mirrored and unmirrored drbd requests separate, and assert that no local-only requests are present in a barrier_acked epoch. It turns out that this has quite a number of corner cases and would add bloated code without functional benefit. We now revert the (insufficient) commits drbd: Fixed an issue with AHEAD -> SYNC_SOURCE transitions drbd: Ensure that an epoch contains only requests of one kind and instead fix the processing of barrier acks to cope with a mix of local-only and mirrored requests. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 0ddc5549f88dfc4a4c919693e9a86095e89e080b Author: Lars Ellenberg Date: Fri Jan 21 12:35:15 2011 +0100 drbd: silence some noisy log messages during disconnect If we fail to send the information that we lost our disk, we have no connection, and no disk: no access to data anymore. That is either expected (deconfiguration), or there will be so much noise in the logs that "Sending state failed" is not useful at all. Drop it. If the reason for a shorter than expected receive was a signal, which we sent because we already decided to disconnect, these additional log messages are confusing and useless. This patch follows this pattern: - dev_warn(DEV, "short read expecting header on sock: r=%d\n", r); + if (!signal_pending(current)) + dev_warn(DEV, "short read expecting header on sock: r=%d\n", r); Also make them all dev_warn for consistency. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 20ceb2b22edaf51e59e76087efdc71a16a2858de Author: Lars Ellenberg Date: Fri Jan 21 10:56:44 2011 +0100 drbd: describe bitmap locking for bulk operation in finer detail Now that we do no longer in-place endian-swap the bitmap, we allow selected bitmap operations (testing bits, sometimes even settting bits) during some bulk operations. This caused us to hit a lot of FIXME asserts similar to FIXME asender in drbd_bm_count_bits, bitmap locked for 'write from resync_finished' by worker Which now is nonsense: looking at the bitmap is perfectly legal as long as it is not being resized. This cosmetic patch defines some flags to describe expectations in finer detail, so the asserts in e.g. bm_change_bits_to() can be skipped if appropriate. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 62b0da3a244ac33d25a77861ef1cc0080103f2ff Author: Lars Ellenberg Date: Thu Jan 20 13:25:21 2011 +0100 drbd: log UUIDs whenever they change All decisions about sync, sync direction, and wether or not to allow a connect or attach are based on our set of UUIDs to tag a data generation. Log changes to the UUIDs whenever they occur, logging "new current UUID P:Q:R:S" is more useful than "Creating new current UUID". Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit d07c9c10e5620c632aae9cac2b609033398f6139 Author: Philipp Reisner Date: Thu Jan 20 16:49:33 2011 +0100 drbd: We can not process BIOs with a size of 0 Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit cd88d030d41a9b0100fd5fee872024e6ebc8b276 Author: Philipp Reisner Date: Thu Jan 20 11:46:41 2011 +0100 drbd: Provide hints with the error message when clearing the sync pause flag When the user clears the sync-pause flag, and sync stays in pause state, give hints to the user, why it still is in pause state. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 79a30d2d71f7be862de93228fe9b919ef664af52 Author: Lars Ellenberg Date: Thu Jan 20 10:32:05 2011 +0100 drbd: queue bitmap writeout more intelligently The "lazy writeout" of cleared bitmap pages happens during resync, and should happen again once the resync finishes cleanly, or is aborted. If resync finished cleanly, or was aborted because of peer disk failure, we trigger the writeout from worker context in the after state change work. If resync was aborted because of connection failure, we should not immediately trigger bitmap writeout, but rather postpone the writeout to after the connection cleanup happened. We now do it in the receiver context from drbd_disconnect(). If resync was aborted because of local disk failure, well, there is nothing to write to anymore. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 54b956abef2c1ab339fd01792e69e4a921a5e487 Author: Lars Ellenberg Date: Thu Jan 20 10:47:53 2011 +0100 drbd: don't pointlessly queue bitmap send, if we lost connection This is a minor optimization and cleanup, and also considerably reduces some harmless (but noisy) race with the connection cleanup code. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 194bfb32dba8345a7e0f83e9b1ee965e14d4b679 Author: Lars Ellenberg Date: Tue Jan 18 10:38:01 2011 +0100 drbd: serialize admin requests for new resync with pending bitmap io Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 6c922ed543bee1bc6685ade07be59f3fa49a7288 Author: Lars Ellenberg Date: Wed Jan 12 11:51:13 2011 +0100 drbd: only generate and send a new sync uuid after a successful state change Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 20ee639024e3d33111df0e343050b218c656bf16 Author: Philipp Reisner Date: Tue Jan 18 15:28:59 2011 +0100 drbd: cleaned up __set_current_state() followed by schedule_timeout() calls Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 6a35c45f890dc18c5527ac501b308058118f20e7 Author: Philipp Reisner Date: Mon Jan 17 20:27:30 2011 +0100 drbd: Ensure that an epoch contains only requests of one kind The assert in drbd_req.c:755 forces us to have only requests of one kind in an epoch. The two kinds we distinguish here are: local-only or mirrored. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 2deb8336d04106f215c21ad1b029e78d12033d02 Author: Philipp Reisner Date: Mon Jan 17 18:39:18 2011 +0100 drbd: Fixed P_NEG_ACK processing for protocol A and B Protocol A has no P_WRITE_ACKs, but has P_NEG_ACKs. The master bio might already be completed, therefore the request is no longer in the collision hash. => Do not try to validate block_id as request In Protocol B we might already have got a P_RECV_ACK but then get a P_NEG_ACK after wards. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 94f2b05f03fbc605f83ae501682c85ff4535bb6d Author: Philipp Reisner Date: Mon Jan 17 15:14:26 2011 +0100 drbd: Killed an assert that is no longer valid The point is that drbd_disconnect() can be called with a cstate of WFConnection. That happens if the user issues "drbdsetup disconnect" while the drbd_connect() function executes. Then drbdd_init() will call drbdd(), which in turn will return without receiving any packets. Then drbdd_init() will end up calling drbd_disconnect() with a cstate of WFConnection. Bottom line: This assertion is wrong as it is, and we do not see value in fixing it. => Removing it. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 148efa165e9464927887b03c83a52c33b80b4431 Author: Philipp Reisner Date: Sat Jan 15 00:21:15 2011 +0100 drbd: Do not drop net config if sending in drbd_send_protocol() fails Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 370a43e7982dd497822097e0ae6022947ac2e7d4 Author: Philipp Reisner Date: Fri Jan 14 16:03:11 2011 +0100 drbd: Work on the Ahead -> SyncSource transition The test if rs_pending_cnt == 0 was too weak. Using Test for unacked_cnt == 0 instead. Moved that into the worker. Since unacked_cnt gets already increased when an P_RS_DATA_REQ comes in. Also using a timer to make Ahead -> SyncSource -> Ahead cycles slower... Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 71c78cfba232de8f61a4b1bbb6e876424d133407 Author: Philipp Reisner Date: Fri Jan 14 19:20:34 2011 +0100 drbd: Nothing should stop SyncSource -> Ahead transitions Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 4a23f2649698272abcd9e0c9a992d65739f32792 Author: Philipp Reisner Date: Tue Jan 11 17:42:17 2011 +0100 drbd: Do not full sync if a P_SYNC_UUID packet gets lost See also commit from 2009-08-15 "drbd_uuid_compare(): Do not full sync in case a P_SYNC_UUID packet gets lost." We saw cases where the History UUIDs where not as expected. So the detection of the special case did not trigger. With the sync UUID no longer being a random number, but deducible from the previous bitmap UUID, the detection of this special case becomes more reliable. The SyncUUID now is the previous bitmap UUID + 0x1000000000000. Rule 5a: Cs = H1p & H1p + Offset = Bp Connection was lost before SyncUUID Packet came through. Corrent (peer) UUIDs: Bp = H1p H1p = H2p H2p = 0 Become Sync target. Rule 7a: Cp = H1s & H1s + Offset = Bs Connection was lost before SyncUUID Packet came through. Correct (own) UUIDs: Bs = H1s H1s = H2s H2s = 0 Become Sync source. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 2b8a90b55533c66258a1ff0fb27b8cffa95665c4 Author: Philipp Reisner Date: Mon Jan 10 11:15:17 2011 +0100 drbd: Corrected off-by-one error in DRBD_MINOR_COUNT_MAX Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 110a204a354a5a69f99ed0bc8e6d779e6a94d410 Author: Andreas Gruenbacher Date: Mon Jan 3 15:47:08 2011 +0100 drbd: Remove useless / wrong comments Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 794abb753e29e85949b3719dbc2ab6a98711a47e Author: Philipp Reisner Date: Mon Dec 27 11:51:23 2010 +0100 drbd: Cleaned up the resync timer logic Besides removed a few lines of code, this moves the inspection of the state from before the queuing process to after the queuing. I.e. more closely to the actual invocation of the work. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit da0a78161d2b2da4819a1f05a38bb1dcbe02d951 Author: Philipp Reisner Date: Thu Dec 23 14:24:33 2010 +0100 drbd: Be more careful with SyncSource -> Ahead transitions We may not get from SyncSource to Ahead if we have sent some P_RS_DATA_REPLY packets to the peer and are waiting for P_WRITE_ACK. Again, this is not relevant for proper tuned systems, but makes sure that the not-tuned system does not get diverging bitmaps. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit d612d309e4c8401ad94c531678b59c4a8b7c41ce Author: Philipp Reisner Date: Mon Dec 27 10:53:28 2010 +0100 drbd: No longer answer P_RS_DATA_REQUEST packets when in C_AHEAD mode When the sync source node replies to a P_RS_DATA_REQUEST packet when it is already in ahead mode. I.e. those two packets crossed each other on the wire, that may lead to diverging bitmaps. This never happens in a well-tuned-system. In a well-tuned- system the resync controller has reduced the resync speed to zero long before we got into ahead-mode. But we have to be prepared for the not-well-tuned-system of course as well. Because -> diverging bitmaps = non terminating resync. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 617049aa7d753e8c821ac77126ab90e9f1b66d6d Author: Philipp Reisner Date: Wed Dec 22 12:48:31 2010 +0100 drbd: Fixed an issue with AHEAD -> SYNC_SOURCE transitions Create a new barrier when leaving the AHEAD mode. Otherwise we trigger the assertion in req_mod(, barrier_acked) D_ASSERT(req->rq_state & RQ_NET_SENT); The new barrier is created by recycling the newest existing one. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 071942727824bab03b1a3f6b6eeb5b269697b333 Author: Lars Ellenberg Date: Mon Dec 20 15:38:07 2010 +0100 drbd: ratelimit io error messages Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 3f98688afc2ce0138fc88e272bdd128e1e0b0976 Author: Philipp Reisner Date: Mon Dec 20 14:48:20 2010 +0100 drbd: There might be a resync after unfreezing IO due to no disk [Bugz 332] When on-no-data-accessible is set to suspend-io, also consider that a Primary, SyncTarget node losses its connection. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 725a97e43ee945cc813fffd9e628e50d703b973b Author: Lars Ellenberg Date: Sun Dec 19 11:29:55 2010 +0100 drbd: fix potential access of on-stack wait_queue_head_t after return I run into something declaring itself as "spinlock deadlock", BUG: spinlock lockup on CPU#1, kjournald/27816, ffff88000ad6bca0 Pid: 27816, comm: kjournald Tainted: G W 2.6.34.6 #2 Call Trace: [] do_raw_spin_lock+0x11e/0x14d [] _raw_spin_lock_irqsave+0x6a/0x81 [] ? __wake_up+0x22/0x50 [] __wake_up+0x22/0x50 [] bm_async_io_complete+0x258/0x299 [drbd] but the call traces do not fit at all, all other cpus are cpu_idle. I think it may be this race: drbd_bm_write_page wait_queue_head_t io_wait; atomic_t in_flight; bm_async_io submit_bio bm_async_io_complete if (atomic_dec_and_test(in_flight)) wait_event(io_wait, atomic_read(in_flight) == 0) return wake_up(io_wait) The wake_up now accesses the wait_queue_head_t spinlock, which is no longer valid, since the stack frame of drbd_bm_write_page has been clobbered now. Fix this by using struct completion, which does both the condition test as well as the wake_up inside its spinlock, so this race cannot happen. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 06d33e968d2c58143a7aaafa8963cf6a58099467 Author: Lars Ellenberg Date: Sat Dec 18 17:00:59 2010 +0100 drbd: improve on bitmap write out timing Even though we now track the need for bitmap writeout per bitmap page, there is no need to trigger the writeout while a resync is going on. Once the resync is finished (or aborted), we trigger bitmap writeout anyways. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 418e0a927d520f9c8e875ea75abee35d93a0f1b3 Author: Lars Ellenberg Date: Sat Dec 18 13:36:54 2010 +0100 drbd: spelling fix in log message Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 7648cdfe52daf0ca4fa9489879dea9e089b0dfe1 Author: Lars Ellenberg Date: Fri Dec 17 23:58:41 2010 +0100 drbd: be less noisy with some log messages We expect changes to a bitmap page in drbd_bm_write_page, that's why we submit a copy page. If a page changes during global writeout, that would be unexpected, and reason to warn, though. Also, often page writeout can be skipped (on activity log transactions during normal operation, for example), no need to log that everytime. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 5a22db8968a69bec835d1ed9a96ab3381719e0c0 Author: Lars Ellenberg Date: Fri Dec 17 21:14:23 2010 +0100 drbd: serialize sending of resync uuid with pending w_send_oos To improve the latency of IO requests during bitmap exchange, we recently allowed writes while waiting for the bitmap, sending "set out-of-sync" information packets for any newly dirtied bits. We have to make sure that the new resync-uuid does not overtake these "set oos" packets. Once the resync-uuid is received, the sync target starts the resync process, and expects the bitmap to only be cleared, not re-set. If we use this protocol extension, we queue the generation and sending of the resync-uuid on the worker, which naturally serializes with all previously queued packets. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit f735e3635430c6d1c319664d82b34376e3f9aa17 Author: Lars Ellenberg Date: Fri Dec 17 21:06:18 2010 +0100 drbd: add debugging assert to make sure the protocol is clean We expect to only receive the recently introduced "set out of sync" packets in specific states. If we receive them in different states, that may confuse the resync process to the point where it won't terminate, or think it made negative progress. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit c88d65e2231dbae4b7cd0ad7b2a919857a1be171 Author: Philipp Reisner Date: Mon Dec 20 15:29:28 2010 +0100 drbd: Documenting drbd_should_do_remote() and drbd_should_send_oos() Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 2265b473aecc1a6fe1f84a0ee272ba39806c2a8a Author: Lars Ellenberg Date: Thu Dec 16 15:41:26 2010 +0100 drbd: fix potential dereference of NULL pointer If drbd used to have crypto digest algorithms configured, then is being unconfigured (but not unloaded), it frees the algorithms, but does not reset the config. If it then is reconfigured to use the very same algorithm, it "forgot" to re-allocate the algorithms, thinking that the config has not changed in that aspect. It will then Oops on the first attempt to actually use those algorithms. Fix this by resetting the config to defaults after cleanup. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 02851e9f00d78dbc8ded0aacbf9bf3b631d627b3 Author: Lars Ellenberg Date: Thu Dec 16 14:47:39 2010 +0100 drbd: move bitmap write from resync_finished to after_state_change We must not call it directly from resync_finished, as we may be in either receiver or worker context there. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 84e7c0f7d123d64d97e1f789ad2f23a72fe8981f Author: Lars Ellenberg Date: Thu Dec 16 00:37:57 2010 +0100 drbd: Removed a reference to debug macros removed long time ago Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 6850c4421481139dc2cf982358e79c833a50d73c Author: Lars Ellenberg Date: Thu Dec 16 00:32:38 2010 +0100 drbd: get rid of unused debug code Long time ago, we had paranoia code in the bitmap that allocated one extra word, assigned a magic value, and checked on every occasion that the magic value was still unchanged. That debug code is unused, the extra long word complicates code a bit. Get rid of it. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 4b0715f09655e76ca24c35a9e25e7c464c2f7346 Author: Lars Ellenberg Date: Tue Dec 14 15:13:04 2010 +0100 drbd: allow petabyte storage on 64bit arch Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 19f843aa08e2d8f87a09b4c2edc43b00638423a8 Author: Lars Ellenberg Date: Wed Dec 15 08:59:11 2010 +0100 drbd: bitmap keep track of changes vs on-disk bitmap When we set or clear bits in a bitmap page, also set a flag in the page->private pointer. This allows us to skip writes of unchanged pages. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 6638dedaec6e3d32654f0ac5786f5d32963e208b Author: Rafi Rubin Date: Wed Mar 9 23:33:51 2011 -0500 HID: ntrig: apply NO_INIT_REPORTS quirk Probing reports does bad things with some ntrig firmwares, better to just leave them alone. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 95a0f10cddbf93ce89c175ac1c53dad2d20ad309 Author: Lars Ellenberg Date: Wed Dec 15 08:59:09 2010 +0100 drbd: store in-core bitmap little endian, regardless of architecture Our on-disk bitmap is a little endian bitstream. Up to now, we have stored the in-core copy of that in native endian, applying byte order conversion when necessary. Instead, keep the bitmap pages little endian, as they are read from disk, and use the generic_*_le_bit family of functions. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 7777a8ba1fc980e5edfe492ebf5a1676497b8db2 Author: Lars Ellenberg Date: Wed Dec 15 23:21:39 2010 +0100 drbd: bitmap: don't count unused bits (fix non-terminating resync) We trusted the on-disk bitmap to have unused bits cleared. In case that is not true for whatever reason, and we take a code path where the unused bits don't get cleared elsewhere (bm_clear_surplus is not called), we may miscount the bits, and get confused during resync, waiting for bits to get cleared that we don't even use: the resync process would not terminate. Fix this by masking out unused bits in __bm_count_bits. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 1b881ef77537f1077482f9946a6a99b4e2dd54b2 Author: Andreas Gruenbacher Date: Mon Dec 13 18:03:38 2010 +0100 drbd: Rename __inc_ap_bio_cond to may_inc_ap_bio The old name is confusing: the function does not increment anything. Also rename _inc_ap_bio_cond to inc_ap_bio_cond: there is no need for an underscore. Finally, make it clear that these functions return boolean values. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 24dccabb390412d04435e11cfb535df51def7b2d Author: Andreas Gruenbacher Date: Sun Dec 12 17:45:41 2010 +0100 drbd: Fix: drbd_bitmap_io does not return an enum determine_dev_size I guess bitmap I/O errors are supposed to cause drbd_determin_dev_size to return dev_size_error. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 2c46407d241f4b0e5b87959aae8f50f41fdd2a3a Author: Andreas Gruenbacher Date: Sat Dec 11 21:53:12 2010 +0100 drbd: receive_bitmap_plain: Get rid of ugly and useless enum Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit f70af118e3f3638698ac08959a41b9f9fe7237c8 Author: Andreas Gruenbacher Date: Sat Dec 11 18:51:50 2010 +0100 drbd: send_bitmap_rle_or_plain: Get rid of ugly and useless enum Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 78fcbdae224469cb48767fa29ca41f1d5890e57c Author: Andreas Gruenbacher Date: Fri Dec 10 22:18:27 2010 +0100 drbd: receive_bitmap: Missing free_page() on error path Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit de1f8e4a0af3c2d0dff9f6341fead4b509941282 Author: Andreas Gruenbacher Date: Fri Dec 10 21:04:00 2010 +0100 drbd: receive_bitmap: Avoid casting enum drbd_state_rv to int Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 4114be815f9811da42a21dc2f7ff552833660595 Author: Andreas Gruenbacher Date: Fri Dec 10 17:09:10 2010 +0100 drbd: receive_bitmap: Fix the wrong return value Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit f2024e7ce29f4287395ce879364cd68c7ac226f2 Author: Andreas Gruenbacher Date: Fri Dec 10 13:44:05 2010 +0100 drbd: drbd_nl_disk_conf: Avoid a compiler warning Warning: comparison between ‘enum drbd_ret_code’ and ‘enum drbd_state_rv’ Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 81e84650c200de0695372461964dd960365696db Author: Andreas Gruenbacher Date: Thu Dec 9 15:03:57 2010 +0100 drbd: Use the standard bool, true, and false keywords Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 6184ea2145609b4ad63b141bf1f8124135ff4949 Author: Andreas Gruenbacher Date: Thu Dec 9 14:23:27 2010 +0100 drbd: This code is dead now Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit bb4379464efeb4624757e2cc0bf9207a309c1075 Author: Andreas Gruenbacher Date: Thu Dec 9 14:02:35 2010 +0100 drbd: Another small enum drbd_state_rv cleanup Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit bf885f8a6772fb48409dd505a09d974a5e621f22 Author: Andreas Gruenbacher Date: Wed Dec 8 00:39:32 2010 +0100 drbd: Be more explicit about functions that return an enum drbd_state_rv Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit c8b325632f0e5ffdaeca3d1f3be77c9399316a40 Author: Andreas Gruenbacher Date: Wed Dec 8 01:06:16 2010 +0100 drbd: Rename enum drbd_state_ret_codes to enum drbd_state_rv Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 116676ca621a862a8124969772f4dd61c8b40eee Author: Andreas Gruenbacher Date: Wed Dec 8 13:33:11 2010 +0100 drbd: Rename enum drbd_ret_codes to enum drbd_ret_code Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 0cf9d27e38447efe5e5edce155a66a782a5aac4a Author: Andreas Gruenbacher Date: Tue Dec 7 10:43:29 2010 +0100 drbd: Get rid of unnecessary macros (2) The FAULT_ACTIVE macro just wraps the drbd_insert_fault macro for no apparent reason. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 662d91a23a8e8451ca47c08d5cff710fd080fd3a Author: Andreas Gruenbacher Date: Tue Dec 7 03:01:41 2010 +0100 drbd: Get rid of unnecessary macros (1) This macro doesn't save much code, but makes things a lot harder to read. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 2f58dcfc85b6800efd938f755e6c5f9979f4aa5c Author: Andreas Gruenbacher Date: Mon Dec 13 17:48:19 2010 +0100 drbd: Rename drbd_make_request_26 to drbd_make_request Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 96756784a6250c7d9878671ef3386b93b0c576d4 Author: Andreas Gruenbacher Date: Thu Dec 9 16:23:43 2010 +0100 drbd: Remove left-over prototype Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit cab2f74b45127a78b9a2980f54ca16cc9f45ddac Author: Andreas Gruenbacher Date: Thu Dec 9 16:08:46 2010 +0100 drbd: Make sure that drbd_send() has sent the right number of bytes Reviewed-by: Lars Ellenberg Signed-off-by: Philipp Reisner commit 220df4d006ed561b8fd4fbd8c01c6c28d6143653 Author: Lars Ellenberg Date: Thu Dec 9 15:21:02 2010 +0100 drbd: fix incomplete error message Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 7e458c32da946bd4f6aea476b61b79575578f834 Author: Andreas Gruenbacher Date: Wed Dec 8 19:02:09 2010 +0100 drbd: Removed an unnecessary #undef Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 8a3c104438be4986a77f332009b695fcac48f620 Author: Lars Ellenberg Date: Sun Dec 5 14:11:14 2010 +0100 drbd: fix regression, we need to close drbd epochs during normal operation commit e2041475e6ddb081734d161f6421977323f5a9b9 drbd: Starting with protocol 96 we can allow app-IO while receiving the bitmap Contained a bad chunk that tried to optimize away drbd barriers during bitmap exchange, but accidentally dropped them for normal mode as well. Impact: depending on activity log size and access pattern, activity log extents may not be recycled in time, causeing IO to block indefinetely. Fix: skip drbd barriers only if there is no connection to send them on, or the request being completed has not been on the network at all. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 09b9e7979378fe070784de20e50bb1d42aa643ab Author: Philipp Reisner Date: Fri Dec 3 16:04:24 2010 +0100 drbd: Implemented the before-resync-source handler Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 2561b9c1f1d63077c41903fc6ad58dc9ec47248b Author: Philipp Reisner Date: Fri Dec 3 15:22:48 2010 +0100 drbd: --force option for disconnect As the network connection can be lost at any time, a --force option for disconnect is just a matter of completeness. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 42ff269d1022a86be4f526cf674998c47b7ab856 Author: Lars Ellenberg Date: Wed Nov 24 10:11:14 2010 +0100 drbd: add packet_type 27 (return_code_only) to netlink api In case we ever should add an other packet type, we must not reuse 27, as that currently used for "empty" return code only replies. Document it as such. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 3e3a7766c2e6995ac98e7855017abc3544d54e08 Author: Lars Ellenberg Date: Wed Nov 24 10:41:45 2010 +0100 drbd: use kzalloc and memset(,0,) to start with clean buffers in drbd_nl Make sure we start with clean buffers to not accidentally send garbage back to userspace. Note: has not been observed; but just in case. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 17a93f3007c13003c739a19d0814cb5c2d21daba Author: Lars Ellenberg Date: Wed Nov 24 10:37:35 2010 +0100 drbd: remove /proc/drbd before unregistering from netlink There still exists a (theoretical) race on module unload, where /proc/drbd may still exist, but the netlink callback has been unregistered already, allowing drbdsetup to shout without listeners, and get no reply. Reorder remove_proc_entry and unregister of netlink callback. drbdsetup first checks for existence of the proc entry, and if that is missing, won't even try to contact the module. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 3da127fa887e5187ede702b835770634d705f8b2 Author: Lars Ellenberg Date: Wed Nov 24 10:33:02 2010 +0100 drbd: increase module count on /proc/drbd access If someone holds /proc/drbd open, previously rmmod would "succeed" in starting the unload, but then block on remove_proc_entry, leading to a situation where the lsmod does not show drbd anymore, but /proc/drbd being still there (but no longer accessible). I'd rather have rmmod fail up front in this case. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit c507f46f26661d4d0dc95a1b1271df5855ab4602 Author: Philipp Reisner Date: Mon Nov 22 15:49:17 2010 +0100 drbd: Removed 20 seconds upper bound for side-stepping Given low-enough network bandwidth combined with a IO pattern that hammers onto a single RS-extent, side-stepping might be necessary for much longer times. Changed the code to print a single informal message after 20 seconds, but it keeps on stepping aside forever. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 1fc80cf37810d6b00cac27a219b8ecab2010adac Author: Philipp Reisner Date: Mon Nov 22 14:18:47 2010 +0100 drbd: Becoming sync target may not happen out of < C_WF_REPORT_PARAMS This patch is acutally a necessary addendum to the patch "fix for spurious full sync (becoming sync target looked like invalidate)" Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 3719094ec2dec411b3151f10048316d787e086f9 Author: Philipp Reisner Date: Wed Nov 10 12:08:37 2010 +0100 drbd: Starting with protocol 96 we can allow app-IO while receiving the bitmap * C_STARTING_SYNC_S, C_STARTING_SYNC_T In these states the bitmap gets written to disk. Locking out of app-IO is done by using the drbd_queue_bitmap_io() and drbd_bitmap_io() functions these days. It is no longer necessary to lock out app-IO based on the connection state. App-IO that may come in after the BITMAP_IO flag got cleared before the state transition to C_SYNC_(SOURCE|TARGET) does not get mirrored, sets a bit in the local bitmap, that is already set, therefore changes nothing. * C_WF_BITMAP_S In this state we send updates (P_OUT_OF_SYNC packets). With that we make sure they have the same number of bits when going into the C_SYNC_(SOURCE|TARGET) connection state. * C_UNCONNECTED: The receiver starts, no need to lock out IO. * C_DISCONNECTING: in drbd_disconnect() we had a wait_event() to wait until ap_bio_cnt reaches 0. Removed that. * C_TIMEOUT, C_BROKEN_PIPE, C_NETWORK_FAILURE C_PROTOCOL_ERROR, C_TEAR_DOWN: Same as C_DISCONNECTING * C_WF_REPORT_PARAMS: IO still possible since that is still like C_WF_CONNECTION. And we do not need to send barriers in C_WF_BITMAP_S connection state. Allow concurrent accesses to the bitmap when receiving the bitmap. Everything gets ORed anyways. A drbd_free_tl_hash() is in after_state_chg_work(). At that point all the work items of the last connections must have been processed. Introduced a call to drbd_free_tl_hash() into drbd_free_mdev() for paranoia reasons. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit ab17b68f4579b460753a416b0afc4446381d876f Author: Philipp Reisner Date: Wed Nov 17 16:54:36 2010 +0100 drbd: Improvements in sanitize_state() The relevant change is that the state change to C_FW_BITMAP_S should implicitly change pdsk to C_CONSISTENT. (Think of it as C_OUTDATED, only without the guarantee that the peer has the outdated written to its meta data) At that opportunity I restructured the switch statement so that it gets evaluated every time. (Has declarative character) Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 22afd7ee94c1c5857323b677267ba8bace09bcef Author: Philipp Reisner Date: Tue Nov 16 15:30:44 2010 +0100 drbd: Fixed race condition in drbd_queue_bitmap_io May only test for ap_bio_cnt == 0 under req_lock. It can increase only under req_lock. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 8869d683b7491467fd39fcbe79756fce3e6f35e7 Author: Philipp Reisner Date: Wed Nov 17 18:24:19 2010 +0100 drbd: Fixed inc_ap_bio() The condition must be checked after perpare_to_wait(). The old implementaion could loose wakeup events. Never observed in real life. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 127b317844e7cc0458743b604998bece95eab030 Author: Philipp Reisner Date: Tue Nov 16 10:07:53 2010 +0100 drbd: use test_and_set_bit() to decide if bm_io_work should be queued Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit aeda1cd6a58009ef21b6d9c09b1a3ded726c2d10 Author: Philipp Reisner Date: Tue Nov 9 17:45:06 2010 +0100 drbd: Begin to account BIO processing time before inc_ap_bio() Since inc_ap_bio() might sleep already Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit f91ab6282df251d28aa4ad1bd85194ebe0a0115b Author: Philipp Reisner Date: Tue Nov 9 13:59:41 2010 +0100 drbd: Implemented side-stepping in drbd_res_begin_io() Before: drbd_rs_begin_io() locked app-IO out of an RS extent, and waited then until all previous app-IO in that area finished. (But not only until the disk-IO was finished but until the barrier/epoch ack came in for that == round trip time latency ++) After: As soon as a new app-IO waits wants to start new IO on that RS extent, drbd_rs_begin_io() steps aside (clearing the BME_NO_WRITES flag again). It retries after 100ms. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 9d77a5fee9d2a1ea4cd9a841d27b107df5913b33 Author: Philipp Reisner Date: Sun Nov 7 18:02:56 2010 +0100 drbd: Make some functions static Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit e3555d8545976703938d1b59e2db509426dbe02c Author: Philipp Reisner Date: Sun Nov 7 15:56:29 2010 +0100 drbd: Implemented priority inheritance for resync requests We only issue resync requests if there is no significant application IO going on. = Application IO has higher priority than resnyc IO. If application IO can not be started because the resync process locked an resync_lru entry, start the IO operations necessary to release the lock ASAP. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 59817f4fab6a165ba83ce399464ba38432db8233 Author: Philipp Reisner Date: Fri Oct 29 12:44:20 2010 +0200 drbd: Do not cleanup resync LRU for the Ahead/Behind SyncSource/SyncTarget transitions This one should be replaced with moving this cleanup to the 'right' position. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit c4752ef1284519c3baa1c3b19df34a80b4905245 Author: Philipp Reisner Date: Wed Oct 27 17:32:36 2010 +0200 drbd: When proxy's buffer drained off go into regular resync mode Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 73a01a18b9c28a0fab1131ece5b0a9bc00a879b8 Author: Philipp Reisner Date: Wed Oct 27 14:33:00 2010 +0200 drbd: New packet for Ahead/Behind mode: P_OUT_OF_SYNC Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 67531718d8f1259f01ab84c2aa25f7b03c7afd46 Author: Philipp Reisner Date: Wed Oct 27 12:21:30 2010 +0200 drbd: Implemented two new connection states Ahead/Behind In this connection mode, the ahead node no longer replicates application IO. The behind's disk becomes out dated. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 422028b1ca4c07995af82a18abced022ff4c296c Author: Philipp Reisner Date: Wed Oct 27 11:12:07 2010 +0200 drbd: New configuration parameters for dealing with network congestion net { on_congestion {block|pull-ahead|disconnect}; congestion-fill {sectors}; congestion-extents {al-extents}; } Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 759fbdfba66e620aceb3e73167e6003d1b8b0b0b Author: Philipp Reisner Date: Tue Oct 26 16:02:27 2010 +0200 drbd: Track the numbers of sectors in flight Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 688593c5a82068aea64df0b836793dfbbaa646d7 Author: Lars Ellenberg Date: Wed Nov 17 22:25:03 2010 +0100 drbd: Renamed write_flags_to_bio() to wire_flags_to_bio() Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit cc1226e7635011c7dd1e786770ed51ee751800f2 Author: omar ramirez Date: Fri Mar 4 13:32:44 2011 -0700 OMAP2+: hwmod: use status bit info for reset line On OMAP2 and OMAP3 the reset ctrl shift doesn't match the status bit, as it does on OMAP4, when handling the reset lines. This patch adds a new member in the reset info structure, so now it can be added as part of hwmod data, and checked accordingly for OMAP2 or 3; otherwise, there could be cases when the shift masks doesn't match both of the registers, and a successful reset might throw an error message or vice versa. Signed-off-by: Omar Ramirez Luna [paul@pwsan.com: added a warning if st_shift used on OMAP4; renamed 'r' variable; improved some documentation] Signed-off-by: Paul Walmsley commit 4d2274c543e78a267989da5f9b12e223cd87839f Author: Paul Walmsley Date: Thu Mar 3 15:22:42 2011 -0700 OMAP2+: hwmod: fix a documentation bug with HWMOD_NO_OCP_AUTOIDLE The documented name of the HWMOD_NO_OCP_AUTOIDLE flag was incorrect; fix it. Signed-off-by: Paul Walmsley commit 09c35f2fee8a8633dde7b8b588b1cb496eb220a1 Author: Rajendra Nayak Date: Wed Feb 16 12:11:24 2011 +0000 OMAP2+: hwmod: Fix what _init_clock returns _init_clock always returns 0 and does not propogate the error (in case of failure) back to the caller, causing _init_clocks to fail silently. Signed-off-by: Rajendra Nayak Acked-by: Benoît Cousson Signed-off-by: Paul Walmsley commit d73d65fab1c29c3c0f9736aed9cb55ea53843b00 Author: Avinash.H.M Date: Thu Mar 3 14:22:46 2011 -0700 omap: hwmod: add syss reset done flags to omap2, omap3 hwmods Some of the omap2, omap3 peripherals support software reset. This can be done through the softreset bit in sysconfig register. The reset status can be checked through resetdone bit of sysstatus register. syss_has_reset_status is added to the hwmod database of peripherals which have resetdone bit in sysstatus register. Cc: Rajendra Nayak Cc: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Govindraj.R Signed-off-by: Avinash.H.M Signed-off-by: Paul Walmsley commit 8985b63d072413f0446fd2d0d654795f2d683323 Author: Tarun Kanti DebBarma Date: Thu Mar 3 14:22:46 2011 -0700 OMAP2+: hwmod: fix incorrect computation of autoidle_mask Autoidle is a single bit, TIOCP_CFG[0], setting on OMAP1/2/3/4 platforms. In _set_module_autoidle() I am seeing 0x3 value where the mask is computed. This should be 0x1. v2: (1) Modified the subject. (2) Modified the description with further specific information. Baseline: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git Tested Info: Boot tested on OMAP 1/2/3/4. Signed-off-by: Tarun Kanti DebBarma Acked-by: Rajendra Nayak Acked-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 4896e8c1b8fb7e46a65a6676e271fc047a260a3e Author: Lars Ellenberg Date: Thu Nov 11 22:41:04 2010 +0100 drbd: restore compatibility with 32bit kernels With commit drbd: further converge progress display of resync and online-verify accidentally an u64/u64 div was introduced, causing an unresolvable symbol __udivdi3 to be reference. Actually for that division, 32bit are still suficient for now, so we can revert to unsigned long instead. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 1816a2b47afae838e53a177d5d166cc7be97d6b5 Author: Lars Ellenberg Date: Thu Nov 11 15:19:07 2010 +0100 drbd: properly use max_hw_sectors to limit the our bio size To ease tracking of bios in some hash tables, we want it to not cross certain boundaries (128k, used to be 32k). We limit the maximum bio size using queue parameters. Historically some defines and variables we use there have been named max_segment_size, which was misguided. Rename them to max_bio_size, and use [blk_]queue_max_hw_sectors where appropriate. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 3129b1b9aed15bbebde1b2a5719434273feb295d Author: Lars Ellenberg Date: Thu Nov 11 10:47:05 2010 +0100 drbd: debug: limit nelink-broadcast of request on digest mismatch to 32k We used to be limited to 32k requests, but have increased that limit to 128k now. This part of the code can only deal with 32k, it would scramble arbitrary pages for larger requests. As it is used for debugging only anyways, it is ok to simply truncate the dumped data here. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 470be44ab1841f3261a4d758450a42e6b79e9551 Author: Lars Ellenberg Date: Wed Nov 10 10:36:52 2010 +0100 drbd: detect modification of in-flight buffers With data-integrity digest enabled, double-check on the sending side for modifications by upper layers of buffers under write back, so we can tell it appart from corruption on the "wire". Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 5f9915bbb8e0975ce99f893c29b8e89100b33399 Author: Lars Ellenberg Date: Tue Nov 9 14:15:24 2010 +0100 drbd: further converge progress display of resync and online-verify Show progressbar and ETA always, with proc_details >= 1 also show the current sector position for both resync and online-verify on both nodes. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 18edc0b9d7dac2f74117a0bdb98f2e705eb74d82 Author: Lars Ellenberg Date: Tue Nov 9 14:12:10 2010 +0100 drbd: fix potential wrap of 32bit oos:%lu display in /proc/drbd When converting bits (4k resolution, still) to kB, we shift left. If it was a large number of bits on a 32bit box (>= 4 TiB storage), we may wrap the 32bit unsigned long base type, resulting in incorrect display. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 2649f0809f55e4df98c333a2b85c6fc8fee04804 Author: Lars Ellenberg Date: Fri Nov 5 10:05:47 2010 +0100 drbd: use the resync controller for online-verify requests as well Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit e65f440d474d7d6a6fd8a2c844e851d8c96ed9c5 Author: Lars Ellenberg Date: Fri Nov 5 10:04:07 2010 +0100 drbd: factor out drbd_rs_number_requests Preparation patch to be able to use the auto-throttling resync controller for online-verify requests as well. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 9bd28d3c90c80c7ec46085de281b38f67331da41 Author: Lars Ellenberg Date: Fri Nov 5 09:55:18 2010 +0100 drbd: factor out drbd_rs_controller_reset Preparation patch to be able to use the auto-throttling resync controller for online-verify requests as well. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 439d595379f87ec95249da21122eb085866f8ba9 Author: Lars Ellenberg Date: Fri Nov 5 09:52:46 2010 +0100 drbd: show progress bar and ETA for online-verify Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit ea5442aff68c559c951373739201721185191748 Author: Lars Ellenberg Date: Fri Nov 5 09:48:01 2010 +0100 drbd: advance progress step marks for online-verify Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit c6ea14dfa391da58e309d0d5041564b3d9dbb82f Author: Lars Ellenberg Date: Fri Nov 5 09:23:37 2010 +0100 drbd: factor out advancement of resync marks for progress reporting This is in preparation to unify progress reporting of online-verify and resync requests. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit de228bba676e1f76e5e5f9444e51bb2db003cefb Author: Lars Ellenberg Date: Fri Nov 5 09:43:15 2010 +0100 drbd: initialize online-verify progress tracking on verify target For partial (resumed) online verify, initialize the resync step marks once we know what the online verify start sector is. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 30b743a2d532af39c9ed13c85d5473f6f620f6c8 Author: Lars Ellenberg Date: Fri Nov 5 09:39:06 2010 +0100 drbd: improve online-verify progress tracking For a partial (resumed) online-verify, initialize rs_total not to total bits, but to number of bits to check in this run, to match the meaning rs_total has for actual resync. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 478f478bc1a58f97f09fd2048488bafdfa9d8fce Author: Benoit Cousson Date: Fri Feb 25 17:46:33 2011 +0100 OMAP3: hwmod data: Remove masters port links for interconnects. Master ports from interconnect are generating some annoying circular references that become tricky to handle if we have to dynamically remove some IP on some variant platforms. Since they are not used for the moment, and since we can still build that relation using the reverse relation (slave port from the IP toward master port of the interconnect), let remove them for the moment like it is done on OMAP4. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Cc: Sanjeev Premi commit 26525618863afcc4aab8b2a83451d37c6f513460 Author: Lars Ellenberg Date: Fri Nov 5 09:56:33 2010 +0100 drbd: only reset online-verify start sector if verify completed For network hickups during online-verify, on the next verify triggered, we by default want to resume where it left off. After any replication link interruption, there will be a (possibly empty) resync. Do not reset online-verify start sector if some resync completed, that would defeats the purpose. Only reset the start sector once a verify run is completed. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg commit 0590a790319e2de59e0f15cf00af7fe473eb9ec8 Author: Shawn Guo Date: Tue Mar 8 18:51:10 2011 +0800 ARM: mxs/mx28evk: add framebuffer device Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 12b90f8a2ce4d913d9080dcd6b6c329db00cbbeb Author: Shawn Guo Date: Tue Mar 8 18:51:09 2011 +0800 ARM: mx28: set proper parent for lcdif clock Most likely, the LCD panel on mx28 platform will require a pixel clock higher than ref_xtal_clk (24 MHz), so the patch initializes the parent of lcdif clock as ref_pix_clk. Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 29772c4e28cbb33ea1f8c6dcd130ebf190b91d85 Author: Linus Walleij Date: Thu Feb 24 13:21:36 2011 +0100 ARM: 6764/1: pl011: factor out FIFO to TTY code This piece of code was just slightly different between the DMA and IRQ paths, in DMA mode we surely shouldn't read more than 256 character either, so factor this out in its own function and use for both DMA and PIO mode. Tested on Ux500 and U300. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit ead76f329f777c7301e0a5456a0a1c7a081570bd Author: Linus Walleij Date: Thu Feb 24 13:21:08 2011 +0100 ARM: 6763/1: pl011: add optional RX DMA to PL011 v2 This adds an optional RX DMA codepath for the devices that support this by using the apropriate burst sizes instead of pulling single bytes. Includes portions of code written by Russell King during a PL08x hacking session. This has been tested on U300 and Ux500. Tested-by: Jerzy Kasenberg Tested-by: Grzegorz Sygieda Tested-by: Marcin Mielczarczyk Signed-off-by: Per Forlin Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 6fa85e5ce311a8c57fe32cb6403961f7a897112d Author: Stepan Moskovchenko Date: Thu Mar 10 05:12:25 2011 +0100 ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode Use the correct I/O address definitions for Footbridge peripherals when the kernel is compiled without MMU support. Signed-off-by: Stepan Moskovchenko Signed-off-by: Russell King commit b9ccf8afe2d2eafe18f90d2925f8464313fe0b56 Author: Benoit Cousson Date: Thu Mar 10 10:53:15 2011 +0100 OMAP3: hwmod data: Fix incorrect SmartReflex -> L4 CORE interconnect links Commit d34427267186827dfd62bd8cf726601fffb22534 ("OMAP3: PM: Adding smartreflex hwmod data") added data that claims that the L4 CORE has two slave interfaces that originate from the SmartReflex modules, omap3_l4_core__sr1 and omap3_l4_core__sr2. But as those two data structure records show, it's L4 CORE that has a master port towards SR1 and SR2. Move the incorrect data from slaves list to master list. Based on a path by Paul Walmsley https://patchwork.kernel.org/patch/623171/ That is based on a patch by Benoît Cousson : https://patchwork.kernel.org/patch/590561/ Signed-off-by: Paul Walmsley Signed-off-by: Benoît Cousson Cc: Sanjeev Premi Cc: Thara Gopinath commit 7d85d61f6ad6e2d6a14b5c20369bc9569f634855 Author: Stephen Boyd Date: Thu Mar 10 05:15:00 2011 +0100 ARM: 6797/1: hw_breakpoint: Fix newlines in WARNings These warnings are missing newlines and spaces causing confusing looking output when they trigger. Acked-by: Will Deacon Signed-off-by: Stephen Boyd Signed-off-by: Russell King commit c5908939b2738bafe1b309bc2465cb9f2e6184c5 Author: Matt Carlson Date: Wed Mar 9 16:58:25 2011 +0000 tg3: Remove 5750 PCI code The 5750 ASIC rev was never released as a PCI device. It only exists as a PCIe device. This patch removes the code that supports the former configuration. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit e256f8a35179f3795a200912b79c369676ecb669 Author: Matt Carlson Date: Wed Mar 9 16:58:24 2011 +0000 tg3: Move tg3_init_link_config to tg3_phy_probe This patch moves the function that initializes the link configuration closer to the place where the rest of the phy code is initialized. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 683644b74783725971e5ff61618bd932c5361c3f Author: Matt Carlson Date: Wed Mar 9 16:58:23 2011 +0000 tg3: Refine VAux decision process In the near future, the VAux switching decision process is going to get more complicated. This patch refines and consolidates the existing algorithm in anticipation of the new scheme. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 4143470c10ab5c2bbd0522efe92935416332c5e8 Author: Matt Carlson Date: Wed Mar 9 16:58:22 2011 +0000 tg3: cleanup pci device table vars Commit 895950c2a6565d9eefda4a38b00fa28537e39fcb, entitled "tg3: Use DEFINE_PCI_DEVICE_TABLE" moved two pci device tables into the global address space, but didn't declare them static and didn't prefix them with "tg3_". This patch fixes those problems. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit d4894f3ea7375dd9492b5d3d2ecb0b6e4bdb604e Author: Matt Carlson Date: Wed Mar 9 16:58:21 2011 +0000 tg3: Add code to verify RODATA checksum of VPD This patch adds code to verify the checksum stored in the "RV" info keyword of the RODATA VPD section. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 01c3a3920f9f78866420b2004602944fca45083a Author: Matt Carlson Date: Wed Mar 9 16:58:20 2011 +0000 tg3: Fix NVRAM selftest The tg3 NVRAM selftest actually fails when validating the checksum of the legacy NVRAM format. However, the test still reported success because the last update of the return code was a success from the NVRAM reads. This patch fixes the code so that the error return code defaults to a failure status. Then the patch fixes the reason why the checsum validation failed. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit bb18bb942a31411954021ad036ca7bace642c3c0 Author: Matt Carlson Date: Wed Mar 9 16:58:19 2011 +0000 tg3: Add missed 5719 workaround change Commit 2866d956fe0ad8fc8d8a7c54104ccc879b49406d, entitled "tg3: Expand 5719 workaround" extended a 5719 A0 workaround to all revisions of the chip. There was a change that should have been a part of that patch that was missed. This patch adds the missing piece. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit caa66ce9055d15fb319075ebcf30fbc666b41665 Author: Michal Simek Date: Thu Mar 10 10:39:51 2011 +0100 microblaze: Fix circular headers dependency when ftrace is enabled. Remove compilation failure when ftrace in enabled. Error log: CC kernel/trace/power-traces.o In file included from arch/microblaze/include/asm/irq.h:15, from include/linux/irq.h:27, from include/asm-generic/hardirq.h:12, from arch/microblaze/include/asm/hardirq.h:15, from include/linux/hardirq.h:7, from include/linux/ftrace_event.h:7, from include/trace/ftrace.h:19, from include/trace/define_trace.h:96, from include/trace/events/power.h:240, from kernel/trace/power-traces.c:14: include/linux/interrupt.h: In function '__raise_softirq_irqoff': include/linux/interrupt.h:413: error: implicit declaration of function 'trace_softirq_raise' In file included from include/trace/ftrace.h:554, from include/trace/define_trace.h:96, from include/trace/events/power.h:240, from kernel/trace/power-traces.c:14: include/trace/events/irq.h: In function 'ftrace_test_probe_irq_handler_entry': include/trace/events/irq.h:37: error: implicit declaration of function 'check_trace_callback_type_irq_handler_entry' include/trace/events/irq.h: In function 'ftrace_test_probe_irq_handler_exit': include/trace/events/irq.h:67: error: implicit declaration of function 'check_trace_callback_type_irq_handler_exit' include/trace/events/irq.h: In function 'ftrace_test_probe_softirq_entry': include/trace/events/irq.h:112: error: implicit declaration of function 'check_trace_callback_type_softirq_entry' include/trace/events/irq.h: In function 'ftrace_test_probe_softirq_exit': include/trace/events/irq.h:126: error: implicit declaration of function 'check_trace_callback_type_softirq_exit' include/trace/events/irq.h: In function 'ftrace_test_probe_softirq_raise': include/trace/events/irq.h:140: error: implicit declaration of function 'check_trace_callback_type_softirq_raise' make[5]: *** [kernel/trace/power-traces.o] Error 1 make[4]: *** [kernel/trace] Error 2 make[3]: *** [kernel] Error 2 Suggested-by: Steven Rostedt Signed-off-by: Michal Simek commit a252bebe22155313ccdadc20b79f67a239dc9ecb Author: Stephen Hemminger Date: Thu Mar 10 00:40:17 2011 -0800 tcp: mark tcp_congestion_ops read_mostly Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4d3cf1bc557dc8b88e1cabf1980b3baa3380a641 Author: Jiro SEKIBA Date: Thu Mar 10 16:54:15 2011 +0900 nilfs2: move NILFS_SUPER_MAGIC to linux/magic.h move NILFS_SUPER_MAGIC macro to linux/magic.h from linux/nilfs2_fs.h in the same manner as other filesystem magic number defined in the file. Signed-off-by: Jiro SEKIBA Signed-off-by: Ryusuke Konishi commit 4c63f5646e405b5010cc9499419060bf2e838f5b Merge: cafb0bf 69d60eb Author: Jens Axboe Date: Thu Mar 10 08:58:35 2011 +0100 Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core Conflicts: block/blk-core.c block/blk-flush.c drivers/md/raid1.c drivers/md/raid10.c drivers/md/raid5.c fs/nilfs2/btnode.c fs/nilfs2/mdt.c Signed-off-by: Jens Axboe commit 69d60eb96ae8a73cf9b79cf28051caf973006011 Author: Vivek Goyal Date: Wed Mar 9 08:27:37 2011 +0100 blk-throttle: Use blk_plug in throttle dispatch Use plug in throttle dispatch also as we are dispatching a bunch of bios in throttle context and some of them might merge. Signed-off-by: Vivek Goyal Signed-off-by: Jens Axboe commit 721a9602e6607417c6bc15b18e97a2f35266c690 Author: Jens Axboe Date: Wed Mar 9 11:56:30 2011 +0100 block: kill off REQ_UNPLUG With the plugging now being explicitly controlled by the submitter, callers need not pass down unplugging hints to the block layer. If they want to unplug, it's because they manually plugged on their own - in which case, they should just unplug at will. Signed-off-by: Jens Axboe commit cf15900e1209d5b46ec2d24643adbf561830935f Author: Jens Axboe Date: Wed Mar 2 20:12:18 2011 -0500 aio: remove request submission batching This should be useless now that we have on-stack plugging. So lets just kill it. Signed-off-by: Jens Axboe commit 9f5b9425468c85a901d863d241ba5c5dff9b23b8 Author: Shaohua Li Date: Thu Jul 1 07:55:01 2010 +0200 fs: make aio plug Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit 2ed1a6bcf97a7ed787e6799bf2e80b9e6f51dca7 Author: Jens Axboe Date: Tue Jun 22 12:52:14 2010 +0200 fs: make mpage read/write_pages() plug Signed-off-by: Jens Axboe commit 5b417b1873694ece3291d7f64a943304559a817b Author: Jens Axboe Date: Mon Apr 19 10:04:38 2010 +0200 read-ahead: use plugging Signed-off-by: Jens Axboe commit 55602dd66f5353981b53f734e26c307f310ced37 Author: Jens Axboe Date: Thu Jun 24 15:05:37 2010 +0200 fs: make generic file read/write functions plug Signed-off-by: Jens Axboe commit 7eaceaccab5f40bbfda044629a6298616aeaed50 Author: Jens Axboe Date: Thu Mar 10 08:52:07 2011 +0100 block: remove per-queue plugging Code has been converted over to the new explicit on-stack plugging, and delay users have been converted to use the new API for that. So lets kill off the old plugging along with aops->sync_page(). Signed-off-by: Jens Axboe commit 73c101011926c5832e6e141682180c4debe2cf45 Author: Jens Axboe Date: Tue Mar 8 13:19:51 2011 +0100 block: initial patch for on-stack per-task plugging This patch adds support for creating a queuing context outside of the queue itself. This enables us to batch up pieces of IO before grabbing the block device queue lock and submitting them to the IO scheduler. The context is created on the stack of the process and assigned in the task structure, so that we can auto-unplug it if we hit a schedule event. The current queue plugging happens implicitly if IO is submitted to an empty device, yet callers have to remember to unplug that IO when they are going to wait for it. This is an ugly API and has caused bugs in the past. Additionally, it requires hacks in the vm (->sync_page() callback) to handle that logic. By switching to an explicit plugging scheme we make the API a lot nicer and can get rid of the ->sync_page() hack in the vm. Signed-off-by: Jens Axboe commit a488e74976bf0a9bccecdd094378394942dacef1 Author: Jens Axboe Date: Fri Apr 16 21:13:15 2010 +0200 scsi: convert to blk_delay_queue() It was always abuse to reuse the plugging infrastructure for this, convert it to the (new) real API for delaying queueing a bit. A default delay of 3 msec is defined, to match the previous behaviour. Signed-off-by: Jens Axboe commit 0a41e90bb7c931fd53d73ea770f5b251af6c91ce Author: Jens Axboe Date: Fri Apr 16 21:11:21 2010 +0200 ide-cd: convert to blk_delay_queue() for a short pause It was always abuse to reuse the plugging infrastructure for this, convert it to the (new) real API for delaying queueing a bit. Signed-off-by: Jens Axboe Acked-by: David S. Miller commit 3cca6dc1c81e2407928dc4c6105252146fd3924f Author: Jens Axboe Date: Wed Mar 2 11:08:00 2011 -0500 block: add API for delaying work/request_fn a little bit Currently we use plugging for that, but as plugging is going away, we need an alternative mechanism. Signed-off-by: Jens Axboe commit bbd5a762b4c56609ad4c501298556ab1f00710cc Author: Konrad Rzeszutek Wilk Date: Mon Mar 7 15:03:58 2011 -0500 xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line. This fixes a particular nasty racing problem found when using Xen hypervisor with the console (hvc) output being routed to the serial port and the serial port receiving data when probe_irq_off(probe_irq_on) is running. Specifically the bug manifests itself with: [ 4.470693] BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 [ 4.470693] IP: [] handle_IRQ_event+0xe/0xc9 ..snip.. [ 4.470693] Call Trace: [ 4.470693] [ 4.470693] [] handle_percpu_irq+0x3c/0x69 [ 4.470693] [] __xen_evtchn_do_upcall+0xfd/0x195 [ 4.470693] [] ? xen_restore_fl_direct_end+0x0/0x1 [ 4.470693] [] xen_evtchn_do_upcall+0x32/0x47 [ 4.470693] [] xen_do_hypervisor_callback+0x1e/0x30 [ 4.470693] [ 4.470693] [] ? hypercall_page+0x22a/0x1000 [ 4.470693] [] ? hypercall_page+0x22a/0x1000 [ 4.470693] [] ? xen_force_evtchn_callback+0xd/0xf [ 4.470693] [] ? check_events+0x12/0x20 [ 4.470693] [] ? xen_irq_enable_direct_end+0x0/0x7 [ 4.470693] [] ? probe_irq_on+0x8f/0x1d7 [ 4.470693] [] ? serial8250_config_port+0x7b7/0x9e6 [ 4.470693] [] ? uart_add_one_port+0x11b/0x305 The bug is trigged by three actors working together: A). serial_8250_config_port calling probe_irq_off(probe_irq_on()) wherein all of the IRQ handlers are being started and shut off. The functions utilize the sleep functions so the minimum time they are run is 120 msec. B). Xen hypervisor receiving on the serial line any character and setting the bits in the event channel - during this 120 msec timeframe. C). The hvc API makes a call to 'request_irq' (and hence setting desc->action to a valid value), much much later - when user space opens /dev/console (hvc_open). To make the console usable during bootup, the Xen HVC implementation sets the IRQ chip (and correspondingly the event channel) much earlier. The IRQ chip handler that is used is the handle_percpu_irq (aaca49642b92c8a57d3ca5029a5a94019c7af69f) Back to the issue. When A) is being called it ends up calling the xen_percpu_chip's chip->startup twice and chip->shutdown once. Those are set to the default_startup and mask_irq (events.c) respectivly. If (and this seems to depend on what serial concentrator you use), B) gets data from the serial port it sets in the event channel a pending bit. When A) calls chip->startup(), the masking of the pending bit, and unmasking of the event channel mask, and also setting of the upcall_pending flag is done (since there is data present on the event channel). If before the 120 msec has elapsed, any IRQ handler (Xen IRQ has one IRQ handler, which checks the event channels bitmap to figure which one to call) is called we end up calling the handle_percpu_irq. The handle_percpu_irq calls desc->action (which is NULL) and we blow up. Caveats: I could only reproduce this on 2.6.32 pvops. I am not sure why this is not showing up on 2.6.38 kernel. The probe_irq_on/off has code to disable poking specific IRQ lines. This is done by using the set_irq_noprobe() and then we do not have to worry about the handle_percpu_irq being called before the IRQ action handler has been installed. Signed-off-by: Konrad Rzeszutek Wilk commit cc7e17ea0427a5df319e43606a3d6c53b13a6e9c Author: David S. Miller Date: Wed Mar 9 20:57:50 2011 -0800 ipv4: Optimize flow initialization in fib_validate_source(). Like in commit 44713b67db10c774f14280c129b0d5fd13c70cf2 ("ipv4: Optimize flow initialization in output route lookup." we can optimize the on-stack flow setup to only initialize the members which are actually used. Otherwise we bzero the entire structure, then initialize explicitly the first half of it. Signed-off-by: David S. Miller commit 67e28ffd864eebbaf48b404d0a8cb4edd2bdc924 Author: David S. Miller Date: Wed Mar 9 20:42:07 2011 -0800 ipv4: Optimize flow initialization in input route lookup. Like in commit 44713b67db10c774f14280c129b0d5fd13c70cf2 ("ipv4: Optimize flow initialization in output route lookup." we can optimize the on-stack flow setup to only initialize the members which are actually used. Otherwise we bzero the entire structure, then initialize explicitly the first half of it. Signed-off-by: David S. Miller commit 352b5d13c0684ba8cd103aa20cb74f105334562a Author: J. Bruce Fields Date: Wed Mar 9 22:40:30 2011 -0500 svcrpc: fix bad argument in unix_domain_find "After merging the nfsd tree, today's linux-next build (powerpc ppc64_defconfig) produced this warning: net/sunrpc/svcauth_unix.c: In function 'unix_domain_find': net/sunrpc/svcauth_unix.c:58: warning: passing argument 1 of +'svcauth_unix_domain_release' from incompatible pointer type net/sunrpc/svcauth_unix.c:41: note: expected 'struct auth_domain *' but argument +is of type 'struct unix_domain *' Introduced by commit 8b3e07ac908d ("svcrpc: fix rare race on unix_domain creation")." Reported-by: Stephen Rothwell Signed-off-by: J. Bruce Fields commit 692ab1f36b714250a9669e10e5acceba72707956 Author: Paul Walmsley Date: Wed Mar 9 18:44:28 2011 -0700 MAINTAINERS: add entry for OMAP powerdomain/clockdomain per-SoC layer support Add Rajendra Nayak and myself as maintainers for the OMAP powerdomain/clockdomain per-SoC layer code. Signed-off-by: Rajendra Nayak Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley Signed-off-by: Benoît Cousson Signed-off-by: Tony Lindgren commit b481cea34bb41f3731567c8c1be0625bf80d20b7 Author: Felipe Balbi Date: Wed Mar 9 18:44:28 2011 -0700 OMAP: clock: fix compile warning if building kernels without OMAP2 support, we will see a warning such as: arch/arm/mach-omap2/io.c: In function 'omap2_init_common_infrastructure': arch/arm/mach-omap2/io.c:389:3: warning: statement with no effect arch/arm/mach-omap2/io.c:391:3: warning: statement with no effect Signed-off-by: Felipe Balbi Signed-off-by: Paul Walmsley commit 38eaeb0fd8819dce424a61579500bd9987d5c930 Author: Ian Campbell Date: Tue Mar 8 16:56:43 2011 +0000 xen: gntdev: fix build warning addr is actually a virtual address so use an unsigned long. Fixes: CC drivers/xen/gntdev.o drivers/xen/gntdev.c: In function 'map_grant_pages': drivers/xen/gntdev.c:268: warning: cast from pointer to integer of different size Reduce the scope of the variable at the same time. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit dc4972a4e2f3fee1663bd0670dfc4cd798d5f9b2 Author: Ian Campbell Date: Fri Mar 4 17:38:21 2011 +0000 xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override The caller will not undo a mapping which failed and therefore the override will not be removed. This is especially bad in the case of GNTMAP_contains_pte mapping type mappings where m2p_add_override will destroy the kernel mapping of the page. This was observed via a failure of map_grant_pages in gntdev_mmap (due to userspace using a bad grant reference), which left the page in question unmapped (because it was a GNTMAP_contains_pte mapping) which led to a crash later on. Signed-off-by: Ian Campbell Cc: Daniel De Graaf Cc: Stefano Stabellini Cc: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit b1ace38094c4926255343a81faba8fb4faf59a45 Author: Anand S Sawant Date: Thu Feb 17 21:27:30 2011 +0530 OMAP2+: smartreflex: remove SR debug directory in omap_sr_remove() omap_sr_probe() creates the smartreflex debug directory and its underlying nvalue debug directory. These directories are removed in omap_sr_remove(). Basic smartreflex functionality tested on OMAP3630 Zoom3 & OMAP4430 SDP Signed-off-by: Anand S Sawant Signed-off-by: Kevin Hilman commit dd31394779aa288eb6b9c42672ffcb6d05d6c414 Author: Dave Martin Date: Fri Mar 4 15:33:57 2011 +0000 ARM: omap3: Thumb-2 compatibility for sleep34xx.S * Build unconditionally as ARM for correct interoperation with OMAP firmware. * Fix an out-of-range ADR when building for ARM. * Remove deprecated PC-relative stores. * Add the required ENDPROC() directive for each ENTRY(). * .align before data words. * Handle non-interworking return from v7_flush_dcache_all. Signed-off-by: Dave Martin Signed-off-by: Kevin Hilman commit ef7a87d34064eb87866d02547ee67060e5e49eb9 Author: Dave Martin Date: Fri Mar 4 15:33:56 2011 +0000 ARM: omap3: Thumb-2 compatibility for sram34xx.S * Build unconditionally as ARM for correct interoperation with OMAP firmware. * Remove deprecated PC-relative stores * Add the required ENDPROC() directive for each ENTRY(). * .align before data words Signed-off-by: Dave Martin Tested-by: Jean Pihet Signed-off-by: Kevin Hilman commit 76d500182061dcc7508e6b829af097348fa7d804 Author: Dave Martin Date: Fri Mar 4 15:33:55 2011 +0000 ARM: omap3: Remove hand-encoded SMC instructions For various reasons, Linux now only officially supports being built with tools which are new enough to understand the SMC instruction. Replacing the hand-encoded instructions when the mnemonic also allows for correct assembly in Thumb-2 (otherwise, the result is random data in the middle of the code). The Makefile already ensures that this file is built with a high enough gcc -march= flag (armv7-a). Signed-off-by: Dave Martin Tested-by: Santosh Shilimkar Tested-by: Jean Pihet Signed-off-by: Kevin Hilman commit f96bdfa0d036393741fce303ea98abb44452d042 Author: Dave Martin Date: Fri Mar 4 15:33:54 2011 +0000 ARM: omap4: Convert END() to ENDPROC() for correct linkage with CONFIG_THUMB2_KERNEL Code marked with ENTRY() also needs a matching ENDPROC() directive, in order to ensure that the type and instruction set of the symbol are correctly annotated. ENDPROC() tags the affected symbol as a function symbol, which will ensure that link-time fixups don't accidentally switch to the wrong instruction set. Signed-off-by: Dave Martin Tested-by: Santosh Shilimkar Acked-by: Santosh Shilimkar Signed-off-by: Kevin Hilman commit 85243a762457f7891ae525df39ad44323b3eeea6 Author: Dave Martin Date: Fri Mar 4 15:33:53 2011 +0000 ARM: omap4: Provide do_wfi() for Thumb-2 For CONFIG_THUMB2_KERNEL, the existing definition of do_wfi() will insert invalid code into the instruction stream. Any assembler which can assemble Thumb-2 is guaranteed to accept the "wfi" mnemonic, so for the Thumb-2 case, just use the mnemonic. The ARM case is left as-is. Signed-off-by: Dave Martin Signed-off-by: Kevin Hilman commit 2de0baefaa7f2fad221bba6049e389e39990e2f0 Author: Sanjeev Premi Date: Fri Feb 25 18:57:20 2011 +0530 OMAP3: PM: Initialize IVA only if available IVA device is not present in many OMAP3 variants. This patch ensures that initialization is tied to the presence of IVA on the device. Signed-off-by: Sanjeev Premi Signed-off-by: Kevin Hilman commit 4071318983ff2dead7fd2caf85498bcd8956d93e Author: Thara Gopinath Date: Tue Feb 15 13:28:58 2011 +0530 OMAP3: PM: Set/clear T2 bit for Smartreflex on TWL Voltage control on TWL can be done using VMODE/I2C1/I2C_SR. Since almost all platforms use I2C_SR on omap3, omap3_twl_init by default expects that OMAP's I2C_SR is plugged in to TWL's I2C and calls omap3_twl_set_sr_bit. On platforms where I2C_SR is not connected, the board files are expected to call omap3_twl_set_sr_bit(false) to ensure that I2C_SR path is not set for voltage control and prevent the default behavior of omap3_twl_init. Signed-off-by: Nishanth Menon Signed-off-by: Thara Gopinath Signed-off-by: Shweta Gulati Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kevin Hilman commit 8c5ca4d29bf44eb4eb004683ca745742040c7486 Author: Santosh Shilimkar Date: Fri Feb 11 20:42:12 2011 +0530 omap3: cpuidle: Add description field to each C-state. Add a description field to each idle C-state. This helps to give better data with PowerTop and one don't have to refer to the code to link what Cx means from system point of view while analysing PowerTop data. No functional change. Signed-off-by: Santosh Shilimkar Cc: Kevin Hilman Signed-off-by: Kevin Hilman commit 261bfb286eab32aa6129f48d2b2d24f20825757b Author: Santosh Shilimkar Date: Fri Feb 11 20:42:11 2011 +0530 omap3: pm: Use exported set_cr() instead of a custom one. Remove the custom restore_control_register() and use the exported set_cr() instead to set the system control register(SCTRL) value. No functional change. Signed-off-by: Santosh Shilimkar Cc: Kevin Hilman Signed-off-by: Kevin Hilman commit 51d070afd6f927752c76a0cc537c73737578bb93 Author: Paul Walmsley Date: Thu Jan 27 02:52:55 2011 -0700 OMAP2/3: PM: remove unnecessary wakeup/sleep dependency clear The OMAP2 and OMAP3 PM code clears clockdomain wakeup and sleep dependencies. This is unnecessary after commit 6f7f63cc9adf3192e6fcac4e8bed5cc10fd924aa ("OMAP clockdomain: initialize clockdomain registers when the clockdomain layer starts") which clears these dependencies during clockdomain init. Signed-off-by: Paul Walmsley Signed-off-by: Kevin Hilman commit df93bd76b61639fe9093ccbfc5d1a4bfb744ec47 Author: Kevin Hilman Date: Fri Jan 21 14:30:15 2011 -0800 OMAP2+: remove unused UART base addresses from omap_globals Now that omap_hwmod + omap_device is used for OMAP UART device and driver code, we no longer need the UART physical addresses in omap_globals. Note that the #defines for the base addresses are still left in since they are used by DEBUG_LL and uncompress code. Build tested for OMAP1 (omap1_defconfig) and OMAP2+ (omap2plus_defconfig) Signed-off-by: Kevin Hilman commit 5c56f32e80ac8ea9878a0a5eb9ca99c703e953ab Author: Vasiliy Kulikov Date: Wed Jan 19 15:57:22 2011 +0300 OMAP: PM: SmartReflex: fix potential NULL dereference kzalloc() may fail, if so return -ENOMEM. Also Walter Harms suggested to use kasprintf() instead of kzalloc+strcpy+strcat. Signed-off-by: Vasiliy Kulikov Signed-off-by: Kevin Hilman commit 8743410d4971c5510a7d09293f5f3f89d8081059 Author: Nishanth Menon Date: Fri Jan 7 09:41:13 2011 -0600 OMAP3: beagle xm: enable up to 800MHz OPP OMP3630 silicon can enable higher frequencies only depending on the board characteristics meeting the recommended standards, and has to be selectively toggled. Beagle XM uses 3730 variant and the board design allows enabling 800MHz and 1GHz OPPs. However, We need Smart reflex class 1.5 and ABB to enable 1GHz safely. For the moment, we tweak the default table to allow for 800Mhz OPP usage. Reported-by: Koen Kooi Tested-by: Koen Kooi Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit eb05ead90ddb2a4e51d34f6c25f01c2e0653da59 Author: Menon, Nishanth Date: Wed Jan 5 20:49:35 2011 +0000 OMAP3|4: OPP: make omapx_opp_init non-static omap3 and omap4 opp_init should be made non-static to allow for platform specific opp table tweaking. making these static conflicts with the definition in pm.h(global) as well. we include pm.h as well to ensure that there are no such prototype conflicts with actual implementation in the future. Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit e16b41bfd5efaa1f9521449f1f0e341ebec73398 Author: Ricardo Salveti de Araujo Date: Mon Jan 31 11:35:25 2011 -0200 OMAP3630: PM: don't warn the user with a trace in case of PM34XX_ERRATUM In case in user has a OMAP3630 < ES1.2 the kernel should warn the user about the ERRATUM, but using pr_warn instead of WARN_ON is already enough, as there is nothing else the user can do besides changing the board. Signed-off-by: Ricardo Salveti de Araujo Signed-off-by: Kevin Hilman commit 126f7e2992760028005ce94509ce54d331c6714d Author: Kevin Hilman Date: Tue Jan 4 15:33:08 2011 -0800 MAINTAINERS: update Kevin's email for OMAP PM section Change my email to TI email address for OMAP PM maintenance. Signed-off-by: Kevin Hilman commit c1605f2e3312ca149caf32129e0b25b1e7296f36 Author: Pavan Savoy Date: Wed Mar 2 03:59:56 2011 -0600 drivers:misc: ti-st: fix debugging code debug code in TI-ST driver can be enabled by #defining DEBUG in the first line of the code and in case debugfs is mounted, the 2 entries in /sys/kernel/debug/ti-st/ will also provide useful information. These 2 were broken because of the recent changes to the parsing logic and the registration mechanism of the protocol drivers, this patch fixes them. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit 17b9f9e2653a2eae3b7e1bb8a1f7f80f6edc3fe3 Author: Lennert Buytenhek Date: Mon Mar 7 14:00:23 2011 +0000 powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED. Signed-off-by: Lennert Buytenhek Acked-by: Grant Likely Signed-off-by: Benjamin Herrenschmidt commit e11802872db82417e51e1bbe0751dbb21842d713 Author: Lennert Buytenhek Date: Mon Mar 7 14:00:20 2011 +0000 powerpc: core irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 73909af7367a4daf2395846e776e0b326bd4e23b Author: Lennert Buytenhek Date: Tue Mar 8 22:27:07 2011 +0000 powerpc: sysdev/xilinx_intc irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 42a07ae29a996b55e715a929786c12afc604d7c7 Author: Lennert Buytenhek Date: Tue Mar 8 22:27:02 2011 +0000 powerpc: sysdev/uic irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 11afe2bd8b8fd74dafe777eeb6d302d265b7b244 Author: Lennert Buytenhek Date: Mon Mar 7 14:00:12 2011 +0000 powerpc: sysdev/tsi108_pci irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 3a0adfab4a9773e70b5448a9dbc785a48d12d713 Author: Lennert Buytenhek Date: Tue Mar 8 22:27:00 2011 +0000 powerpc: sysdev/qe_lib/qe_ic irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 41f3863bb050ba881aac6cc7be28fc0602cb629a Author: Lennert Buytenhek Date: Mon Mar 7 14:00:06 2011 +0000 powerpc: sysdev/mv64x60_pic irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 94347cb34983f9862477776d0c169607c4434f2b Author: Lennert Buytenhek Date: Tue Mar 8 22:26:58 2011 +0000 powerpc: sysdev/mpc8xxx_gpio irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit febd40178782e47b33f261f4e135418e24d8420a Author: Lennert Buytenhek Date: Mon Mar 7 14:00:00 2011 +0000 powerpc: sysdev/mpc8xx_pic irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 687228ad404400c040e52d36ecfda42a1d392ead Author: Lennert Buytenhek Date: Mon Mar 7 13:59:58 2011 +0000 powerpc: sysdev/ipic irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit d4201184347018afcb61d113c3831d04572cf9c7 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:56 2011 +0000 powerpc: sysdev/i8259 irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 37e166151d6e0bc401d1d83e7006ecd308f352b6 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:54 2011 +0000 powerpc: sysdev/fsl_msi irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit c47eefa660ff2a2fc754791092d806afb433a528 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:51 2011 +0000 powerpc: sysdev/cpm2_pic irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit a2073d54a9e7e83c12bf6e448b2a2953c47aff9c Author: Lennert Buytenhek Date: Mon Mar 7 13:59:49 2011 +0000 powerpc: sysdev/cpm1 irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 79f26c268ebad29bd75d078cfc09d3d82b30ccbd Author: Lennert Buytenhek Date: Mon Mar 7 13:59:45 2011 +0000 powerpc: platforms/pseries irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 8126708ae8f2bb7cf98a38ca89b5cfd96d897a05 Author: Lennert Buytenhek Date: Tue Mar 8 22:26:56 2011 +0000 powerpc: platforms/ps3 irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit d8c94aca574b16b837db9441ee4643cd329b2036 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:40 2011 +0000 powerpc: platforms/powermac irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 8f312ecf44ce585e64835b591e7c2b4e22352f17 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:36 2011 +0000 powerpc: platforms/iseries irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 0bf8878e337a12d33649443a52e3b07a0a805a09 Author: Lennert Buytenhek Date: Tue Mar 8 22:26:53 2011 +0000 powerpc: platforms/embedded6xx irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 468eb1ad9afa6c470d5e7881c20bdaf3d1a20c8a Author: Lennert Buytenhek Date: Mon Mar 7 13:59:31 2011 +0000 powerpc: platforms/chrp irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit d1ae63d4d3e49fd69183cfd92bde4c412aa9eda6 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:28 2011 +0000 powerpc: platforms/cell irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit cfe4a109940db985b567105bb8f25ebebf953370 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:25 2011 +0000 powerpc: platforms/8xx irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 5b250889b33bcf06d0d200dbd18d0a3aa5af6ca3 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:23 2011 +0000 powerpc: platforms/86xx irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 712d5d799a0e099437fc4dd42058a33d4fc37882 Author: Lennert Buytenhek Date: Mon Mar 7 13:59:19 2011 +0000 powerpc: platforms/85xx irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit e4891eb0ee3e35e9c3b4125b93a45d7901a82e57 Author: Lennert Buytenhek Date: Tue Mar 8 22:26:50 2011 +0000 powerpc: platforms/82xx irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 8a2df7a0390ad7f02b10a66ede632bc9eee08876 Author: Lennert Buytenhek Date: Tue Mar 8 22:26:47 2011 +0000 powerpc: platforms/52xx irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 0eb31577a755c3ed4c4182c2bf93c5618c60f13f Author: Lennert Buytenhek Date: Mon Mar 7 13:59:11 2011 +0000 powerpc: platforms/512x irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 835c0553eb151588b6a1b52b28ecbbd59f7ff052 Author: Lennert Buytenhek Date: Tue Mar 8 22:26:43 2011 +0000 powerpc: mpic irq_data conversion. Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit e0cc8a60c4f9352c8281af6eb49f13cf5a7bb476 Author: Aaro Koskinen Date: Tue Mar 8 22:16:20 2011 +0200 staging: xgifb: vb_init: make internal functions static Make some internal functions static. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 2b9edd38230ba99f7faeebf69400cfa612642695 Author: Aaro Koskinen Date: Tue Mar 8 22:16:19 2011 +0200 staging: xgifb: vb_init: delete unused functions Delete unused functions. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 81018f0038269d6957b6cfd0f5d454b48f5369f2 Author: Aaro Koskinen Date: Tue Mar 8 22:16:18 2011 +0200 staging: xgifb: vb_init: delete redundant declarations Delete redundant declarations. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 3d5375f470ae9a156f2a40a74f81a28122937da8 Author: Aaro Koskinen Date: Tue Mar 8 22:16:17 2011 +0200 staging: xgifb: vb_ext: make internal functions static Make internal functions static. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit f4dccca54ac8b848fe45a807aac2518bed080458 Author: Aaro Koskinen Date: Tue Mar 8 22:16:16 2011 +0200 staging: xgifb: vb_ext: delete unused functions Delete unused functions. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit eb51a917028351db1174d5f9b43a53e62983fc19 Author: Aaro Koskinen Date: Tue Mar 8 22:16:15 2011 +0200 staging: xgifb: vb_ext: delete redundant declarations Delete redundant declarations. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 5e60b97cb1206c95b0acab61e8f107e943b31b62 Author: Aaro Koskinen Date: Tue Mar 8 22:16:14 2011 +0200 staging: xgifb: vb_setmode: include the .h file Include the file's .h file and delete the duplicate declarations from the .c file. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 063b9c4b89eac6f6c0b3b40594f48dbac14dd2f8 Author: Aaro Koskinen Date: Tue Mar 8 22:16:13 2011 +0200 staging: xgifb: vb_setmode: make internal functions static Make internal functions static and remove unneeded forward declarations. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 95befb581897a37592a19613859072edf6647be8 Author: Aaro Koskinen Date: Tue Mar 8 22:16:12 2011 +0200 staging: xgifb: delete nomax module parameter The parameter is not used. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit dbbc2989a78872922601791983762c207a60f38c Author: Aaro Koskinen Date: Tue Mar 8 22:16:11 2011 +0200 staging: xgifb: delete bIntegratedMMEnabled bIntegratedMMEnabled is always true, so the field and checks can be eliminated. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 600a710b8bb414903a8b7c28e22ca03a60b8191f Author: Aaro Koskinen Date: Tue Mar 8 22:16:10 2011 +0200 staging: xgifb: delete bSkipSense bSkipSense is always false, thus redundant. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 66c2458c7943c29a2221896c213ec1d244c64ded Author: Aaro Koskinen Date: Tue Mar 8 22:16:09 2011 +0200 staging: xgifb: delete unused fields from xgi_hw_device_info Delete unused fields from xgi_hw_device_info. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 3259bb5a1384c58935f8d95f1dbbab7f51b17e25 Author: Aaro Koskinen Date: Tue Mar 8 22:16:08 2011 +0200 staging: xgifb: delete offscreen memory management The offscreen memory area currently conflicts with the video memory exported to the framebuffer layer. The driver does not utilize offscreen memory, so the functionality can be deleted. The patch also eliminates the one last memory leak when the driver is unloaded. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 83a8c24162c2abe158cb6eec4b29a8d8bf0c736c Author: Aaro Koskinen Date: Tue Mar 8 22:16:07 2011 +0200 staging: xgifb: delete command queue selection/init The driver does not utilize HW command queue in any way, so the code can be dropped. The support for the default mode (MMIO) and AGP have been disabled already anyway. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit daa484ec96349f2cad6f547517741c74395215ed Author: Aaro Koskinen Date: Tue Mar 8 22:16:06 2011 +0200 staging: xgifb: delete HW cursor memory allocation HW cursor area is not used in any way. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit df0d5e6055b0230763da7a8975db1a7886442d93 Author: Mariusz Kozlowski Date: Mon Mar 7 20:34:30 2011 +0100 staging/hv: add missing include causing build error This fixes following build error: In file included from drivers/staging/hv/channel.h:28, from drivers/staging/hv/vmbus_private.h:30, from drivers/staging/hv/hv.c:28: drivers/staging/hv/channel_mgmt.h:234: error: field ‘work’ has incomplete type Signed-off-by: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 9fe341e834bec1cad92c3f320931d0563674e112 Author: wwang Date: Tue Mar 8 15:22:14 2011 +0800 staging: rts_pstor: MSXC card power class 1, Initialize chip->ms_power_class_en in rtsx_init_options; 2, In reset_ms_pro, set different initial value of change_power_class according to chip->ms_power_class_en. Signed-off-by: wwang Signed-off-by: Greg Kroah-Hartman commit 7c31607e165d5edfa13dea5d329e59f322d4cad2 Author: Grant Grundler Date: Wed Mar 9 15:04:15 2011 -0800 STAGING: brcm80211 remove dhd_doflow Remove dhd_doflow. iperf result without flow control is unacceptable. Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit 26a71a40292e3e29e461a2210d9c0c7339427b19 Author: Grant Grundler Date: Wed Mar 9 10:41:25 2011 -0800 STAGING: brcm80211 fix TX Queue overflow Increase QLEN to avoid TX Queue overflow. iperf testing results in poor throughput and massive reporting of: dhd_bus_txdata: out of bus->txq !!! Also renamed QLEN/et al to reflect usage as TX queue parameters. Tested with "dhd_doflow = true". Signed-off-by: Venkat Rao Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit fb44022f1865ca4a5fcee4fc26a260b83ca05c06 Author: Alexander Beregalov Date: Wed Mar 9 03:53:36 2011 +0300 staging: spectra: optimize kmalloc to kzalloc Use kzalloc rather than kmalloc followed by memset with 0. Found by coccinelle. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 2f4813163639f9f528c41d98ea52dcc85f8d9781 Author: Alexander Beregalov Date: Wed Mar 9 03:53:37 2011 +0300 staging: ft1000: optimize kmalloc to kzalloc Use kzalloc rather than kmalloc followed by memset with 0. Found by coccinelle. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 1840c15b0a504fed6ee08b475245a964336b76e6 Author: Alexander Beregalov Date: Wed Mar 9 03:53:38 2011 +0300 staging: rts_pstor: optimize kmalloc to kzalloc Use kzalloc rather than kmalloc followed by memset with 0. Found by coccinelle. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 12d0eb47ddd20cf8f1e8d768b0f8f81984902a60 Author: Alexander Beregalov Date: Wed Mar 9 03:53:35 2011 +0300 staging: brcm80211: optimize kmalloc to kzalloc Use kzalloc rather than kmalloc followed by memset with 0. Found by coccinelle. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit f4a0e6b1354cd0bec6aca405883cc45662511f03 Author: Alexander Beregalov Date: Wed Mar 9 03:53:34 2011 +0300 staging: bcm: optimize kmalloc to kzalloc Use kzalloc rather than kmalloc followed by memset with 0. Found by coccinelle. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 00b6fb2e31ac668795857c9609adc11e7964ed5a Author: Vinay Sawal Date: Wed Mar 9 13:47:35 2011 -0800 Staging: bcm: Bcmnet: fixed checkpatch script reported issues Fixed all issues reported by checkpatch script on this file. Signed-off-by: Vinay Sawal Signed-off-by: Greg Kroah-Hartman commit 8b68bb20812ba82460e22942ae22ce45880df232 Author: Michael Hennerich Date: Tue Mar 8 08:55:48 2011 +0100 Staging: IIO: Documentation: iio_utils: fix channel array generation. The previous implementation flawed, in case some channels are not enabled. The sorted array would then include channel information of disabled channels, And misses the enabled ones, when the count is reached. More troublesome, the loop would not even terminate. The fix is twofold: First we skip channels that are not enabled. Then we use a tested bubble sort algorithm to sort the array. Since we already allocated exactly the number of bytes we need. We can exercise bubble sort on the original memory. In all cases I've seen, the array is already sorted, so this sort terminates immediately. Changes since V1: Fix coding style issues. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 14f88f1b07e03b064b86ebc9f2f1ed0719dfaa30 Author: Michael Hennerich Date: Wed Mar 9 16:01:45 2011 +0100 Staging: IIO: DAC: AD5624R: Update to IIO ABI This driver did not conform with the IIO ABI for such devices. Also the sysfs files that this driver adds were not complete and partially un-documented. Update and document ABI Change License notice, stick to GPL-v2. Fix indention style Add option to specify external reference voltage via the regulator framework. Add mandatory name attribute Add mandatory out_scale attribute Changes since V1: Refine outY_powerdown_mode description Remove bonus white line Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 1f0e427007d2dc3679faecdf61aaf8673abbb5e8 Author: Mike McCormack Date: Wed Mar 9 00:40:56 2011 +0900 staging: rtl8192e: Pass priv to watch_dog_timer_callback Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit ddd877b2e19de8c73d67b57f9a117b51e8ddfec8 Author: Mike McCormack Date: Wed Mar 9 00:40:44 2011 +0900 staging: rtl8192e: Pass priv to rtl8192_rx Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit c62fdce2f78b7571e83954bb0aaabdd0e6880a82 Author: Mike McCormack Date: Wed Mar 9 00:40:33 2011 +0900 staging: rtl8192e: Pass priv to rtl8192_init Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 679a2494fbe357dc81c97a6097d70e53cd2e5b3f Author: Mike McCormack Date: Wed Mar 9 00:40:24 2011 +0900 staging: rtl8192e: Pass priv to MgntActSet_802_11_PowerSaveMode Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 7703f04dafd8705b6fa234e784d1a23c4b641f3d Author: Mike McCormack Date: Wed Mar 9 00:40:15 2011 +0900 staging: rtl8192e: Pass priv to rtl8192_tx_resume Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 176e8dc1310ecf430294ac413cd29a6b4d99a6fe Author: Mike McCormack Date: Wed Mar 9 00:40:06 2011 +0900 staging: rtl8192e: Pass priv to rtl8192_hw_sleep_down Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 95a9a6538cbd23532aa711981748b21923db407f Author: Mike McCormack Date: Wed Mar 9 00:39:53 2011 +0900 staging: rtl8192e: Pass priv to UpdateRxPktTimeStamp8190 Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 043dfdd3c10ff39c4e21a605d191bb75f10a508e Author: Mike McCormack Date: Wed Mar 9 00:39:32 2011 +0900 staging: rtl8192e: Pass priv to SetKey Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 282fa9f3fb7eaf0b87903ff6267fcd2ae51e314a Author: Mike McCormack Date: Wed Mar 9 00:39:23 2011 +0900 staging: rtl8192e: Pass priv to EnableHWSecurityConfig8192 Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit e676ae5886c02a5cc48cace5b8e72d44d6e54ee1 Author: Mike McCormack Date: Wed Mar 9 00:39:14 2011 +0900 staging: rtl8192e: Pass priv to IPSEnter Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 58f6b58ee2a53a0836fa6844d07832a101d10ead Author: Mike McCormack Date: Wed Mar 9 00:39:05 2011 +0900 staging: rtl8192e: Pass priv to IPSLeave Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit e26174864a565bca76657a7a468bc14465822f7c Author: Mike McCormack Date: Wed Mar 9 00:38:56 2011 +0900 staging: rtl8192e: Pass priv to UpdateReceivedRateHistogramStatistics8190 Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 9633608f5945629bee9f47190c072fab3ac9b719 Author: Mike McCormack Date: Wed Mar 9 00:38:37 2011 +0900 staging: rtl8192e: Pass priv to TranslateRxSignalStuff819xpci Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 762bf6dedd7159ea0b6c8150e342b6299e6dd39b Author: Mike McCormack Date: Wed Mar 9 00:38:23 2011 +0900 staging: rtl8192e: Pass priv to rtl819xE_tx_cmd Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit ed43b47b29bce303f86e1bff69b6f9924f5afcc4 Author: Eric Bénard Date: Wed Mar 9 19:24:49 2011 +0100 n_gsm: fix UIH control byte : P bit should be 0 * the GSM 07.10 specification says in 5.4.3.1 that 'both stations shall set the P bit to 0' thanks to Alan Cox for finding this explanation in the spec * without this fix, on Telit & Sim.com modems, opening a new DLC randomly fails. Not setting PF bit of the control byte gives a reliable behaviour on these modems. Signed-off-by: Eric Bénard Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 323e84122ec6447a5a18de42b0dc7114f77e76c4 Author: Eric Bénard Date: Wed Mar 9 19:24:48 2011 +0100 n_gsm: add a documentation * this documentation gives some details on how to get the n_gsm line discipline to work with modems supporting 07.10 basic option. * it was tested on Telit and Simcom modems. Signed-off-by: Eric Bénard Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b88ccf6f97ceb3f34cecbb513edc58815707187d Author: JF Argentino Date: Wed Mar 9 22:13:20 2011 +0100 USB: serial: ftdi_sio: adding support for OLIMEX ARM-USB-OCD-H Adding support for the OLIMEX ARM-USB-OCD-H JTAG device (id 15ba:002b) based on FTDI FT2232H Signed-off-by: JF Argentino Acked-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 7a89e4cb9cdaba92f5fbc509945cf4e3c48db4e2 Author: Herton Ronaldo Krzesinski Date: Wed Mar 9 09:19:48 2011 +0000 USB: serial: option: Apply OPTION_BLACKLIST_SENDSETUP also for ZTE MF626 On https://bugs.launchpad.net/ubuntu/+source/linux/+bug/636091, one of the cases reported is a big timeout on option_send_setup, which causes some side effects as tty_lock is held. Looks like some of ZTE MF626 devices also don't like the RTS/DTR setting in option_send_setup, like with 4G XS Stick W14. The reporter confirms which this it solves the long freezes in his system. Signed-off-by: Herton Ronaldo Krzesinski Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1f15318cdae665550746e7fcdfe5ef41bf2360af Author: Hao Wu Date: Wed Mar 9 12:41:08 2011 +0000 USB OTG Langwell: use simple IPC command to control VBus power. Direct access to PMIC register is not safe and will impact battery charging. New IPC command supported in SCU FW for VBus power control. USB OTG driver will switch to such commands instead of direct access to PMIC register for safety and SCU FW will handle the actual work after got the request(IPC command). Due to this change, usb driver should wait more time for sync OTGSC with USBCFG by SCU. Update wait time from 2ms to 5ms. Signed-off-by: Hao Wu Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2d9ca4e9f393d81d8f37ed37505aecbf3a5e1bd6 Author: Henrik Rydberg Date: Wed Mar 9 18:38:57 2011 +0100 HID: hid-magicmouse: Correct touch orientation direction The magic trackpad and mouse both report touch orientation in opposite direction to the bcm5974 driver and what is written in Documents/input/multi-touch-protocol.txt. This patch reverts the direction, so that all in-kernel devices with this feature behave the same way. Since no known application has been utilizing this information yet, it seems appropriate also for stable. Cc: stable@kernel.org Cc: Michael Poole Signed-off-by: Henrik Rydberg Acked-by: Chase Douglas Signed-off-by: Jiri Kosina commit 2f4e1b3970973bbb57cc3a3b9d67e67c1c648c37 Author: Mario Schuknecht Date: Wed Mar 9 14:08:09 2011 -0800 tcp: ioctl type SIOCOUTQNSD returns amount of data not sent In contrast to SIOCOUTQ which returns the amount of data sent but not yet acknowledged plus data not yet sent this patch only returns the data not sent. For various methods of live streaming bitrate control it may be helpful to know how much data are in the tcp outqueue are not sent yet. Signed-off-by: Mario Schuknecht Signed-off-by: Steffen Sledz Signed-off-by: David S. Miller commit ee3f1aaf930b7cfbf3d34eff1e5e076393227e90 Author: David S. Miller Date: Wed Mar 9 14:06:20 2011 -0800 ipv4: Lookup multicast routes by rtable using helper. Create a common helper for this operation, since we do it identically in three spots. Suggested by Eric Dumazet. Signed-off-by: David S. Miller commit 5dab26af1bacad9a7189d904fbc8b4fe8e95dd81 Author: Will Deacon Date: Fri Mar 4 12:38:54 2011 +0100 ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9 On revisions of the Cortex-A9 prior to r2p0, the Store Buffer does not have any automatic draining mechanism and therefore a livelock may occur if an external agent continuously polls a memory location waiting to observe an update. This workaround defines cpu_relax() as smp_mb(), preventing correctly written polling loops from denying visibility of updates to memory. Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King commit fcbdc5fe6ebe07d502c9b652cb63376bcc4227ac Author: Will Deacon Date: Mon Feb 28 18:15:16 2011 +0100 ARM: 6772/1: errata: possible fault MMU translations following an ASID switch On the r2p* and r3p* versions of the Cortex-A9, a speculative memory access may cause a page table walk which starts prior to an ASID switch but completes afterwards. This can populate the micro-TLB with a stale entry which may be hit with the new ASID. This workaround places two dsb instructions in the mm switching code so that no page table walks can cross the ASID switch. Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King commit 6e266b204b853b960ad038e62f31c1671f930b87 Author: Linus Walleij Date: Tue Mar 1 15:42:04 2011 +0100 ARM: 6776/1: mach-ux500: activate fix for errata 753970 This applies errata fix 753970 for all ux500 platforms. All current ASICs suffer from this. If the problem is resolved in later ASICs, the errata selection can be pushed down to other Kconfig options. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit bd33acc3cc525972ac779067e98efb26516c5b94 Author: Amerigo Wang Date: Sun Mar 6 21:58:46 2011 +0000 bonding: move procfs code into bond_procfs.c V2: Move #ifdef CONFIG_PROC_FS into bonding.h, as suggested by David. bond_main.c is bloating, separate the procfs code out, move them to bond_procfs.c Signed-off-by: WANG Cong Reviewed-by: Jiri Pirko Signed-off-by: Andy Gospodarek Signed-off-by: David S. Miller commit 0dde52a9f5330eec240660191a94b51bd911ffcd Merge: c39bee8 2722e56 Author: Tony Lindgren Date: Wed Mar 9 13:15:49 2011 -0800 Merge branch 'omap-l3-for-next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into omap-for-linus commit 8d5eab5aa676378b4c9daa62d10d08a0bca04677 Author: Daniel Halperin Date: Wed Mar 9 03:10:18 2011 -0800 mac80211: update minstrel_ht sample rate when probe is set Waiting until the status is received can cause the same rate to be probed multiple times consecutively. Cc: Felix Fietkau Signed-off-by: Daniel Halperin Signed-off-by: John W. Linville commit 23ffaa89df16e55578318cfd852f23dcb37bf37b Author: John W. Linville Date: Tue Mar 8 16:36:00 2011 -0500 ath5k: restrict AR5K_TX_QUEUE_ID_DATA_MAX to reflect the [0,3] range This just matches reality... Signed-off-by: John W. Linville Acked-by: Bob Copeland commit 4d9d88d121fdd01dd859717909ea3c90173f143a Author: Scott James Remnant Date: Tue Mar 8 10:45:30 2011 -0800 net/wireless: add COUNTRY to to regulatory device uevent Regulatory devices issue change uevents to inform userspace of a need to call the crda tool; however these can often be sent before udevd is running, and were not previously included in the results of udevadm trigger (which requests a new change event using the /uevent attribute of the sysfs object). Add a uevent function to the device type which includes the COUNTRY information from the last request if it has yet to be processed, the case of multiple requests is already handled in the code by checking whether an unprocessed one is queued in the same manner and refusing to queue a new one. The existing udev rule continues to work as before. Signed-off-by: Scott James Remnant Acked-By: Kay Sievers Acked-by: Greg Kroah-Hartman Signed-off-by: John W. Linville commit 80751e2b8ffcbbe065e850d943301aa1ab219599 Author: Bing Zhao Date: Mon Mar 7 11:14:23 2011 -0800 ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition and make use of it in wireless drivers Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit b9ede5f1dc03f96949dcaa8f8b3483766c047260 Author: Shan Wei Date: Tue Mar 8 11:02:03 2011 +0800 mwl8k: use kcalloc instead of kmalloc & memset Use kcalloc or kzalloc rather than the combination of kmalloc and memset. Thanks coccicheck for detecting this. (http://coccinelle.lip6.fr/) Signed-off-by: Shan Wei Signed-off-by: John W. Linville commit c39bee8ac4aca750c85609ba0847599b36feb693 Author: Paul Walmsley Date: Fri Mar 4 06:02:15 2011 +0000 OMAP2/3: VENC hwmod: add OCPIF_SWSUP_IDLE flag to interface According to the hwmod interface data, the DSS submodule "VENC" uses a clock, "dss_54m_fck"/"dss_tv_fck", which the PRCM cannot autoidle. By default, the hwmod code assumes that interface clocks can be autoidled by the PRCM. When the interface clock can't be autoidled by the PRCM, those interfaces must be marked with the OCPIF_SWSUP_IDLE flag. Otherwise, the "interface clock" will always have a non-zero use count, and the device won't enter idle. This problem was observed on N8x0. Fix the immediate problem by marking the VENC interface with the OCPIF_SWSUP_IDLE flag. But it's not clear that "dss_54m_fck"/"dss_tv_fck" is really the correct interface clock for VENC. It may be that the VENC interface should use a hardware-autoidling interface clock. This is the situation on OMAP4, which uses "l3_div_ck" as the VENC interface clock, which can be autoidled by the PRCM. Clarification from TI is needed. Problem found and patch tested on N8x0 by Tony Lindgren . Signed-off-by: Paul Walmsley Cc: Tony Lindgren Cc: Senthilvadivu Guruswamy Cc: Sumit Semwal Cc: Kevin Hilman Cc: Benoît Cousson Signed-off-by: Tony Lindgren commit a015f6f49968c330b236ca2f6c2170820414f922 Author: Rémi Denis-Courmont Date: Tue Mar 8 22:44:13 2011 +0000 Phonet: kill the ST-Ericsson pipe controller Kconfig This is now a run-time choice so that a single kernel can support both old and new generation ISI modems. Support for manually enabling the pipe flow is removed as it did not work properly, does not fit well with the socket API, and I am not aware of any use at the moment. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 297edb6003268c1d60da8c21eb76bf39b6428213 Author: Rémi Denis-Courmont Date: Tue Mar 8 22:44:12 2011 +0000 Phonet: support active connection without pipe controller on modem This provides support for newer ISI modems with no need for the earlier experimental compile-time alternative choice. With this, we can now use the same kernel and userspace with both types of modems. This also avoids confusing two different and incompatible state machines, actively connected vs accepted sockets, and adds connection response error handling (processing "SYN/RST" of sorts). Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit acaf7df610ff3faf1778ce40d601fc3dd4a41b40 Author: Rémi Denis-Courmont Date: Tue Mar 8 22:44:11 2011 +0000 Phonet: provide pipe socket option to retrieve the pipe identifier User-space sometimes needs this information. In particular, the GPRS context or the AT commands pipe setups may use the pipe handle as a reference. This removes the settable pipe handle with CONFIG_PHONET_PIPECTRLR. It did not handle error cases correctly. Furthermore, the kernel *could* implement a smart scheme for allocating handles (if ever needed), but userspace really cannot. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit f7ae8d59f66154df0424fd94035c89981fed3379 Author: Rémi Denis-Courmont Date: Tue Mar 8 22:44:10 2011 +0000 Phonet: allocate sock from accept syscall rather than soft IRQ This moves most of the accept logic to process context like other socket stacks do. Then we can use a few more common socket helpers and simplify a bit. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 44c9ab16d29a50af6ed9ae084b75774570de512a Author: Rémi Denis-Courmont Date: Tue Mar 8 22:44:09 2011 +0000 Phonet: factor common code to send control messages With the addition of the pipe controller, there is now quite a bit of repetitive code for small signaling messages. Lets factor it. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 0ebbf318635bf354bdb046419dd10e9a00667f37 Author: Rémi Denis-Courmont Date: Tue Mar 8 22:44:08 2011 +0000 Phonet: correct pipe backlog callback return values In some cases, the Phonet pipe backlog callbacks returned negative errno instead of NET_RX_* values. In other cases, NET_RX_DROP was returned for invalid packets, even though it seems only intended for buffering problems (not for deliberately discarded packets). Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit b765e84f96f728e8e178348fc102f126c1736193 Author: Rémi Denis-Courmont Date: Tue Mar 8 22:44:07 2011 +0000 Phonet: return an error when packet TX fails Phonet assumes that packets are never dropped. We try our best to avoid this situation. But lets return ENOBUFS if queueing to the network device fails so that the caller knows things went wrong. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit c69d4407d8884e8a127f95d07b1896443f3716ff Author: Rémi Denis-Courmont Date: Tue Mar 8 22:44:06 2011 +0000 Phonet: fix NULL dereference on TX path with implicit source The previous Phonet patch series introduced per-socket implicit destination (i.e. connect()). In that case, the destination socket address is NULL in the transmit function. However commit a8059512b120362b15424f152b2548fe8b11bd0c ("Phonet: implement per-socket destination/peer address") is incomplete and would trigger a NULL dereference. (Fortunately, the code is not in released kernel, and in fact currently not reachable.) Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit ea04683f592e6200b52e191b7e2842aedcfd88b6 Author: John Stultz Date: Thu Feb 10 15:32:59 2011 -0800 RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer Now that the genric RTC layer handles much of the RTC functionality, the rtc.txt documentation needs to be updated to remove outdated information. CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz commit 416f0e8056f757c119dc3d4fa434a62b65c8272b Author: Marcelo Roberto Jimenez Date: Mon Feb 7 19:16:08 2011 -0200 RTC: sa1100: Update the sa1100 RTC driver. Since PIE interrupts are now emulated, this patch removes the previous code that used the hardware counters. The removal of read_callback() also fixes a wrong user space behaviour of this driver, which was not returning the right value to read(). [john.stultz: Merge fixups] CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: John Stultz commit a417493ef916b8b6d1782a589766a713c553842e Author: Marcelo Roberto Jimenez Date: Mon Feb 7 19:16:07 2011 -0200 RTC: Fix the cross interrupt issue on rtc-test. The rtc-test driver is meant to provide a test/debug code for the RTC subsystem. The rtc-test driver simulates specific interrupts by echoing to the sys interface. Those were the update, alarm and periodic interrupts. As a side effect of the new implementation, any interrupt generated in the rtc-test driver would trigger the same code path in the generic code, and thus the distinction among interrupts gets lost. This patch preserves the previous behaviour of the rtc-test driver, where e.g. an update interrupt would not trigger an alarm or periodic interrupt, and vice-versa. In real world RTC drivers, this is not an issue, but in the rtc-test driver it may be interesting to distinguish these interrupts for testing purposes. CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: John Stultz commit 4cebe7aadc9ee8e7b44857b7aba3a878870cef65 Author: Marcelo Roberto Jimenez Date: Mon Feb 7 19:16:06 2011 -0200 RTC: Remove UIE and PIE information from the sa1100 driver proc. This patch removes the UIE and PIE information that is now being supplied directly in the generic RTC code. CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: John Stultz commit bca8521c551afcd926bdc8f814ebaefcb8215c57 Author: Marcelo Roberto Jimenez Date: Fri Feb 11 11:50:24 2011 -0200 RTC: Include information about UIE and PIE in RTC driver proc. Generic RTC code is always able to provide the necessary information about update and periodic interrupts. This patch add such information to the proc interface. CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: John Stultz commit e428c6a2772bcf6b022baf7c8267cca3634c0c3e Author: John Stultz Date: Fri Feb 4 16:16:12 2011 -0800 RTC: Clean out UIE icotl implementations With the generic RTC rework, the UIE mode irqs are handled in the generic layer, and only hardware specific ioctls get passed down to the rtc driver layer. So this patch removes the UIE mode ioctl handling in the rtc driver layer, which never get used. CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz commit 51ba60c5bb3b0f71bee26404ddc22d8e4109e88a Author: John Stultz Date: Thu Feb 3 12:13:50 2011 -0800 RTC: Cleanup rtc_class_ops->update_irq_enable() Now that the generic code handles UIE mode irqs via periodic alarm interrupts, no one calls the rtc_class_ops->update_irq_enable() method anymore. This patch removes the driver hooks and implementations of update_irq_enable if no one else is calling it. CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz commit 696160fec162601d06940862b5b3aa4460344c1b Author: John Stultz Date: Thu Feb 3 12:02:07 2011 -0800 RTC: Cleanup rtc_class_ops->irq_set_freq() With the generic rtc code now emulating PIE mode irqs via an hrtimer, no one calls the rtc_class_ops->irq_set_freq call. This patch removes the hook and deletes the driver functions if no one else calls them. CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz commit 80d4bb515b78f38738f3378fd1be6039063ab040 Author: John Stultz Date: Thu Feb 3 11:34:50 2011 -0800 RTC: Cleanup rtc_class_ops->irq_set_state With PIE mode interrupts now emulated in generic code via an hrtimer, no one calls rtc_class_ops->irq_set_state(), so this patch removes it along with driver implementations. CC: Thomas Gleixner CC: Alessandro Zummo CC: Marcelo Roberto Jimenez CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz commit f44f7f96a20af16f6f12e1c995576d6becf5f57b Author: John Stultz Date: Mon Feb 21 22:58:51 2011 -0800 RTC: Initialize kernel state from RTC Mark Brown pointed out a corner case: that RTC alarms should be allowed to be persistent across reboots if the hardware supported it. The rework of the generic layer to virtualize the RTC alarm virtualized much of the alarm handling, and removed the code used to read the alarm time from the hardware. Mark noted if we want the alarm to be persistent across reboots, we need to re-read the alarm value into the virtualized generic layer at boot up, so that the generic layer properly exposes that value. This patch restores much of the earlier removed rtc_read_alarm code and wires it in so that we set the kernel's alarm value to what we find in the hardware at boot time. NOTE: Not all hardware supports persistent RTC alarm state across system reset. rtc-cmos for example will keep the alarm time, but disables the AIE mode irq. Applications should not expect the RTC alarm to be valid after a system reset. We will preserve what we can, to represent the hardware state at boot, but its not guarenteed. Further, in the future, with multiplexed RTC alarms, the soonest alarm to fire may not be the one set via the /dev/rt ioctls. So an application may set the alarm with RTC_ALM_SET, but after a reset find that RTC_ALM_READ returns an earlier time. Again, we preserve what we can, but applications should not expect the RTC alarm state to persist across a system reset. Big thanks to Mark for pointing out the issue! Thanks also to Marcelo for helping think through the solution. CC: Mark Brown CC: Marcelo Roberto Jimenez CC: Thomas Gleixner CC: Alessandro Zummo CC: rtc-linux@googlegroups.com Reported-by: Mark Brown Signed-off-by: John Stultz commit 848669da3a92fa6ab815e0517af3294afb3ea928 Author: Takashi Iwai Date: Wed Mar 9 17:33:48 2011 +0100 sound: Use sound_register_*() for additional OSS minor devices Since OSS driver creates the device entries for /dev/audio* and /dev/dspW* by itself without coping with sound_core, it leads to conflicts with others and let sysfs spewing warnings. This patch rewrites the registration part of OSS driver to use the standard method also for additional minor devices. Reported-by: Steven Rostedt (with ktest.pl) Tested-by: Steven Rostedt (with ktest.pl) Signed-off-by: Takashi Iwai commit bf5ea02d9058a97a0bc2da9ca04ae4b34989407a Author: Florian Tobias Schandinat Date: Wed Jan 5 10:36:05 2011 +0000 viafb: factor lcd scaling parameters out These parameters are the same for all currently known VIA IGPs so it does not make any sense to store them with IGP specific data. This saves a few bytes and helps a bit in dicovering the real differences. Signed-off-by: Florian Tobias Schandinat commit d90108765b64e39e88e59f51d05ac652f0e53fea Author: Florian Tobias Schandinat Date: Sun Dec 19 02:31:55 2010 +0000 viafb: strip some structures This patch removes some write-only variables from the device management structures. Just a small cleanup. Signed-off-by: Florian Tobias Schandinat commit c8350be26237e2b850b9611dbe55304ad6ebc6c7 Author: Florian Tobias Schandinat Date: Sat Dec 11 05:11:00 2010 +0000 viafb: remove unused data_mode and device_type This patch is a little cleanup for the chip_info structures. Signed-off-by: Florian Tobias Schandinat commit dbf85f2326dbb070256ff153853b00f70c27717a Author: Florian Tobias Schandinat Date: Sat Dec 11 04:01:13 2010 +0000 viafb: kill lcd_panel_id This patch removes all internal uses of another mostly artificial value. It does duplicate the information of the maximum resolution and it is not flexible as only a few resolutions exist. Hence it is better to remove it and clean the mess up. No runtime change expected. Signed-off-by: Florian Tobias Schandinat commit cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24 Author: Tejun Heo Date: Wed Mar 9 19:54:29 2011 +0100 staging: Convert to bdops->check_events() Convert two staging drivers - blkvsc_drv and cyasblkdev_block - from ->media_changed() to ->check_events(). The former always indicated media changed while the latter always indicated media not changed. Not sure what the drivers are trying to achieve but keep the original behavior. Signed-off-by: Tejun Heo Acked-by: Greg Kroah-Hartman Cc: Jens Axboe Cc: Kay Sievers commit 3c0d206092f50be82523dba2b0e0a02de9e6aad3 Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 pktcdvd: Convert to bdops->check_events() Convert from ->media_changed() to ->check_events(). pktcdvd needs to forward all event related operations to the underlying device. Forward ->check_events() instead of ->media_changed() and inherit disk->[async_]events. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers Cc: Peter Osterlund commit 6fac80e3aa9e5bfc6cadb9ea8d0584c557c4b198 Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 umem: Drop dummy ->media_changed() umem doesn't implement media changed detection and there's no need to implement dummy callback anymore. Remove it. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers commit ffe80cea354519d846767b8165598c2903706c2a Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 s390/tape_block: Convert to bdops->check_events() Convert from ->media_changed() to ->check_events(). s390/tape_block buffers media changed state and clears it on revalidation. It will behave correctly with kernel event polling. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers Cc: Martin Schwidefsky Cc: Heiko Carstens commit f47350fdecb7ce9fe715e2df4431c4b51c4ef46b Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 i2o_block: Convert to bdops->check_events() Convert from ->media_changed() to ->check_events(). i2o_block buffers media changed state and clears it after reporting. It will behave correctly with kernel event polling. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers Cc: Markus Lidel commit 3a200911ada2d5b955c2c6daa22364c6de83c52c Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 xsysace: Convert to bdops->check_events() Convert from ->media_changed() to ->check_events(). xsysace buffers media changed state and clears it on revalidation. It will behave correctly with kernel event polling. Signed-off-by: Tejun Heo Acked-by: Grant Likely Cc: Jens Axboe Cc: Kay Sievers commit aaa7c01546d3dc944f5758f671284177131ccce3 Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 ub: Convert to bdops->check_events() Convert from ->media_changed() to ->check_events(). ub buffers media changed state and clears it on revalidation. It will behave correctly with kernel event polling. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers Cc: Pete Zaitcev commit 4bbde77787270e17418dd32c7eb32e42ad16cfc7 Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 swim[3]: Convert to bdops->check_events() Convert from ->media_changed() to ->check_events(). Both swim and swim3 buffer media changed state and clear it on revalidation. They will behave correctly with kernel event polling. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers Cc: Laurent Vivier Cc: Benjamin Herrenschmidt commit 507daea2276677785ba8096d90b9e8049632fc46 Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 dac960: Convert to bdops->check_events() Convert from ->media_changed() to ->check_events(). DAC960 media change notification seems to be one way (once set, never cleared) and will generate spurious events when polled once the condition triggers. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers commit b1b56b93f331bd61492fdb99e7986f7a528ca730 Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 paride: Convert to bdops->check_events() Convert paride drivers from ->media_changed() to ->check_events(). pcd and pd buffer and clear events after reporting; however, pf unconditionally reports MEDIA_CHANGE and will generate spurious events when polled. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers Cc: Tim Waugh commit 1c27030bd21e7e2c68ef5be9f28c63778cf4b27f Author: Tejun Heo Date: Wed Mar 9 19:54:28 2011 +0100 gdrom,viocd: Convert to bdops->check_events() Convert gdrom and viocd from ->media_changed() to ->check_events(). It's unclear how the conditions are cleared and it's possible that it may generate spurious events when polled. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers commit 1a8a74f03fcde1725ff26520220f3d21dbd8faa1 Author: Tejun Heo Date: Wed Mar 9 19:54:27 2011 +0100 floppy,{ami|ata}flop: Convert to bdops->check_events() Convert the floppy drivers from ->media_changed() to ->check_events(). Both floppy and ataflop buffer media changed state bit and clear them on revalidation and will behave correctly with kernel event polling. I can't tell how amiflop clears its event and it's possible that it may generate spurious events when polled. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers commit 5b03a1b140e13a28ff6be1526892a9dc538ddef6 Author: Tejun Heo Date: Wed Mar 9 19:54:27 2011 +0100 ide: Convert to bdops->check_events() Convert ->media_changed() to the new ->check_events() method. The conversion is mostly mechanical. The only notable change is that cdrom now doesn't generate any event if @slot_nr isn't CDSL_CURRENT. It used to return -EINVAL which would be treated as media changed. As media changer isn't supported anyway, this doesn't make any difference. This makes ide emit the standard disk events and allows kernel event polling. Currently, only MEDIA_CHANGE event is implemented. Adding support for EJECT_REQUEST shouldn't be difficult; however, given that ide driver is already deprecated, it probably is best to leave it alone. Signed-off-by: Tejun Heo Acked-by: Jens Axboe Cc: Kay Sievers Cc: "David S. Miller" Cc: linux-ide@vger.kernel.org commit 69e02c59a7d962dced8047401b81a8d897e1702e Author: Tejun Heo Date: Wed Mar 9 19:54:27 2011 +0100 block: Don't check events while open is in progress Not all block drivers clear events immediately after reporting. Some do so in ->revalidate_disk() or other steps during ->open(). There is a slim chance event poll may happen between the clearing event check from check_disk_change() and the actual clearing of the events which would result in spurious events. Block event checks while block device open is in progress. There is no need to kick explicit event check afterwards as events are always checked during open. -v2: The original patch could have called disk_unblock_events() with an already released or %NULL @disk causing oops. Fixed by making sure references are put after disk_unblock_events() is called. It also makes the error path of __blkdev_get() a bit simpler. This problem was reported by Jens. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers commit 6936217cc7e58573026bdba25b1bfb778e8f2267 Author: Tejun Heo Date: Wed Mar 9 19:54:27 2011 +0100 block: Don't check events on close unless it was blocked The block event mechanism currently always checks events when the device is being closed regardless of the open mode. The intention was to allow detection of EJECT_REQUEST when a device is closed whether disk event polling is enabled or not. This is unnecessary as, for devices of interest, events are checked from either userland or kernel and in the former case ->check_events() is performed on open of each poll attempt anyway. Furthermore, this unconditional event check on close makes the code susceptible to event loop if the block driver doesn't clear reported events correctly - an event triggers userland to open and close the device which in turn causes another event, rinse and repeat. Check events on close only if it was blocked by excl write open. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers commit facc31ddc3570a3a0d8951c94f16b898e01b464d Author: Tejun Heo Date: Wed Mar 9 19:54:27 2011 +0100 block: Don't implicitly trigger event check on disk_unblock_events() Currently, disk_unblock_events() implicitly kick event check if the block count reaches zero. This behavior is not described in the comment and hinders with future changes. Make the unblocker explicitly check events by calling disk_check_events() as necessary. This patch doesn't cause any behavior difference. Signed-off-by: Tejun Heo Cc: Jens Axboe Cc: Kay Sievers commit de29be5e712dc8b7eef2bef9417af3bb6a88e47a Author: David Sharp Date: Fri Dec 3 16:13:16 2010 -0800 ring-buffer: Remove unused #include Signed-off-by: David Sharp LKML-Reference: <1291421609-14665-3-git-send-email-dhsharp@google.com> Signed-off-by: Steven Rostedt commit 750912fa366312e9c5bc83eab352898a26750401 Author: David Sharp Date: Wed Dec 8 13:46:47 2010 -0800 tracing: Add an 'overwrite' trace_option. Add an "overwrite" trace_option for ftrace to control whether the buffer should be overwritten on overflow or not. The default remains to overwrite old events when the buffer is full. This patch adds the option to instead discard newest events when the buffer is full. This is useful to get a snapshot of traces just after enabling traces. Dropping the current event is also a simpler code path. Signed-off-by: David Sharp LKML-Reference: <1291844807-15481-1-git-send-email-dhsharp@google.com> Signed-off-by: Steven Rostedt commit 23e5abd5555b86fd56af6383e7a832b0cf2a2d95 Author: Stephen Hemminger Date: Thu Mar 3 10:00:08 2011 -0800 video via: make local variables static Many local variables should be declared static. Found by sparse, compile tested only. Signed-off-by: Stephen Hemminger Signed-off-by: Florian Tobias Schandinat commit b65d6040e3a7cd75d9287f7ddfd115e85fde4b44 Author: Stephen Hemminger Date: Thu Mar 3 09:59:01 2011 -0800 video via: fix iomem access This driver is not respecting the iomem memory space restrictions and does direct access. This works on x86 but is non-portable and should not be done. Converted memcpy() of 2 to readw. Last post increment of romptr was unnecessary since pointer never used after that. Found by sparse, compile tested only. Signed-off-by: Stephen Hemminger Signed-off-by: Florian Tobias Schandinat commit 9a17f40048be305749f53278c857bf52939081f3 Author: Zdenek Kaspar Date: Sun Jan 30 12:18:51 2011 +0100 kbuild: Add make tarxz-pkg build option Signed-off-by: Zdenek Kaspar Signed-off-by: Michal Marek commit 2d8ad8719591fa803b0d589ed057fa46f49b7155 Merge: 9b4ce7b c56eb8f Author: Michal Marek Date: Wed Mar 9 16:15:44 2011 +0100 Merge commit 'v2.6.38-rc1' into kbuild/packaging commit 4a5838ad9d2d4f7354a310982483f4c76aa0abeb Author: Borislav Petkov Date: Tue Mar 1 09:35:29 2011 +0100 kbuild: Add extra gcc checks Add a 'W=1' Makefile switch which adds additional checking per build object. The idea behind this option is targeted at developers who, in the process of writing their code, want to do the occasional make W=1 [target.o] and let gcc do more extensive code checking for them. Then, they could eyeball the output for valid gcc warnings about various bugs/discrepancies which are not reported during the normal build process. For more background information and a use case, read through this thread: http://marc.info/?l=kernel-janitors&m=129802065918147&w=2 Cc: Michal Marek Cc: linux-kbuild@vger.kernel.org Acked-by: Sam Ravnborg Acked-by: Ingo Molnar Signed-off-by: Borislav Petkov Signed-off-by: Michal Marek commit ecb6928fcf969b302929f109e175981df1dba697 Author: Christoph Hellwig Date: Fri Mar 4 12:59:55 2011 +0000 xfs: factor agf counter updates into a helper Updating the AGF and transactions counters is duplicated between allocating and freeing extents. Factor the code into a common helper. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 86fa8af69d8e90b7b40b8dab84d168527143ae20 Author: Christoph Hellwig Date: Fri Mar 4 12:59:54 2011 +0000 xfs: clean up the xfs_alloc_compute_aligned calling convention Pass a xfs_alloc_arg structure to xfs_alloc_compute_aligned and derive the alignment and minlen paramters from it. This cleans up the existing callers, and we'll need even more information from the xfs_alloc_arg in subsequent patches. Based on a patch from Dave Chinner. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit adb00ae2ea0ec65f9d3d06079950c0f0ade3b614 Author: Stephen Hemminger Date: Wed Mar 9 14:14:26 2011 +0100 netfilter: x_tables: misuse of try_then_request_module Since xt_find_match() returns ERR_PTR(xx) on error not NULL, the macro try_then_request_module won't work correctly here. The macro expects its first argument will be zero if condition fails. But ERR_PTR(-ENOENT) is not zero. The correct solution is to propagate the error value back. Found by inspection, and compile tested only. Signed-off-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit 4cfeb695e29d69570496354384f32b862795a47c Author: Alexander Sverdlin Date: Mon Mar 7 20:30:12 2011 +0300 ASoC: Enable 192kHz sample rate for EP93xx. Enable 192kHz sample rate for EP93xx. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5cbf7e49de3276c82705fc303d305ce170793ef6 Author: Alexander Sverdlin Date: Mon Mar 7 20:30:36 2011 +0300 ASoC: Improve EP93xx I2S clocks management. Improve EP93xx I2S clocks management. Some freqs values are set not exact as they requested for MCLK and original code was not able to find divisors for SCLK and LRCLK. This code just picks up nearest value from 3 possible variants. This patch makes 44100 and 192000 rates working and fixes capture function (by selecting SCLK/LRCLK=64 where possible). All other rates should work as before. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6d33cd771b779abd8faeaf63821c200ba36a63b1 Author: Alexander Sverdlin Date: Mon Mar 7 20:29:53 2011 +0300 ASoC: EDB93xx: Manage I2S rates according to datasheet for CS4271 CODEC. Manage I2S rates according to datasheet for CS4271 CODEC in EDB93xx machine driver. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5c3a12e96c9f3158602b2feac8583ae35c10b80e Author: Alexander Sverdlin Date: Mon Mar 7 20:29:45 2011 +0300 ASoC: Manage mode and rate bits correctly for CS4271 CODEC. Manage mode and rate bits correctly, according to datasheet in CS4271 CODEC. This is done to make capture work properly. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 15086ded21ee7f065ad290c1edfdc49cf18cf96e Merge: 3e5ff4d 28e8680 Author: Mark Brown Date: Wed Mar 9 12:37:42 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 Conflicts: sound/soc/codecs/wm8978.c sound/soc/soc-dapm.c commit 3e5ff4dfa5a0a5627235a245665035597f050d86 Author: Mark Brown Date: Wed Mar 9 11:33:09 2011 +0000 ASoC: Fix double addition of prefixes due to widget prefixing We're not only prefixing all controls, we're also prefixing the widget names in the runtime data. This causes us to add the prefix twice - once when using the widget name to generate the control name and once when adding the control. Really we shouldn't be prefixing the widget names at all, the matching code should be handing this as we always know which DAPM context a widget came from and always display the widget name in terms of a DAPM context. However, we're quite close to the merge window and that's relatively invasive. Signed-off-by: Mark Brown Reported-by: Jarkko Nikula Acked-by: Jarkko Nikula Acked-by: Liam Girdwood commit 378a90f4540cc113e6ef36861ae914b0c63700a0 Author: Mark Brown Date: Tue Mar 8 18:52:08 2011 +0000 ASoC: Simplify WM9081 speaker startup by using widgets for spaker output Now we have a register write minimisation code in DAPM we don't need to worry about the ordering of the enable and disable of the PGA and the output stage. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 2722e56de60390969cf118933842b3f2f3c8d6b8 Author: Santosh Shilimkar Date: Mon Mar 7 20:53:10 2011 +0530 OMAP4: l3: Introduce l3-interconnect error handling driver The driver provides the information regarding the ocp errors that gets logged in the interconnect. The error information gives the detail regarding the target that was attempted to be accessed and its corresponding address. Signed-off-by: sricharan Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson commit a4dc616ae321b5007fba0700fbd39ef13ced750b Author: sricharan Date: Wed Mar 9 16:00:29 2011 +0530 OMAP4: Initialise the l3 device with the hwmod data. The l3 interconnect device is build with all the data required to handle the error logging. The data is extracted from the hwmod data base. Signed-off-by: Santosh Shilimkar Signed-off-by: sricharan Acked-by: Benoit Cousson commit c464523488063f240652c445fcae2ca8a0eb2647 Author: sricharan Date: Mon Feb 7 21:12:11 2011 +0530 OMAP4: hwmod_data: Add address space and irq in L3 hwmod. Add the address spaces, irqs of the l3 interconnect to the hwmod data. The hwmod change is aligned with Benoit Cousson. Signed-off-by: Santosh Shilimkar Signed-off-by: sricharan Acked-by: Benoit Cousson commit e2fa61d409195550b3b05b213d7715bc67b0e855 Author: Felipe Balbi Date: Mon Mar 7 19:35:20 2011 +0530 OMAP3: l3: Introduce l3-interconnect error handling driver The driver provides the information regarding the ocp errors that gets logged in the interconnect.The error info provides the details regarding the master or the target that generated the error, type of error and the corresponding address. The stack dump is also provided. Signed-off-by: sricharan [r.sricharan@ti.com: Enhacements, major cleanup and made it functional] Signed-off-by: Santosh Shilimkar [santosh.shilimkar@ti.com: Driver design changes as per OMAP4 version] Signed-off-by: Felipe Balbi [balbi@ti.com: Initial version of the driver] Acked-by: Benoit Cousson commit 0abcf6185eb87b9e00a821513802e56200378a6a Author: sricharan Date: Tue Feb 8 14:10:45 2011 +0530 OMAP3: devices: Initialise the l3 device with the hwmod data. The l3 interconnect device is build with all the data required to handle the error logging. The data is extracted from the hwmod database. Signed-off-by: sricharan Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson commit 4bb194dc9471c79caa1952ecdb31148074ac1abf Author: sricharan Date: Tue Feb 8 22:13:37 2011 +0530 OMAP3: hwmod_data: Add address space and irq in L3 hwmod. Add the address spaces, irqs of the l3 interconnect to the hwmod data. The hwmod changes are aligned with Benoit Cousson. Signed-off-by: sricharan Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson commit 0a33443b38746f35fc4acc8a5af6c7099e03ea40 Author: Steven Whitehouse Date: Wed Mar 9 11:14:32 2011 +0000 GFS2: Remove potential race in flock code This patch ensures that we always wait for glock demotion when dropping flocks on a file in order to prevent any race conditions associated with further flock calls or closing the file. Signed-off-by: Steven Whitehouse commit fc0e38dae645f65424d1fb5d2a938aab8ce48a58 Author: Steven Whitehouse Date: Wed Mar 9 10:58:04 2011 +0000 GFS2: Fix glock deallocation race This patch fixes a race in deallocating glocks which was introduced in the RCU glock patch. We need to ensure that the glock count is kept correct even in the case that there is a race to add a new glock into the hash table. Also, to avoid having to wait for an RCU grace period, the glock counter can be decremented before call_rcu() is called. Signed-off-by: Steven Whitehouse commit fa4d1f595a89234647b34a7f507436be873091bc Author: Jarkko Nikula Date: Wed Mar 9 11:25:00 2011 +0200 ASoC: omap: rx51: Enable McBSP2 sidetone McBSP sidetone is needed in telephony applications. McBSP sidetone is a configurable FIR filter that forms a loopback from McBSP input to output. This patch enables the McBSP2 sidetone ALSA controls so that it can be used on Nokia RX-51/N900. Sidetone feature can be tested with following commands: (set up codec input and output paths) # Enable and configure sidetone amixer -D hw:0 set 'McBSP2 Sidetone' on amixer set -D hw:0 'McBSP2 Sidetone Channel 0' 32767 echo 32767 >/sys/devices/platform/omap-mcbsp.2/st_taps # Do not loop audio via CPU arecord -f dat >/dev/null |aplay /dev/zero Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 981a95d37126cdf09e1dba3884305c2e25375bfb Author: Shiraz Hashim Date: Mon Mar 7 05:57:08 2011 +0100 ARM: 6794/1: SPEAr: Append UL to device address macros. Reviewed-by: Stanley Miao Signed-off-by: Shiraz Hashim Signed-off-by: Rajeev Kumar Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 8fc4ef451eebc72d10c6987b59ec3316da62f02b Author: viresh kumar Date: Mon Mar 7 05:57:07 2011 +0100 ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files Now we used standard SZ_* macros instead of self defined *_SIZE macros. This patch removes all such unused *_SIZE macros for spear3xx & 6xx. Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 53821162fce0e69a8d9fb98ae87ce27c1b500b8e Author: viresh kumar Date: Mon Mar 7 05:57:06 2011 +0100 ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros Resource size required mostly is 4K for all devices, whereas currently reserved space is much beyond that. This patch replaces SIZE macro's used at multiple places with SZ_4K. Reviewed-by: Stanley Miao Signed-off-by: Viresh Kumar Signed-off-by: Shiraz Hashim Signed-off-by: Rajeev Kumar Signed-off-by: Russell King commit c2c07831a76ca64670df9cc315087962f6fdceac Author: viresh kumar Date: Mon Mar 7 05:57:05 2011 +0100 ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code Order of declarations should be: pmx_devs, shirq support, amba_devices, plat_devices, routines. This patch moves gpio_device below shirq support. Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit b5761371c30009565f88c4c60416de8a24e56f02 Author: viresh kumar Date: Mon Mar 7 05:57:04 2011 +0100 ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry Reviewed-by: Stanley Miao Signed-off-by: Deepak Sikri Signed-off-by: shiraz hashim Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 069580b831dba8da8a0751770ee2b2d7a43faf33 Author: viresh kumar Date: Mon Mar 7 05:57:03 2011 +0100 ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci Device name of SD/MMC/SDIO controller in linux is sdhci. To maintain consistency across all spear code, rename sdio to sdhci. Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 02aa06bc49fdb1749f350649c46b74da50290414 Author: viresh kumar Date: Mon Mar 7 05:57:02 2011 +0100 ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h This patch makes inclusion of hardware.h and spear.h consistent over all spear variants. Now we will include hardware.h, wherever we need to use hardware macros. spear.h will be automatically included by hardware.h Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 410782beba6aa75744881810ec0cdff4c66ca777 Author: viresh kumar Date: Mon Mar 7 05:57:01 2011 +0100 ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files. Order of inclusion of .h files must be: , , , . This patch corrects this ordering whereever it is not followed. Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 4b9502e167d8370c2c5ee0cb20ab081bbebfffa8 Author: Shiraz Hashim Date: Wed Feb 16 07:40:40 2011 +0100 ARM: 6681/1: SPEAr: add debugfs support to clk API Reviewed-by: Stanley Miao Signed-off-by: Shiraz Hashim Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit af89fd812b00a52c54a3b9b2290fae4d31c7be9a Author: viresh kumar Date: Wed Feb 16 07:40:39 2011 +0100 ARM: 6703/1: SPEAr: update clk API support - Add support for divisor per parent clock - Add ENABLED_ON_INIT feature in clk - Add clk_set_rate(), round_rate_index & clk_round_rate() - Simplify clk_recalc functions - Add/update clock definitions Reviewed-by: Stanley Miao Signed-off-by: Viresh Kumar Signed-off-by: shiraz hashim Signed-off-by: Rajeev Kumar Signed-off-by: Russell King commit cf285434ac0880f94bf4afdd90b06a4655f56570 Author: viresh kumar Date: Wed Feb 16 07:40:31 2011 +0100 ARM: 6679/1: SPEAr: make clk API functions more generic - Add a dummy clk_set_rate() function. This is required for compilation of a few drivers. - Make functions in plat-spear/clock.c more generic over all SPEAr platforms. - Add div_factor in struct clk for clks with .recalc = follow_parent - Change type of register pointers to void __iomem * Reviewed-by: Stanley Miao Signed-off-by: Viresh Kumar Signed-off-by: Rajeev Kumar Signed-off-by: Russell King commit 5c881d9ae9480171f01921585e1893863d7ab421 Author: Shiraz Hashim Date: Wed Feb 16 07:40:32 2011 +0100 ARM: 6737/1: SPEAr: formalized timer support Move platform specific timer initialization code is moved into platform specific files. Reviewed-by: Jamie Iles Reviewed-by: Stanley Miao Signed-off-by: Shiraz Hashim Signed-off-by: Rajeev Kumar Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 53688c51e412b7fd642e5c8eb8ba8ee19744c4ea Author: viresh kumar Date: Wed Feb 16 07:40:30 2011 +0100 ARM: 6678/1: SPEAr: update padmux code - compile padmux only for spear3xx - padmux initialization code rearranged in evaluation board and machine files. Reviewed-by: Stanley Miao Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit f9324a85c10ee109022672ec72db9e2eb37050ee Author: viresh kumar Date: Wed Feb 16 07:40:28 2011 +0100 ARM: 6677/1: SPEAr: add IOMEM(x) definition and update declaration of MISC_BASE Add IOMEM(x) definition, and use it with MISC_BASE for SPEAr platform. With this there is no need to typecast misc macros to (unsigned int *). Reviewed-by: Stanley Miao Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit c49aa5bd1376939b40759a6da5ba6cf701702721 Author: Jan Beulich Date: Tue Mar 8 09:24:26 2011 +0000 x86: Remove dead config option X86_CPU This isn't being referenced anywhere, and the selects done from it can be easily done together with all the other X86 ones. v2: Also adjust UML's Kconfig.x86. Signed-off-by: Jan Beulich LKML-Reference: <4D7603DA02000078000351C1@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit c8b44163b754612fc4769fe1c5df00e98fc9d3c6 Merge: ac23f25 a5abba9 Author: Ingo Molnar Date: Wed Mar 9 10:38:55 2011 +0100 Merge commit 'v2.6.38-rc8' into x86/asm Merge reason: Update with the latest fixes. Signed-off-by: Ingo Molnar commit 662e3a551b468c7338f5291d7a00389fe85885e2 Author: Abhijith Das Date: Tue Mar 8 10:40:42 2011 -0500 GFS2: quota allows exceeding hard limit Immediately after being synced to disk, cached quotas are zeroed out and a subsequent access of the cached quotas results in incorrect zero values. This meant that gfs2 assumed the actual usage to be the zero (or near-zero) usage values it found in the cached quotas and comparison against warn/limits never triggered a quota violation. This patch adds a new flag QDF_REFRESH that is set after a sync so that the cached quotas are forcefully refreshed from disk on a subsequent access on seeing this flag set. Resolves: rhbz#675944 Signed-off-by: Abhi Das Signed-off-by: Steven Whitehouse commit 2ae9d293b14d17f35eff624272cfecac7979a2ee Author: Sedat Dilek Date: Tue Mar 8 22:39:24 2011 +0100 x86: Fix binutils-2.21 symbol related build failures New binutils version 2.21.0.20110302-1 started checking that the symbol parameter to the .size directive matches the entry name's symbol parameter, unearthing two mismatches: AS arch/x86/kernel/acpi/wakeup_rm.o arch/x86/kernel/acpi/wakeup_rm.S: Assembler messages: arch/x86/kernel/acpi/wakeup_rm.S:12: Error: .size expression with symbol `wakeup_code_start' does not evaluate to a constant arch/x86/kernel/entry_32.S: Assembler messages: arch/x86/kernel/entry_32.S:1421: Error: .size expression with symbol `apf_page_fault' does not evaluate to a constant The problem was discovered while using Debian's binutils (2.21.0.20110302-1) and experimenting with binutils from upstream. Thanks Alexander and H.J. for the vital help. Signed-off-by: Sedat Dilek Cc: Alexander van Heukelum Cc: H.J. Lu Cc: Len Brown Cc: Pavel Machek Cc: Rafael J. Wysocki LKML-Reference: <1299620364-21644-1-git-send-email-sedat.dilek@gmail.com> Signed-off-by: Ingo Molnar commit 910672dee56ab5909790cca2d1df7d782f9cea73 Author: Tobias Klauser Date: Wed Mar 2 18:38:35 2011 +0100 microblaze: Fix typo in Kconfig s/Exectuable/Executable/ Signed-off-by: Tobias Klauser commit d50c3036fa83e72f738874cf3b81a94678ceb161 Author: Michal Simek Date: Thu Feb 24 15:36:49 2011 +0100 microblaze: Add missing export symbols for lib functions Adding missing export symbols for loadable modules. Signed-off-by: Michal Simek commit 6f3946b421395ff853bc0bcdab9c26b50ebbba8f Author: Steven J. Magnani Date: Thu Feb 10 12:12:13 2011 -0600 microblaze: Fix /dev/zero corruption from __clear_user() A userland read of more than PAGE_SIZE bytes from /dev/zero results in (a) not all of the bytes returned being zero, and (b) memory corruption due to zeroing of bytes beyond the user buffer. This is caused by improper constraints on the assembly __clear_user function. The constrints don't indicate to the compiler that the pointer argument is modified. Since the function is inline, this results in double-incrementing of the pointer when __clear_user() is invoked through a multi-page read() of /dev/zero. Signed-off-by: Steven J. Magnani Acked-by: Michal Simek CC: stable@kernel.org commit 6f205a4c69037e4d8fdf33088a852b64500df012 Author: Thomas Gleixner Date: Sun Feb 6 19:36:30 2011 +0000 microblaze: Convert irq_chip to new functions Use proper irq_desc wrappers while at it. Signed-off-by: Thomas Gleixner Signed-off-by: Michal Simek commit 208a34f55f1ba4964e5a06b6876a84dc454f1d92 Author: Thomas Gleixner Date: Sun Feb 6 19:36:33 2011 +0000 microblaze: Select GENERIC_HARDIRQS_NO_DEPRECATED All irq_chips converted. Signed-off-by: Thomas Gleixner commit 6c3564d3f6a12b835ca95630927503a6ace94762 Author: Thomas Gleixner Date: Sun Feb 6 19:36:28 2011 +0000 microblaze: Remove stale irq_chip.end irq_chip.end got obsolete with the removal of __do_IRQ(). Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Tested-by: Michal Simek LKML-Reference: <20110203004210.240154507@linutronix.de> commit 2cfedb97d6b3001d58c785839a8bc402374fe9f8 Author: Michal Simek Date: Mon Feb 7 12:25:37 2011 +0100 microblaze: Fix sparse warnings - signal.c Warning log: CHECK arch/microblaze/kernel/signal.c arch/microblaze/kernel/signal.c:200:9: warning: Using plain integer as NULL pointer arch/microblaze/kernel/signal.c:201:9: warning: incorrect type in initializer (different address spaces) arch/microblaze/kernel/signal.c:201:9: expected void [noderef] *volatile __gu_val arch/microblaze/kernel/signal.c:201:9: got void * Signed-off-by: Michal Simek commit 5213a9c3b663dd946d7c8bdfc9180983bd03a2a1 Author: Michal Simek Date: Mon Feb 7 12:24:39 2011 +0100 microblaze: Fix sparse warning - fault.c Warning log: CHECK arch/microblaze/mm/fault.c arch/microblaze/mm/fault.c:51:6: warning: incorrect type in initializer (different address spaces) arch/microblaze/mm/fault.c:51:6: expected unknown type 2const [noderef] *__gu_addr arch/microblaze/mm/fault.c:51:6: got unsigned int * arch/microblaze/mm/fault.c:68:6: warning: symbol 'bad_page_fault' was not declared. Should it be static? Signed-off-by: Michal Simek commit 4302e5254a8a9e726db444763be1e95e063406fb Author: Michal Simek Date: Mon Feb 7 12:22:55 2011 +0100 microblaze: Fix missing microblaze specific syscalls declaration Warning log: CHECK arch/microblaze/kernel/sys_microblaze.c arch/microblaze/kernel/sys_microblaze.c:37:17: warning: symbol 'microblaze_vfork' was not declared. Should it be static? arch/microblaze/kernel/sys_microblaze.c:43:17: warning: symbol 'microblaze_clone' was not declared. Should it be static? arch/microblaze/kernel/sys_microblaze.c:50:17: warning: symbol 'microblaze_execve' was not declared. Should it be static? Signed-off-by: Michal Simek commit 954e8b9599d64a959fe81cfaa8b0e0ee6387271c Author: Michal Simek Date: Mon Feb 7 12:21:42 2011 +0100 microblaze: Fix sparse warnings - cache.c Warning log: CHECK arch/microblaze/kernel/cpu/cache.c arch/microblaze/kernel/cpu/cache.c:522:21: warning: symbol 'wb_msr' was not declared. Should it be static? arch/microblaze/kernel/cpu/cache.c:538:21: warning: symbol 'wb_nomsr' was not declared. Should it be static? arch/microblaze/kernel/cpu/cache.c:554:21: warning: symbol 'wt_msr' was not declared. Should it be static? arch/microblaze/kernel/cpu/cache.c:569:21: warning: symbol 'wt_nomsr' was not declared. Should it be static? arch/microblaze/kernel/cpu/cache.c:585:21: warning: symbol 'wt_msr_noirq' was not declared. Should it be static? arch/microblaze/kernel/cpu/cache.c:600:21: warning: symbol 'wt_nomsr_noirq' was not declared. Should it be static? Signed-off-by: Michal Simek commit 8afe3839a993beda2ebc119c0a545dcc5baecc08 Author: Michal Simek Date: Mon Feb 7 11:56:14 2011 +0100 microblaze: Fix sparse warning - cpuinfo.h Warning log: CHECK arch/microblaze/kernel/cpu/cpuinfo-static.c arch/microblaze/include/asm/cpuinfo.h:101:21: warning: incorrect type in argument 1 (different signedness) arch/microblaze/include/asm/cpuinfo.h:101:21: expected unsigned int const [usertype] *p arch/microblaze/include/asm/cpuinfo.h:101:21: got int *[assigned] val ... Signed-off-by: Michal Simek commit 419ef3406a16dfb765538f7bd67728fef9877472 Author: Michal Simek Date: Mon Feb 7 11:51:07 2011 +0100 microblaze: Fix sparse warning - unwind.c Warning log: CHECK arch/microblaze/kernel/unwind.c arch/microblaze/kernel/unwind.c:186:6: warning: symbol 'microblaze_unwind_inner' was not declared. Should it be static? Signed-off-by: Michal Simek commit cd44da154241170be3f1fadb1f2ca689f6802628 Author: Michal Simek Date: Mon Feb 7 11:42:37 2011 +0100 microblaze: Fix sparse warning - consistent_alloc function Warning in dma.c was caused by incorrect type in consistent_alloc function. Warning log: CHECK arch/microblaze/kernel/dma.c arch/microblaze/kernel/dma.c:53:26: warning: incorrect type in argument 1 (different base types) arch/microblaze/kernel/dma.c:53:26: expected int [signed] gfp arch/microblaze/kernel/dma.c:53:26: got restricted unsigned int [usertype] flag Signed-off-by: Michal Simek commit c1df53b33c818d28d5e3b287530373e78a7904e7 Author: Michal Simek Date: Mon Feb 7 11:38:57 2011 +0100 microblaze: Fix sparse warnings - ptrace Warning log: CHECK arch/microblaze/kernel/ptrace.c arch/microblaze/kernel/ptrace.c:126:11: warning: incorrect type in initializer (different address spaces) arch/microblaze/kernel/ptrace.c:126:11: expected unknown type 2[noderef] *__pu_addr arch/microblaze/kernel/ptrace.c:126:11: got unsigned long * arch/microblaze/kernel/ptrace.c:134:17: warning: symbol 'do_syscall_trace_enter' was not declared. Should it be static? arch/microblaze/kernel/ptrace.c:157:17: warning: symbol 'do_syscall_trace_leave' was not declared. Should it be static? Signed-off-by: Michal Simek commit f699980b0d3c0f4f31e07ef45a48bbe860510a89 Author: Michal Simek Date: Mon Feb 7 11:36:25 2011 +0100 microblaze: Fix sparse warning - sw_exceptions Function sw_exception is linked with asm code. Warning log: CHECK arch/microblaze/kernel/exceptions.c arch/microblaze/kernel/exceptions.c:53:6: warning: symbol 'sw_exception' was not declared. Should it be static? Signed-off-by: Michal Simek commit 29e3dbb10f0efff1297026679364dacc2c822145 Author: Michal Simek Date: Mon Feb 7 11:33:47 2011 +0100 microblaze: Fix sparse warning - timer.c Variables and init_microblaze_timecounter should be static. Warning log: CHECK arch/microblaze/kernel/timer.c arch/microblaze/kernel/timer.c:41:14: warning: symbol 'freq_div_hz' was not declared. Should it be static? arch/microblaze/kernel/timer.c:42:14: warning: symbol 'timer_clock_freq' was not declared. Should it be static? arch/microblaze/kernel/timer.c:205:12: warning: symbol 'init_microblaze_timecounter' was not declared. Should it be static? Signed-off-by: Michal Simek commit fe34c478d14480c9e389f71e6bcf62827f86c089 Author: Michal Simek Date: Mon Feb 7 11:32:09 2011 +0100 microblaze: Fix sparse warning - prom.c Warning log: CHECK arch/microblaze/kernel/dma.c arch/microblaze/kernel/dma.c:53:26: warning: incorrect type in argument 1 (different base types) arch/microblaze/kernel/dma.c:53:26: expected int [signed] gfp arch/microblaze/kernel/dma.c:53:26: got restricted unsigned int [usertype] flag Signed-off-by: Michal Simek commit 5323c48b0cfd98d93eb29907450ca48d009545ad Author: Michal Simek Date: Thu Feb 10 08:37:49 2011 +0100 microblaze: Add support for DMA_BIDIRECTIONAL CDMA requires DMA_BIDIRECTIONAL option. Signed-off-by: Michal Simek commit 0a2e1d23f2976287904e611b195f628a52b299b1 Author: Michal Simek Date: Tue Jul 21 12:58:21 2009 +0200 microblaze: trivial: Add one empty line Add one empty line to microblaze_ksyms.c. Remove one empty line to cacheflush.h. Signed-off-by: Michal Simek commit 702d54277af852b99c05c42cc988bb2f9dede93b Author: Michal Simek Date: Tue Feb 8 14:55:09 2011 +0100 microblaze: Fix coding style - ptrace.h Use tab instead of spaces. Signed-off-by: Michal Simek commit a9dbe5eb1fcb4b70313cf9cb1b6c1d994ba703d6 Author: Michal Simek Date: Wed Feb 9 14:23:34 2011 +0100 microblaze: Add PVR for Microblaze v8.10.a Microblaze v8.10.a has 0x14 version string. Signed-off-by: Michal Simek commit b9dc9e7781f1c3e85e0d1b8044021fa8974422b1 Author: Michal Simek Date: Mon May 31 21:16:30 2010 +0200 microblaze: Label MB 7.20.d as broken with WB cache MB version 7.20.d contains fault which is related with WB that's why error message will be shown. Signed-off-by: Michal Simek commit a706729c3df22d5cf4a50a02c25f5ebfcb370c82 Author: Michal Simek Date: Fri May 28 14:45:38 2010 +0200 microblaze: Fix GDB issue caused by cache issue Used the same solution as SH. Changed len to PAGE_SIZE in copy_to_user_page macro. Implement flush_cache_page macro. Signed-off-by: Michal Simek commit cd3415779bdb13e3daaf13965c89d286a0cf0480 Author: Michal Simek Date: Tue Feb 1 09:00:57 2011 +0100 microblaze: Do not use "la" pseudo instruction - use addik instead "la" pseudo instruction is only translation to "addik". Use directly "addik" which is described in the MB reference guide. Signed-off-by: Michal Simek commit 6e83557c38b40d6e9d1c82ad0ae59d8e5db9c50c Author: Michal Simek Date: Mon Jan 31 15:10:04 2011 +0100 microblaze: Remove r0_ram pointer and PTO alignment r0_ram pool was used for saving/restoring register content if hw exception happen. This poll was replaced by pt_pool_space with PT_SIZE size. Based on this change SAVE_STATE_ARG_SPACE was removed which caused that PTO offset is zero that's why is also removed. r0_ram space was used as scratchpad by v850. In early Microblaze Linux developing phase was this part of code blindly copied. Signed-off-by: Michal Simek commit d8748e73e882106ff0ffa0fa2192dab111a9f9f8 Author: Michal Simek Date: Mon Jan 31 15:04:43 2011 +0100 microblaze: Do not use r0_ram space for syscall debugging Remove syscall counting space from r0_ram. Use special syscall_debug_table pool for syscall statistic. Signed-off-by: Michal Simek commit 495162dfefe3f6e3a8e908aa2f0a964a572d3e87 Author: Michal Simek Date: Mon Jan 31 14:57:26 2011 +0100 microblaze: Optimize BE/LE bootup detecting Save 0x1 word to rodata section and remove online value loading if DTB is passed from bootloader. It saves two asm instructions in bootup. Signed-off-by: Michal Simek commit 601149775158ea825326734c2db5d90190249bd7 Author: Michal Simek Date: Fri Feb 18 14:29:20 2011 +0100 microblaze: Fix unaligned.h for endians Synchronized with mips unaligned.h. Signed-off-by: Michal Simek commit c06b3a068223cb885d85ac4f6c31e870ca2b5aac Author: Michal Simek Date: Mon Jan 31 15:07:53 2011 +0100 microblaze: Do not use r0_ram space for hw exception debugging Remove hw exception counting space from r0_ram. Use special exception_debug_table poll for exception statistic. Signed-off-by: Michal Simek commit c151694b2c48d956ac8c8c59c6927f89cc29ef70 Merge: fe3fa43 1936113 Author: James Morris Date: Wed Mar 9 14:12:07 2011 +1100 Merge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next commit e3154e9748f0f337e9f6ff9dc7d7bf24d426bd1a Author: Ryusuke Konishi Date: Wed Mar 9 11:05:08 2011 +0900 nilfs2: get rid of nilfs_sb_info structure This directly uses sb->s_fs_info to keep a nilfs filesystem object and fully removes the intermediate nilfs_sb_info structure. With this change, the hierarchy of on-memory structures of nilfs will be simplified as follows: Before: super_block -> nilfs_sb_info -> the_nilfs -> cptree --+-> nilfs_root (current file system) +-> nilfs_root (snapshot A) +-> nilfs_root (snapshot B) : -> nilfs_sc_info (log writer structure) After: super_block -> the_nilfs -> cptree --+-> nilfs_root (current file system) +-> nilfs_root (snapshot A) +-> nilfs_root (snapshot B) : -> nilfs_sc_info (log writer structure) The reason why we didn't design so from the beginning is because the initial shape also differed from the above. The early hierachy was composed of "per-mount-point" super_block -> nilfs_sb_info pairs and a shared nilfs object. On the kernel 2.6.37, it was changed to the current shape in order to unify super block instances into one per device, and this cleanup became applicable as the result. Signed-off-by: Ryusuke Konishi commit f7545144c2e3d280139260df934043e0a6ccce6f Author: Ryusuke Konishi Date: Wed Mar 9 11:05:08 2011 +0900 nilfs2: use sb instance instead of nilfs_sb_info struct This replaces sbi uses with direct reference to sb instance. Signed-off-by: Ryusuke Konishi commit d96bbfa28aa7a1d5a5bf549026a594d7a273c5d7 Author: Ryusuke Konishi Date: Wed Mar 9 11:05:08 2011 +0900 nilfs2: get rid of sc_sbi back pointer Removes sci->sc_sbi which is a back pointer to nilfs_sb_info struct from log writer object (nilfs_sc_info). Signed-off-by: Ryusuke Konishi commit 3fd3fe5aeaa171a5638d2bb54a1a170eab7b7cdc Author: Ryusuke Konishi Date: Wed Mar 9 11:05:08 2011 +0900 nilfs2: move log writer onto nilfs object Log writer is held by the nilfs_sb_info structure. This moves it into nilfs object and replaces all uses of NILFS_SC() accessor. Signed-off-by: Ryusuke Konishi commit 9b1fc4e4973469dd3fab27ba5d78eca1cd5c13fe Author: Ryusuke Konishi Date: Wed Mar 9 11:05:08 2011 +0900 nilfs2: move next generation counter into nilfs object Moves s_next_generation counter and a spinlock protecting it to nilfs object from nilfs_sb_info structure. Signed-off-by: Ryusuke Konishi commit 693dd321222f03b17668f88ceb0f7d518900191e Author: Ryusuke Konishi Date: Wed Mar 9 11:05:07 2011 +0900 nilfs2: move s_inode_lock and s_dirty_files into nilfs object Moves s_inode_lock spinlock and s_dirty_files list to nilfs object from nilfs_sb_info structure. Signed-off-by: Ryusuke Konishi commit 574e6c3145c5754141361c695b58736c294a8ae1 Author: Ryusuke Konishi Date: Wed Mar 9 11:05:07 2011 +0900 nilfs2: move parameters on nilfs_sb_info into nilfs object This moves four parameter variables on nilfs_sb_info s_resuid, s_resgid, s_interval and s_watermark to the nilfs object. Signed-off-by: Ryusuke Konishi commit 3b2ce58b0f3c1633750529713be0e467282abd78 Author: Ryusuke Konishi Date: Wed Mar 9 11:05:07 2011 +0900 nilfs2: move mount options to nilfs object This moves mount_opt local variable to nilfs object from nilfs_sb_info struct. Signed-off-by: Ryusuke Konishi commit 1936113c820bc3bfac49c266ccf972f7f8552aae Author: Shan Wei Date: Fri Jan 21 10:13:13 2011 +0800 AppArmor: kill unused macros in lsm.c Remove unused macros. Signed-off-by: Shan Wei Signed-off-by: John Johansen commit 0f8250265623e57971cbb57fc8d92e58dd883a19 Author: Michal Hocko Date: Fri Jan 7 15:03:02 2011 +0100 AppArmor: cleanup generated files correctly clean-files should be defined as a variable not a target. Signed-off-by: Michal Hocko Signed-off-by: John Johansen commit 0997b173609b9229ece28941c118a2a9b278796e Author: J. Bruce Fields Date: Wed Mar 2 18:01:35 2011 -0500 nfsd4: fix struct file leak Make sure we properly reference count the struct files that a lock depends on, and release them when the lock stateid is released. This fixes a major leak of struct files when using locking over nfsv4. Cc: stable@kernel.org Reported-by: Rick Koshi Tested-by: Ivo PÅ™ikryl Signed-off-by: J. Bruce Fields commit 529d7b2a7fa31e9f7d08bc790d232c3cbe64fa24 Author: J. Bruce Fields Date: Wed Mar 2 23:48:33 2011 -0500 nfsd4: minor nfs4state.c reshuffling Minor cleanup in preparation for a bugfix--moving some code to avoid forward references, etc. No change in functionality. Cc: stable@kernel.org Signed-off-by: J. Bruce Fields commit bf9dd36091695f1138a98b6ae85d565e60635545 Author: Rob Herring Date: Fri Mar 4 23:51:59 2011 +0100 ARM: 6786/1: enable CONFIG_KTIME_SCALAR Use straight 64-bit values as 64-bit operations are fairly efficient on ARM. Comparing the asm output with and without KTIME_SCALAR, using 64-bit math generates clearly better code. Comparing kernel/hrtimer.c .text size, it goes from 0x1414 to 0x119c with this change. Signed-off-by: Rob Herring Signed-off-by: Russell King commit 1cf7cf06c92ba46ac0e0654ad8aad4c93ae412db Author: Nicolas Pitre Date: Wed Mar 2 18:08:55 2011 +0100 ARM: 6778/1: compressed/head.S: make LDFLAGS_vmlinux into a recursively expanded variable The simply expanded variable may be evaluated before the target file for the stat command is up to date or even exists. Switching to a recursively expanded variable move the execution of the stat command to the location where LDFLAGS_vmlinux is actually used, fixing the dependency issue introduced by patch #6746/1. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit d7ed36a4ea84e3a850f9932e2058ceef987d1acd Author: Santosh Shilimkar Date: Wed Mar 2 08:03:22 2011 +0100 ARM: 6777/1: gic: Add hooks for architecture specific extensions Few architectures combine the GIC with an external interrupt controller. On such systems it may be necessary to update both the GIC registers and the external controller's registers to control IRQ behavior. This can be addressed in couple of possible methods. 1. Export common GIC routines along with 'struct irq_chip gic_chip' and allow architectures to have custom function by override. 2. Provide architecture specific function pointer hooks within GIC library and leave platforms to add the necessary code as part of these hooks. First one might be non-intrusive but have few shortcomings like arch needs to have there own custom gic library. Locks used should be common since it caters to same IRQs etc. Maintenance point of view also it leads to multiple file fixes. The second probably is cleaner and portable. It ensures that all the common GIC infrastructure is not touched and also provides archs to address their specific issue. Cc: Russell King Signed-off-by: Santosh Shilimkar Acked-by: Colin Cross Tested-by: Colin Cross Signed-off-by: Russell King commit 4bdb157749a0da065e532f2f46040c178075b06f Author: Santosh Shilimkar Date: Tue Feb 22 10:00:44 2011 +0100 ARM: 6755/1: omap4: l2x0: Populate set_debug() function and enable Errata 727915 Populate the l2x0 set_debug function pointer with OMAP secure call and enable the PL310 Errata 727915 This patch has dependency on the earlier patch ARM: l2x0: Errata fix for flush by Way operation can cause data corruption Signed-off-by: Santosh Shilimkar Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit 2839e06c95d12ada034cf9b63da60334c7c6358b Author: Santosh Shilimkar Date: Tue Mar 8 06:59:54 2011 +0100 ARM: 6795/1: l2x0: Errata fix for flush by Way operation can cause data corrupti PL310 implements the Clean & Invalidate by Way L2 cache maintenance operation (offset 0x7FC). This operation runs in background so that PL310 can handle normal accesses while it is in progress. Under very rare circumstances, due to this erratum, write data can be lost when PL310 treats a cacheable write transaction during a Clean & Invalidate by Way operation. Workaround: Disable Write-Back and Cache Linefill (Debug Control Register) Clean & Invalidate by Way (0x7FC) Re-enable Write-Back and Cache Linefill (Debug Control Register) This patch also removes any OMAP dependency on PL310 Errata's Signed-off-by: Santosh Shilimkar Acked-by: Catalin Marinas Signed-off-by: Russell King commit 0640b436e410290193f554dcfd777bcdeee59697 Author: Abhilash Vadakkepat Koyamangalath Date: Tue Mar 8 15:13:24 2011 +0000 audio : AM3517 : Adding i2c info for AIC23 codec The i2c_board_info entry supporting AIC23 codec was added into the i2c2 bus. Signed-off-by: Abhilash K V Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit e7916740bb76379bcde4ce0317259acff8f89f53 Author: Paul Walmsley Date: Fri Mar 4 22:36:46 2011 +0000 OMAP1: McBSP: fix build break for non-multi-OMAP1 configs Commit 3cf32bba8ca0e0052ca41d74d455a5805b7fea85 ("OMAP: McBSP: Convert McBSP to platform device model") breaks compilation with non-multi-OMAP1 configs: CC arch/arm/mach-omap1/mcbsp.o arch/arm/mach-omap1/mcbsp.c: In function 'omap1_mcbsp_init': arch/arm/mach-omap1/mcbsp.c:384: warning: dereferencing 'void *' pointer arch/arm/mach-omap1/mcbsp.c:387: error: invalid use of void expression arch/arm/mach-omap1/mcbsp.c:390: warning: dereferencing 'void *' pointer arch/arm/mach-omap1/mcbsp.c:393: error: invalid use of void expression Fix by avoiding NULL dereferences. Signed-off-by: Paul Walmsley Cc: Kishon Vijay Abraham I Cc: Tony Lindgren Acked-by: Jarkko Nikula [tony@atomide.com: updated description not to remove unnecessary branch name] Signed-off-by: Tony Lindgren commit 7b46ac4e77f3224a1befe032c77f1df31d1b42c4 Author: David S. Miller Date: Tue Mar 8 14:59:28 2011 -0800 inetpeer: Don't disable BH for initial fast RCU lookup. If modifications on other cpus are ok, then modifications to the tree during lookup done by the local cpu are ok too. Signed-off-by: David S. Miller commit c7831df3937f54bddc20128892a75373549516d0 Author: Stepan Moskovchenko Date: Mon Feb 28 16:04:56 2011 -0800 msm: iommu: Enable HTW L2 redirection on MSM8960 Allow the MSM8960 IOMMU to access its page tables directly through the L2 cache. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit b0e7808d548ea1d857216d31d63078411203a116 Author: Stepan Moskovchenko Date: Mon Feb 28 16:04:55 2011 -0800 msm: iommu: Don't read from write-only registers Don't read from V2Pxx command registers when doing iova-to-phys operations. These registers are write-only and reading the value before modifying the VA bits is unnecessary. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit a43d8c101eb71bf4527dd7f36a34a5a502894f38 Author: Stepan Moskovchenko Date: Thu Feb 24 18:00:42 2011 -0800 msm: iommu: Remove dependency on IDR Remove the depencency on the IOMMU IDR register, as it may not be accessible depending on the security configuraton. This involves moving the NCB field of IDR into the platform data. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 2e8c8ba98376459e73d03a285f5d3406b630ea2d Author: Stepan Moskovchenko Date: Thu Feb 24 18:00:41 2011 -0800 msm: iommu: Use ASID tagging instead of VMID tagging Use ASID tags in the TLB instead of VMID tags in preparation for changes to the secure environment. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit b61401adf38f56dbfdac91f31425edf60595ed30 Author: Stepan Moskovchenko Date: Mon Feb 28 16:03:02 2011 -0800 msm: iommu: Rework clock logic and add IOMMU bus clock control Clean up the clock control code in the probe calls, and add support for controlling the clock for the IOMMU bus interconnect. With the (proper) clock driver in place, the clock control logic in the probe function can be made much cleaner since it does not have to deal with the placeholder driver anymore. Signed-off-by: Stepan Moskovchenko Reviewed-by: Trilok Soni Signed-off-by: David Brown commit 41f3f5138a5ea71ee603f3d556953fce9aba3074 Author: Stepan Moskovchenko Date: Thu Feb 24 18:00:39 2011 -0800 msm: iommu: Clock control for the IOMMU driver Add clock control to the IOMMU driver. The IOMMU bus clock (and potentially an AXI clock) need to be on to gain access to IOMMU registers. Actively control these clocks when needed instead of leaving them on. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 5217e8794619ac0a29151f29be20c7d6188303ba Author: Andy Gospodarek Date: Tue Mar 8 14:26:00 2011 -0800 ixgbe: fix compile failure in ixgbe_init_mbx_params_pf This commit: commit d7c8a29fc8bd20ba45ec2f52577ed04a988a9500 Author: Emil Tantilov Date: Thu Mar 3 09:25:02 2011 +0000 ixgbe: improve logic in ixgbe_init_mbx_params_pf incorrectly added a line that accessed mbx->udelay. I'm sure the intent was mbx->usec_delay. This patch fixes the compilation error. Signed-off-by: Andy Gospodarek Signed-off-by: David S. Miller commit fdb838cdae4d4f2a478e5cfdd84026f7960b69dd Author: Peter Korsgaard Date: Mon Mar 7 05:49:47 2011 +0000 dsa/mv88e6060: support nonzero mii base address The mv88e6060 uses either the lower 16 or upper 16 mii addresses, depending on the value of the EE_CLK/ADDR4 pin. Support both configurations by using the sw_addr setting as base address. Signed-off-by: Peter Korsgaard Acked-by: Lennert Buytenhek Signed-off-by: David S. Miller commit 8671139b1da50fee188646d042c3757bc2945e14 Author: GeunSik Lim Date: Thu Mar 3 10:16:54 2011 +0900 Update cpuset info & webiste for cgroups cpuset related websited is changed. and, update list of cpuset using cgroup(controller group). Signed-off-by: Geunsik Lim Acked-by: Paul Menage Signed-off-by: Jiri Kosina commit 51de69523ffe1c17994dc2f260369f29dfdce71c Author: Owen Smith Date: Wed Dec 22 15:05:00 2010 +0000 xen: Union the blkif_request request specific fields Prepare for extending the block device ring to allow request specific fields, by moving the request specific fields for reads, writes and barrier requests to a union member. Acked-by: Jens Axboe Signed-off-by: Owen Smith Signed-off-by: Konrad Rzeszutek Wilk commit 8bec99b586e2aa285076c2057e72b70ab5c43175 Author: Dima Zavin Date: Wed Mar 2 13:18:19 2011 -0800 msm: mdp: Set the correct pack pattern for XRGB/ARGB Signed-off-by: Dima Zavin Signed-off-by: Carl Vanderlip Signed-off-by: David Brown commit 5d55779a5d95acdaa1080f1a4806fd6d4984d1e4 Author: Arve HjønnevÃ¥g Date: Wed Mar 2 13:17:51 2011 -0800 msm_fb: Fix framebuffer console Don't allow non panning updates to bypass the wait for the panel to turn on. Signed-off-by: Carl Vanderlip Signed-off-by: Arve HjønnevÃ¥g Signed-off-by: David Brown commit c01c6af84e5c397917496212f8c3f2942ec7012d Merge: bf745e8 65f0b41 Author: David S. Miller Date: Tue Mar 8 11:32:45 2011 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 commit bf745e88b733a2806dc4da8a9cd5a7e4d67543ab Merge: a7ac8fc 2b642ca Author: David S. Miller Date: Tue Mar 8 11:08:35 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit a7ac8fc1d8d26c975c460a69aa7b9d5b5d5d29b0 Author: David S. Miller Date: Tue Mar 8 11:03:21 2011 -0800 ipv4: Fix scope value used in route src-address caching. We have to use cfg->fc_scope not the final nh_scope value. Reported-by: Julian Anastasov Signed-off-by: David S. Miller commit 62f75aafdf180554b4fad29ff1f3827b151d39db Author: Dan Carpenter Date: Tue Mar 8 14:39:24 2011 +0300 ASoC: sgtl5000: use after free in ldo_regulator_register() The "ldo" variable was dereferenced after free on the error path. Signed-off-by: Dan Carpenter Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit efb7ac3f9c28fcb379c51f987b63174f727b7453 Author: Mark Brown Date: Tue Mar 8 17:23:24 2011 +0000 ASoC: Fix prefixing of DAPM controls by factoring prefix into snd_soc_cnew() Currently will ignore prefixes when creating DAPM controls. Since currently all control creation goes through snd_soc_cnew() we can fix this by factoring the prefixing into that function. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c4ef87867b42bd1fa7d6dacaa28bf07cf741a724 Author: Mark Brown Date: Tue Mar 8 00:17:56 2011 +0000 ASoC: Warn rather than set a silly constraint when we can't do symmetry Symmetric rate configuration can fail if the second stream starting tries to apply the symmetric constraint before the first stream has got far enough to pick a rate. Rather than try to enforce a nonsensical rate of 0Hz log a warning and allow the application to carry on. Things might go wrong later on but the user will know about it and there's unlikely to be lasting damage. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 4f333b20aef4459a24590fa8545e974f8f137f62 Author: Mark Brown Date: Tue Mar 8 00:11:15 2011 +0000 ASoC: Refactor symmetric_rates check to reduce indentation Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 63d24b79b66ea5d5b04dadb9e92f31c0141948fb Author: Mark Brown Date: Mon Mar 7 20:59:45 2011 +0000 ASoC: Convert WM9081 SYSCLK configuration to be device wide Also respace the CODEC ops a bit for legibility. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ec4ee52a8f5fb5b8e235ae9f02589d60d54740cc Author: Mark Brown Date: Mon Mar 7 20:58:11 2011 +0000 ASoC: Provide CODEC clocking operations and API calls When multi component systems use DAIless amplifiers which require clocking configuration it is at best hard to use the current clocking API as this requires a DAI even though the device may not even have one. Address this by adding set_sysclk() and set_pll() operations and APIs for CODECs. In order to avoid issues with devices which could be used either with or without DAIs make the DAI variants call through to their CODEC counterparts if there is no DAI specific operation. Converting over entirely would create problems for multi-DAI devices which offer per-DAI clocking setup. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit b993f92b99288d4b3a1a1237f3e40fa6460e4b47 Author: Mark Brown Date: Mon Mar 7 16:42:20 2011 +0000 ASoC: Fix section mismatch warnings in WM8994 Annoying as the __devinitdata is actually correct. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 149c7b441bc66b37325f0c494bfe9f303484bd88 Author: Mark Brown Date: Mon Mar 7 16:39:50 2011 +0000 ASoC: Use data based init for WM9081 DAPM Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 89b95ac09e408b5d88a8b3792dc76c863e45fb31 Author: Mark Brown Date: Mon Mar 7 16:38:44 2011 +0000 ASoC: Add DAPM widget and path data to CODEC driver structure Allow a slight simplification of CODEC drivers by allowing DAPM routes and widgets to be provided in a table. They will be instantiated at the end of CODEC probe. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c68fd4f3ca90de7d18c567e70b2c164078aefadf Author: Thomas Gleixner Date: Tue Mar 8 19:52:55 2011 +0100 genirq: Add comments to Kconfig switches Signed-off-by: Thomas Gleixner Cc: Sam Ravnborg commit df457f845e5449be2e7d96668791f789b3770ac7 Author: Justin TerAvest Date: Tue Mar 8 19:45:00 2011 +0100 blk-cgroup: Lower minimum weight from 100 to 10. We've found that we still get good, useful isolation at weights this low. I'd like to adjust the minimum so that any other changes can take these values into account. Signed-off-by: Justin TerAvest Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit a2800300f28bd1814f3ba8cfd93ecb0b00c2dfe3 Author: Takashi Iwai Date: Tue Mar 8 18:20:46 2011 +0100 ALSA: asihpi - Use %zd for size_t argument in error message Signed-off-by: Takashi Iwai commit 8b3e07ac908d005bb791410f594cce8744f6806a Author: J. Bruce Fields Date: Mon Mar 7 22:50:47 2011 -0500 svcrpc: fix rare race on unix_domain creation Note that "new" here is not yet fully initialized; auth_domain_put should be called only on auth_domains that have actually been added to the hash. Before this fix, two attempts to add the same domain at once could cause the hlist_del in auth_domain_put to fail. Signed-off-by: J. Bruce Fields commit 2a8247a2600c3e087a568fc68a6ec4eedac27ef1 Author: Jiri Olsa Date: Mon Feb 21 15:25:13 2011 +0100 kprobes: Disabling optimized kprobes for entry text section You can crash the kernel (with root/admin privileges) using kprobe tracer by running: echo "p system_call_after_swapgs" > ./kprobe_events echo 1 > ./events/kprobes/enable The reason is that at the system_call_after_swapgs label, the kernel stack is not set up. If optimized kprobes are enabled, the user space stack is being used in this case (see optimized kprobe template) and this might result in a crash. There are several places like this over the entry code (entry_$BIT). As it seems there's no any reasonable/maintainable way to disable only those places where the stack is not ready, I switched off the whole entry code from kprobe optimizing. Signed-off-by: Jiri Olsa Acked-by: Masami Hiramatsu Cc: acme@redhat.com Cc: fweisbec@gmail.com Cc: ananth@in.ibm.com Cc: davem@davemloft.net Cc: a.p.zijlstra@chello.nl Cc: eric.dumazet@gmail.com Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <1298298313-5980-3-git-send-email-jolsa@redhat.com> Signed-off-by: Ingo Molnar commit ea7145477a461e09d8d194cac4b996dc4f449107 Author: Jiri Olsa Date: Mon Mar 7 19:10:39 2011 +0100 x86: Separate out entry text section Put x86 entry code into a separate link section: .entry.text. Separating the entry text section seems to have performance benefits - caused by more efficient instruction cache usage. Running hackbench with perf stat --repeat showed that the change compresses the icache footprint. The icache load miss rate went down by about 15%: before patch: 19417627 L1-icache-load-misses ( +- 0.147% ) after patch: 16490788 L1-icache-load-misses ( +- 0.180% ) The motivation of the patch was to fix a particular kprobes bug that relates to the entry text section, the performance advantage was discovered accidentally. Whole perf output follows: - results for current tip tree: Performance counter stats for './hackbench/hackbench 10' (500 runs): 19417627 L1-icache-load-misses ( +- 0.147% ) 2676914223 instructions # 0.497 IPC ( +- 0.079% ) 5389516026 cycles ( +- 0.144% ) 0.206267711 seconds time elapsed ( +- 0.138% ) - results for current tip tree with the patch applied: Performance counter stats for './hackbench/hackbench 10' (500 runs): 16490788 L1-icache-load-misses ( +- 0.180% ) 2717734941 instructions # 0.502 IPC ( +- 0.079% ) 5414756975 cycles ( +- 0.148% ) 0.206747566 seconds time elapsed ( +- 0.137% ) Signed-off-by: Jiri Olsa Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Peter Zijlstra Cc: Linus Torvalds Cc: Andrew Morton Cc: Nick Piggin Cc: Eric Dumazet Cc: masami.hiramatsu.pt@hitachi.com Cc: ananth@in.ibm.com Cc: davem@davemloft.net Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20110307181039.GB15197@jolsa.redhat.com> Signed-off-by: Ingo Molnar commit 86cb2ec7b22a0a89b8660110dc03321fadbef45f Merge: 7f0030b a5abba9 Author: Ingo Molnar Date: Tue Mar 8 17:21:49 2011 +0100 Merge commit 'v2.6.38-rc8' into perf/core Merge reason: Merge latest fixes. Signed-off-by: Ingo Molnar commit fcc042a2806064ffcaed7a0c5cb710eca0e99108 Author: Michael S. Tsirkin Date: Sun Mar 6 13:33:49 2011 +0200 vhost: copy_from_user -> __copy_from_user copy_from_user is pretty high on perf top profile, replacing it with __copy_from_user helps. It's also safe because we do access_ok checks during setup. Signed-off-by: Michael S. Tsirkin commit d47effe1be0c4fc983306a9c704632e3a087eed8 Author: Krishna Kumar Date: Tue Mar 1 17:06:37 2011 +0530 vhost: Cleanup vhost.c and net.c Minor cleanup of vhost.c and net.c to match coding style. Signed-off-by: Krishna Kumar Signed-off-by: Michael S. Tsirkin commit 997772884036e6e121de39322179989154437d9f Author: Stanislaw Gruszka Date: Mon Mar 7 09:58:33 2011 +0100 debugobjects: Add hint for better object identification In complex subsystems like mac80211 structures can contain several timers and work structs, so identifying a specific instance from the call trace and object type output of debugobjects can be hard. Allow the subsystems which support debugobjects to provide a hint function. This function returns a pointer to a kernel address (preferrably the objects callback function) which is printed along with the debugobjects type. Add hint methods for timer_list, work_struct and hrtimer. [ tglx: Massaged changelog, made it compile ] Signed-off-by: Stanislaw Gruszka LKML-Reference: <20110307085809.GA9334@redhat.com> Signed-off-by: Thomas Gleixner commit 2d01b26a1b14ab248f850d858f2ff3de3ead6d33 Author: Steven Rostedt Date: Tue Mar 8 09:47:54 2011 -0500 ktest: Add STOP_TEST_AFTER to stop the test after a period of time Currently, if a test causes constant output but never reaches a boot prompt, or crashes, the test will never stop. Add STOP_TEST_AFTER to create a variable that will stop (and fail) the test after it has run for this amount of time. The default is 10 minutes. Setting this variable to -1 will disable it. Signed-off-by: Steven Rostedt commit 8ea0e063a78df91b1ca4d23ea8d4e2e3047f6950 Author: Steven Rostedt Date: Tue Mar 8 09:44:35 2011 -0500 ktest: Monitor kernel while running of user tests Record the console of tests to both the console and the log. Also, record the bug reports afte the test has completed. Currently, if a kernel bug happens while running the userland test, the test stops and will not record the kernel bug. This makes it difficult to solve what happened. Signed-off-by: Steven Rostedt commit 4651920e0ac7a596c1123a8efdcc2f6d2249deb3 Author: Steven Rostedt Date: Tue Mar 8 09:40:31 2011 -0500 ktest: Fix bug where the test would not end after failure The config STOP_AFTER_FAILURE is the number of seconds to continue the test when a failure is detected. This lets the monitor record more data to the logs and console that may be helpful in solving the bug that was found. But the test had a bug. If the failure caused multiple "Call Trace" stack dumps, the start time to compare the STOP_AFTER_FAILURE would constantly be reset. Only update the start time at the first "Call Trace" instance. Signed-off-by: Steven Rostedt commit 3410f6fd5e3e96de4b557a62b7a2fbf19d74b1cd Author: Steven Rostedt Date: Tue Mar 8 09:38:12 2011 -0500 ktest: Add BISECT_FILES to run git bisect on paths Add the config option BISECT_FILES that allows the user to specify what path in the kernel to run the git bisect on. Signed-off-by: Steven Rostedt commit c23dca7cd28eb1bf90053ce4ba30d65d22d2a81e Author: Steven Rostedt Date: Tue Mar 8 09:26:31 2011 -0500 ktest: Add BISECT_SKIP If a during a git bisect, ktest fails on something other than what it is testing (if BISECT_TYPE is test but it fails on build), if BISECT_SKIP is set, then it will do a "git bisect skip" instead of just failing the bisect and letting the user find a good commit to test. Signed-off-by: Steven Rostedt commit c960bb9f59c0ed2aded535222cfe461ec6c22c95 Author: Steven Rostedt Date: Tue Mar 8 09:22:39 2011 -0500 ktest: Add manual bisect For both git bisect and config bisect, if BISECT_MANUAL is set to 1, then bisect will stop between iterations and ask the user for the result. The actual result is ignored. This makes it possible to use ktest.pl for bisecting configs and git and let the user examine the results themselves and enter their own results. Signed-off-by: Steven Rostedt commit 612b9e9bd33af80f525a38c05a1663f7126b3d3c Author: Steven Rostedt Date: Mon Mar 7 13:27:43 2011 -0500 ktest: Handle kernels before make oldnoconfig When bisecting, one may come across a kernel that does not have make oldnoconfig. In this case, we need to run the command "yes" into a make oldconfig. This will select defaults instead of 'n' into each command, but it works as a work around. Note, "yes n" will not work because a config may have a value that "n" is not acceptable for. Signed-off-by: Steven Rostedt commit 10abf118f090b9a70ea05296a981fa27196dc7c6 Author: Steven Rostedt Date: Mon Mar 7 13:21:00 2011 -0500 ktest: Start failure timeout on panic too Currently we just look for a Call Trace to start the time out when to reboot the box. But if the kernel panics and does not show a Call Trace, the test will not reboot the box after the specified timeout. Signed-off-by: Steven Rostedt commit f80802cb1fbd7f441dd1d04db77d314adb7ccb37 Author: Steven Rostedt Date: Mon Mar 7 13:18:47 2011 -0500 ktest: Print logfile name on failure If the test fails and a logfile was specified. Print the name to let the user know where to look for more information on the failure. Signed-off-by: Steven Rostedt commit 9846ada138accc63994b57ebdfa76e3e137729e2 Author: Shan Wei Date: Tue Mar 8 15:37:27 2011 +0100 netfilter: ipset: fix the compile warning in ip_set_create net/netfilter/ipset/ip_set_core.c:615: warning: ‘clash’ may be used uninitialized in this function Signed-off-by: Shan Wei Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit f41a52d3010579949a3b9fd76783120d9643b60b Author: Rafi Rubin Date: Tue Mar 8 00:24:29 2011 -0500 HID: ntrig don't dereference unclaimed hidinput Check before dereferencing field->hidinput to fix a reported invalid deference bug. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 47be6b92c37a27837d73f4807684ce423aed796d Author: Baruch Siach Date: Mon Mar 7 15:19:11 2011 +0200 ARM: imx/mx25: dynamically allocate pwm devices Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit cba57eb7d55923b74ed8c7d1dd97ecf98b7bba77 Author: Baruch Siach Date: Mon Mar 7 12:18:55 2011 +0200 ARM: imx/mx25: fix (again) spi device registration typo This typo was fixed in 46e3f30 (mx25: fix spi device registration typo), but a the merge at 0e44e059 (Merge commit 'v2.6.37-rc4' into imx-for-2.6.38) resolved the merge conflict wrongly. Cc: Sascha Hauer Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 164f7b5237cca2701dd2943928ec8d078877a28d Author: Alberto Panizzo Date: Mon Mar 7 11:47:37 2011 +0100 mach-mx31_3ds: Add support for the camera device on the personality board Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit e42010e0e129cc31a83ce9d8d1c7e1d50ba155f3 Author: Alberto Panizzo Date: Mon Mar 7 11:46:38 2011 +0100 mach-mx31_3ds: Add support for framebuffer and LCD Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit 0ce88b34ea5a1b48438848739a72da6b4fe7a5fa Author: Alberto Panizzo Date: Mon Mar 7 11:45:07 2011 +0100 mach-mx31_3ds: Add support for the MMC slot of the personality board Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit beb859645a8a9dfa089bef05206c844d9d34f307 Author: Alberto Panizzo Date: Mon Mar 7 11:44:13 2011 +0100 spi_imx: Fix misspelled configuration variable SOC_IMX31 This fix a kernel NULL pointer error while initialising SPI introduced by: 4d2f13be1e370a670c1cae20c194d5ce961e0fa5 Signed-off-by: Alberto Panizzo Signed-off-by: Sascha Hauer commit acc9cdca62e596ca77e41e24a9d2c020a461bd99 Author: Shawn Guo Date: Thu Mar 3 22:13:38 2011 +0800 ARM: mxs/mx28evk: add flexcan devices Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 0e82e5fa97614c9ca3efca5f8dca69dffd1c0ec0 Author: Clemens Ladisch Date: Mon Mar 7 13:24:30 2011 +0100 ALSA: control: clean up snd_ctl_hole_check() The return value of snd_ctl_hole_check() is used only to detect whether to continue the loop in snd_ctl_find_hole() or not, so we can simplify the code by changing this return type to a boolean. Also rename this function to better show what it actually does. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 7c7335877105364f7f5181e80ff34206b54be81f Author: Clemens Ladisch Date: Mon Mar 7 13:22:50 2011 +0100 ALSA: control: fix numid conflict check for new controls The purpose of the snd_ctl_hole_check() function is to find conflicts between the numerical IDs of the new control and those of any existing controls. However, it would fail to detect an existing control whose count is smaller than the new control's count and whose interval of IDs is entirely contained in the interval of the new control's IDs. To fix this, use the correct formula to detect overlapping intervals, which happens to simplify the condition. This problem was not encountered so far because ALSA does not yet allow drivers to allocate specific control IDs. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit bdd3255d3adcb9f4fd70c09ec71eb1c5b36d833e Author: Adrian Knoth Date: Mon Mar 7 19:10:11 2011 +0100 ALSA: hdspm - Add firmware ID for older AES32 cards. The current AES32 firmware revision ID is 234, however, a user confirmed that everything works fine with the previous revision, too. Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 2765df7da540687c4d57ca840182122f074c5b9c Author: Artem Bityutskiy Date: Wed Feb 2 09:22:54 2011 +0200 UBIFS: use max_write_size during recovery When recovering from unclean reboots UBIFS scans the journal and checks nodes. If a corrupted node is found, UBIFS tries to check if this is the last node in the LEB or not. This is is done by checking if there only 0xFF bytes starting from the next min. I/O unit. However, since now we write in c->max_write_size, we should actually check for 0xFFs starting from the next max. write unit. Signed-off-by: Artem Bityutskiy commit 6c7f74f703cc4baf053270a6e78a32f832f03445 Author: Artem Bityutskiy Date: Sun Feb 6 14:45:26 2011 +0200 UBIFS: use max_write_size for write-buffers Switch write-buffers from 'c->min_io_size' to 'c->max_write_size' which presumably has to be more write speed-efficient. However, when write-buffer is synchronized, write only the the min. I/O units which contain the data, do not write whole write-buffer. This is more space-efficient. Additionally, this patch takes into account that the LEB might not start from the max. write unit-aligned address. Signed-off-by: Artem Bityutskiy commit 3c89f396dc78671cfbc1eb20ef1d5be6a9a02780 Author: Artem Bityutskiy Date: Tue Feb 1 19:02:49 2011 +0200 UBIFS: introduce write-buffer size field Currently we assume write-buffer size is always min_io_size. But this is about to change and write-buffers may be of variable size. Namely, they will be of max_write_size at the beginning, but will get smaller when we are approaching the end of LEB. This is a preparation patch which introduces 'size' field in the write-buffer structure which carries the current write-buffer size. Signed-off-by: Artem Bityutskiy commit ca2ec61d157f23ec24aaa200f8016ea0a8aeb617 Author: Artem Bityutskiy Date: Mon Feb 14 15:17:55 2011 +0200 UBI: incorporate LEB offset information Incorporate the LEB offset information into UBIFS. We'll use this information in one of the next patches to figure out what are the max. write size offsets relative to the PEB. So this patch is just a preparation. Signed-off-by: Artem Bityutskiy commit 3e8e2e0c8da1f1701a8014543c951c41751791cc Author: Artem Bityutskiy Date: Sun Jan 30 18:58:32 2011 +0200 UBIFS: incorporate maximum write size Incorporate maximum write size into the UBIFS description data structure. This patch just introduces new 'c->max_write_size' and 'c->max_write_shift' fields as a preparation for the following patches. Signed-off-by: Artem Bityutskiy commit f43ec882b8b65de0ebde2e1ad52e8de0349d83ae Author: Artem Bityutskiy Date: Mon Feb 14 13:36:54 2011 +0200 UBI: provide LEB offset information Provide the LEB offset information in the UBI device information data structure. This piece of information is required by UBIFS to find out what are the LEB offsets which are aligned to the max. write size. If LEB offset not aligned to max. write size, then UBIFS has to take this into account to write more optimally. Signed-off-by: Artem Bityutskiy commit 30b542ef453e6832ff682170b2db95d7bca2fe70 Author: Artem Bityutskiy Date: Sun Jan 30 18:37:33 2011 +0200 UBI: incorporate maximum write size Incorporate MTD write buffer size into UBI device information because UBIFS needs this field. UBI does not use it ATM, just provides to upper layers in 'struct ubi_device_info'. Signed-off-by: Artem Bityutskiy commit f02726a77960194995dac9fd218ec10b4de76cd6 Author: Mike Rapoport Date: Mon Mar 7 16:29:24 2011 +0200 ARM: tegra: trimslice: enable MMC/SD slots TrimSlice has MicroSD and standard MMC/SD slots. Register sdhci devices and enable GPIOs for MMC/SD slot. Signed-off-by: Mike Rapoport commit df677140281beb608f6748c341af7612f7bfe7a0 Author: Martin K. Petersen Date: Tue Mar 8 08:28:01 2011 +0100 block: biovec_slab vs. CONFIG_BLK_DEV_INTEGRITY The block integrity subsystem no longer uses the bio_vec slabs so this code can safely be compiled in. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit be667377a8b8cd73e1b923f33fb5be4034aa4bfa Author: Ryusuke Konishi Date: Sat Mar 5 00:19:32 2011 +0900 nilfs2: record used amount of each checkpoint in checkpoint list This records the number of used blocks per checkpoint in each checkpoint entry of cpfile. Even though userland tools can get the block count via nilfs_get_cpinfo ioctl, it was not updated by the nilfs2 kernel code. This fixes the issue and makes it available for userland tools to calculate used amount per checkpoint. Signed-off-by: Ryusuke Konishi Cc: Jiro SEKIBA commit ae191838b0251d73b9d0a7254c6938406f5f6320 Author: Ryusuke Konishi Date: Fri Feb 4 01:19:38 2011 +0900 nilfs2: optimize rec_len functions This is a similar change to those in ext2/ext3 codebase (commit 40a063f6691ce937 and a4ae3094869f18e2, respectively). The addition of 64k block capability in the rec_len_from_disk and rec_len_to_disk functions added a bit of math overhead which slows down file create workloads needlessly when the architecture cannot even support 64k blocks. This will cut the corner. Signed-off-by: Ryusuke Konishi commit 4138ec23820012009aecc2b02856c62872dd3c34 Author: Ryusuke Konishi Date: Mon Jan 24 00:28:22 2011 +0900 nilfs2: append blocksize info to warnings during loading super blocks At present, the same warning message can be output twice when nilfs detected a problem on super blocks: NILFS warning: broken superblock. using spare superblock. NILFS warning: broken superblock. using spare superblock. ... This is because these super blocks are reloaded with the block size written in a super block if it differs from the first block size, but this repetition looks somewhat confusing. So, we hint at what is going on by appending block size information to those messages. Reported-by: Wakko Warner Signed-off-by: Ryusuke Konishi commit 828b1c50ae11e6dda68f8dfefe43b74c7182b157 Author: Ryusuke Konishi Date: Thu Feb 3 21:26:17 2011 +0900 nilfs2: add compat ioctl The current FS_IOC_GETFLAGS/SETFLAGS/GETVERSION will fail if application is 32 bit and kernel is 64 bit. This issue is avoidable by adding compat_ioctl method. Signed-off-by: Ryusuke Konishi commit cde98f0f84ccff78e87235cb7b551747d6ad00de Author: Ryusuke Konishi Date: Thu Jan 20 02:09:53 2011 +0900 nilfs2: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION Add support for the standard attributes set via chattr and read via lsattr. These attributes are already in the flags value in the nilfs2 inode, but currently we don't have any ioctl commands that expose them to the userland. Collaterally, this adds the FS_IOC_GETVERSION ioctl for getting i_generation, which allows users to list the file's generation number with "lsattr -v". Signed-off-by: Ryusuke Konishi commit b253a3e4f2b8eed69b804952ef926df0ac788595 Author: Ryusuke Konishi Date: Thu Jan 20 02:09:53 2011 +0900 nilfs2: tighten restrictions on inode flags Nilfs has few rectrictions on which flags may be set on which inodes like ext2/3/4 filesystems used to be. Specifically DIRSYNC may only be set on directories and IMMUTABLE and APPEND may not be set on links. Tighten that to disallow TOPDIR being set on non-directories and only NODUMP and NOATIME to be set on non-regular file, non-directories. This introduces a flags masking function like those of extN and uses it during inode creation. Signed-off-by: Ryusuke Konishi commit 32f4aeb31583a85c1e9a5d6d485055c090cebbfb Author: Ryusuke Konishi Date: Thu Jan 20 02:09:52 2011 +0900 nilfs2: mark S_NOATIME on inodes only if NOATIME attribute is set At present, nilfs marks S_NOATIME flag on all inodes. This restricts nilfs_set_inode_flags function so that it marks S_NOATIME only if a given inode has an FS_NOATIME_FL flag. Although nilfs does not support atime yet, touch_atime() still safely returns on IS_NOATIME check since MS_NOATIME is always set on sb. Signed-off-by: Ryusuke Konishi commit f0c9f242f947a37675a883deca7f722cac935b0e Author: Ryusuke Konishi Date: Thu Jan 20 02:09:52 2011 +0900 nilfs2: use common file attribute macros Replaces uses of own inode flags (i.e. NILFS_SECRM_FL, NILFS_UNRM_FL, NILFS_COMPR_FL, and so forth) with common inode flags, and removes the own flag declarations. Signed-off-by: Ryusuke Konishi commit 9954e7af14868b8b79e76b7b88daaf0b3866db33 Author: Ryusuke Konishi Date: Wed Feb 23 02:26:17 2011 +0900 nilfs2: add free entries count only if clear bit operation succeeded Three functions of the current persistent object allocator, nilfs_palloc_commit_free_entry, nilfs_palloc_abort_alloc_entry, and nilfs_palloc_freev functions unconditionally add a counter after doing clear bit operation on a bitmap block. If the clear bit operation overlapped, the counter will not add up. This fixes the issue by making the counter operations conditional. Signed-off-by: Ryusuke Konishi commit 25b18d39cca207f8559af1aac00313deda2d652e Author: Ryusuke Konishi Date: Fri Feb 11 15:23:27 2011 +0900 nilfs2: decrement inodes count only if raw inode was successfully deleted This fixes the issue that inodes count will not add up after removal of raw inodes fails. Hence, this prevents possible under flow of the inodes count. Signed-off-by: Ryusuke Konishi commit 1fc050a13473348f5c439de2bb41c8e92dba5588 Author: David S. Miller Date: Mon Mar 7 20:54:48 2011 -0800 ipv4: Cache source address in nexthop entries. When doing output route lookups, we have to select the source address if the user has not specified an explicit one. First, if the route has an explicit preferred source address specified, then we use that. Otherwise we search the route's outgoing interface for a suitable address. This search can be precomputed and cached at route insertion time. The only missing part is that we have to refresh this precomputed value any time addresses are added or removed from the interface, and this is accomplished by fib_update_nh_saddrs(). Signed-off-by: David S. Miller commit 4dd508b524b4913a08f54065601ee94fcacb75a2 Author: Seungwhan Youn Date: Tue Mar 8 10:56:55 2011 +0900 ARM: EXYNOS4: Debug wrong S/PDIF register address This patche fixes wrong S/PDIF SFR base address. Signed-off-by: Seungwhan Youn Signed-off-by: Kukjin Kim commit 290293eda2c6dd368476d71433bdef07c39a6829 Author: Esben Haabendal Date: Mon Mar 7 20:45:28 2011 -0700 of_mmc_spi: add card detect irq support Signed-off-by: Esben Haabendal Acked-by: Anton Vorontsov Signed-off-by: Grant Likely commit 8c810e7e14457d97706d4c6de4bb4847e3715d1b Author: Paul Walmsley Date: Fri Feb 25 13:56:40 2011 -0700 OMAP2xxx: clock data: clean up some comments Minor cleanup of some clock data comments. No functional changes. Signed-off-by: Paul Walmsley commit a4fc92748e969b1312f283b0d1baf657329f2907 Author: Paul Walmsley Date: Fri Feb 25 14:53:40 2011 -0700 OMAP2xxx: clock: fix clockdomains on gpt7_ick, 2430 mmchs2_fck clocks Add a clockdomain to the GPTIMER7 interface and 2430 HSMMC2 functional clocks - both were previously missing them. Also, the 2430 mmchs1_fck is in core_l3_clkdm, but should be in core_l4_clkdm; fix this. Signed-off-by: Paul Walmsley commit 691abf525d3d215f2e4eab7a015ef2b6375c58a5 Author: Sanjeev Premi Date: Fri Feb 11 09:05:00 2011 +0000 omap2/3: clockdomains: fix compile-time warnings This patch fixes these warnings when building kernel for OMAP3EVM only. CC arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.o arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c:95: warning: 'dsp_24xx_wkdeps' defined but not used arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c:119: warning: 'mpu_24xx_wkdeps' defined but not used arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c:147: warning: 'core_24xx_wkdeps' defined but not used The problem should be noticed when building for other OMAP3 platforms (only) as well. Signed-off-by: Sanjeev Premi Signed-off-by: Paul Walmsley commit 224113969dc9cc7a55f69da4dde5dc3fd1bbeb76 Author: Paul Walmsley Date: Fri Feb 25 15:52:04 2011 -0700 OMAP2xxx: clock: remove dsp_irate_ick After commit 81b34fbecbfbf24ed95c2d80d5cb14149652408f ("OMAP2 clock: split OMAP2420, OMAP2430 clock data into their own files"), it's possible to remove dsp_irate_ick from the OMAP2420 and OMAP2430 clock files. It was originally only needed due to a 2420/2430 clock tree difference, and now that the data is in separate files, it's superfluous. Signed-off-by: Paul Walmsley commit 241d3a8dca239610d3d991bf58d4fe38c2d86fd5 Author: Paul Walmsley Date: Wed Feb 16 15:38:39 2011 -0700 OMAP2+: clock: remove the DPLL rate tolerance code Remove the DPLL rate tolerance code that is called during rate rounding. As far as I know, this code is never used, since it's been more important for callers of the DPLL round_rate()/set_rate() functions to obtain an exact rate than it is to save a relatively small amount of power. Signed-off-by: Paul Walmsley commit e07f469d284ca3d1f5dcf5438c22982be98bc071 Author: Paul Walmsley Date: Wed Feb 16 15:38:38 2011 -0700 OMAP: clock: bail out early if arch_clock functions not implemented Bail out before we take the clockfw_lock spinlock if the corresponding OMAP1 or OMAP2+ clock function is not defined. The intention is to reduce and simplify the work that is done inside the spinlock. Signed-off-by: Paul Walmsley commit 19c1c0ce9ddc45fe8f84b6cf12ba9dbecd7b1aa1 Author: Paul Walmsley Date: Wed Feb 16 15:38:38 2011 -0700 OMAP2xxx: clock: fix interface clocks and clockdomains for modules in the WKUP domain The parent of the interface clocks for GPTIMER1, MPU_WDT, SYNCTIMER_32K, SCM, WDT1, and the ICR (2430 only) were all listed as being l4_ck. This isn't accurate; these modules exist inside the WKUP domain, and the interface clock to these modules runs at the SYS_CLK rate rather than the CORE L4 rate. So, create a new clock "wu_l4_ick", similar to the OMAP3 "wkup_l4_ick", that serves as the parent for these clocks. Also, these clocks were listed as existing inside core_l4_clkdm; wkup_clkdm is probably more accurate. Signed-off-by: Paul Walmsley commit 3f9cfd3a47a07c93ff00a1a4ca067ada87e4076a Author: Paul Walmsley Date: Wed Feb 16 15:38:38 2011 -0700 OMAP2xxx: clock: fix low-frequency oscillator clock rate The OMAP2420/2430 external 32-kHz low-frequency oscillator is a 32768 Hz oscillator, not a 32,000 Hz oscillator[1][2]. Fix this in the clock tree. Signed-off-by: Paul Walmsley 1. OMAP2420/22 Multimedia Processor Data Manual, Version P [SWPS019P], section 5.1.4 "External 32-kHz CMOS Clock" (note that it refers to a "32.768-kHz" clock; this presumably should be "32.768-KHz") 2. OMAP2430 Multimedia Processor ES2.1 Data Manual, Version V [SWPS023V], section 5.1.4 "External 32-kHz CMOS Clock" (note that it refers to a "32.768-kHz" clock; this presumably should be "32.768-KHz") commit a1fed577ddc0ca0ec7cf5e5ee033fe3df4192ebd Author: Paul Walmsley Date: Fri Feb 25 15:51:02 2011 -0700 OMAP2xxx: clock: fix parents for L3-derived clocks Several clocks are listed as having the core L4 clock as their parent, when they are actually derived from the L3 clock. Fix these. Signed-off-by: Paul Walmsley commit e1d6f4729e9fd46efa1029b6e806bb8b6c24e776 Author: Paul Walmsley Date: Fri Feb 25 15:54:33 2011 -0700 OMAP: voltage: move plat/voltage.h to mach-omap2/voltage.h At this point in time, there's no reason for this header file to be in plat-omap/include/plat/voltage.h. It should not be included by device drivers, and the code that uses it is currently all under mach-omap2/. Signed-off-by: Paul Walmsley commit 7328ff4d72401835fa1aadfb9e574a2133bd952b Author: Paul Walmsley Date: Fri Feb 25 15:54:33 2011 -0700 OMAP: smartreflex: move plat/smartreflex.h to mach-omap2/smartreflex.h There's no reason for this header file to be in plat-omap/include/plat/smartreflex.h. The hardware devices are in OMAP2+ SoCs only. Leaving this header file in plat-omap causes problems due to cross-dependencies with other header files that should live in mach-omap2/. Thanks to Benoît Cousson for suggesting the removal of the smartreflex.h include from the OMAP3xxx hwmod data. Signed-off-by: Paul Walmsley Cc: Benoît Cousson commit 4ef70c0694bf428d9f1d4722edaffa1dc5fa39e1 Author: Paul Walmsley Date: Fri Feb 25 15:39:30 2011 -0700 OMAP2/3: PM: remove manual CM_AUTOIDLE bit setting in mach-omap2/pm*xx.c These CM_AUTOIDLE bits are now set by the clock code via the common PM code in mach-omap2/pm.c. N.B.: The pm24xx.c code that this patch removes didn't ensure that the CM_AUTOIDLE bits were set for several 2430-only modules, such as GPIO5, MDM_INTC, MMCHS1/2, the modem oscillator clock, and USBHS. Similarly, the pm34xx.c code that this patch removes didn't ensure that the CM_AUTOIDLE bits were set for USIM and the AM3517 UART4. Those cases should now be handled. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit ec538e30f7eded2c4af8d9184619a3de65bc378e Author: Paul Walmsley Date: Fri Feb 25 15:39:30 2011 -0700 OMAP3: clock: use autoidle clkops for all autoidle-controllable interface clocks Mark each interface clock with a corresponding CM_AUTOIDLE bit with a clkops that has the allow_idle/deny_idle function pointers populated. This allows the OMAP clock framework to enable and disable autoidle for these clocks. Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit a1d5562315a1e911c8448b7fac33c966f9cb6294 Author: Paul Walmsley Date: Fri Feb 25 15:39:30 2011 -0700 OMAP2430: clock: use autoidle clkops for all autoidle-controllable interface clocks Mark each interface clock with a corresponding CM_AUTOIDLE bit with a clkops that has the allow_idle/deny_idle function pointers populated. This allows the OMAP clock framework to enable and disable autoidle for these clocks. Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit e892b2528b8dc9eef8ca3f9af7b5b650b4e90bea Author: Paul Walmsley Date: Fri Feb 25 15:39:29 2011 -0700 OMAP2430/3xxx: clock: add modem clock autoidle support OMAP2430 and OMAP3xxx have modem autoidle bits that are actually attached to clocks with CM_FCLKEN bits; add the code and data to handle these. Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit 6ae690da1b6315f34ab7312bd2a02d49a606ccf7 Author: Paul Walmsley Date: Fri Feb 25 15:39:29 2011 -0700 OMAP2420: clock: use autoidle clkops for all autoidle-controllable interface clocks Mark each interface clock with a corresponding CM_AUTOIDLE bit with a clkops that has the allow_idle/deny_idle function pointers populated. This allows the OMAP clock framework to enable and disable autoidle for these clocks. Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit a56d9ea865e42a6bf6393fc3d3a143553dbf68c5 Author: Paul Walmsley Date: Fri Feb 25 15:39:29 2011 -0700 OMAP2420: clock: add sdrc_ick Add sdrc_ick to the OMAP2420 clock data so the clock code can control the CM_AUTOIDLE bit associated with this clock. Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit 530e544fdadb934470c5c2b0e8d60c3d5386c161 Author: Paul Walmsley Date: Fri Feb 25 15:39:28 2011 -0700 OMAP2+: clock: add interface clock type code with autoidle support Add interface clock type code with autoidle enable/disable support. The clkops structures created in this file will be used for all OMAP2/3 interface clocks with autoidle support. They will enable the clock framework to control interface clock autoidle directly. Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit cc1d230cfbc1622be4bf16568f468054be8c5d2e Author: Paul Walmsley Date: Fri Feb 25 15:39:27 2011 -0700 OMAP2+: clock: comment that osc_ck/osc_sys_ck should use clockfw autoidle control Place some comments in the OMAP oscillator clock control code to note that its autoidle mode should eventually be controlled via the new OMAP clockfw autoidle control interface. Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit 92618ff8b025419960e2e845983f0f49b0cb57a9 Author: Paul Walmsley Date: Fri Feb 25 15:39:27 2011 -0700 OMAP2xxx: clock: add clockfw autoidle support for APLLs OMAP2xxx devices have two on-chip APLLs. These APLLs can automatically enter idle when not in use. Connect the APLL autoidle code to the clock code, so that the clock framework can handle this process. As part of this patch, remove the code in mach-omap2/pm24xx.c that previously handled APLL autoidle control. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit 0fd0c21be71293d8a54d9075b18b5a25a1868057 Author: Paul Walmsley Date: Fri Feb 25 15:49:53 2011 -0700 OMAP2: clock: add DPLL autoidle support Add the necessary code and data to allow the clock framework to enable and disable the OMAP2 DPLL autoidle state. This is so the direct register access can be moved out of the mach-omap2/pm24xx.c code, and other code that needs to control this (e.g., CPUIdle) can do so via an API. As part of this patch, remove the pm24xx.c code that formerly wrote directly to the autoidle bits. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit 694606c4ef54f596bfb2a7c1d4de8ac0e096a636 Author: Paul Walmsley Date: Mon Mar 7 19:28:15 2011 -0700 OMAP2+: powerdomain: add pwrdm_can_ever_lose_context() Some drivers wish to know whether the device that they control can ever lose context, for example, when the device's enclosing powerdomain loses power. They can use this information to determine whether it is necessary to save and restore device context, or whether it can be skipped. Implement the powerdomain portion of this by adding the function pwrdm_can_ever_lose_context(). This is not for use directly from driver code, but instead is intended to be called from driver-subarch integration code (i.e., arch/arm/*omap* code). Currently, the result from this function should be passed into the driver code via struct platform_data, but at some point this should be part of some common or OMAP-specific device code. While here, update file copyrights. Signed-off-by: Paul Walmsley commit 4cb49fec12e219ec174e04157f71c00f63eb4ce4 Author: Paul Walmsley Date: Mon Mar 7 19:28:15 2011 -0700 OMAP2+: powerdomain: fix bank power state bitfields The bank power state bitfields in the powerdomain data are encoded incorrectly. These fields are intended to be bitfields, representing a set of power states that the memory banks support. However, when only one power state was supported by a given bank, the field was incorrectly set to the bit shift -- not the mask. While here, update some file copyrights. The OMAP4 autogeneration scripts have been updated accordingly. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Cc: Santosh Shilimkar commit cad7a34b3afcd02e8e6bef5007e4b12f6cc8ec24 Author: Paul Walmsley Date: Mon Mar 7 19:28:15 2011 -0700 OMAP2/3: WKUP powerdomain: mark as being always on Mark the WKUP powerdomain as being always on -- at least, as long as the chip has power. This will be used to enable the powerdomain code to determine whether a given powerdomain is ever able to power off. While here, update the file copyright. Signed-off-by: Paul Walmsley commit 2b642ca5e93fa1c977e8c90480a2900149f262be Author: Emil Tantilov Date: Fri Mar 4 09:06:10 2011 +0000 ixgbe: fix setting and reporting of advertised speeds Add the ability to set 100/F on x540. Fix reporting of advertised modes by adding check for phy.autoneg_advertised Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit da74cd4a2f64b01c14c4bf7df355a982f1e2ab18 Author: Emil Tantilov Date: Thu Mar 3 09:25:07 2011 +0000 ixgbe: fix spelling errors Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit d7c8a29fc8bd20ba45ec2f52577ed04a988a9500 Author: Emil Tantilov Date: Thu Mar 3 09:25:02 2011 +0000 ixgbe: improve logic in ixgbe_init_mbx_params_pf Use if/then instead of an all-inclusive case statement. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 77ed18f302a2ef8d7b00ef6e804d23239db12ee1 Author: Emil Tantilov Date: Thu Mar 3 09:24:56 2011 +0000 ixgbe: add function description Add description for ixgbe_init_eeprom_params_X540 and whitespace fix. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 0b0c2b31bdf8d6fb5c14ae70894453ac44d64672 Author: Emil Tantilov Date: Sat Feb 26 06:40:16 2011 +0000 ixgbe: Enable flow control pause parameter auto-negotiation support This patch enables flow control pause parameters auto-negotiation support to 82599 based 10G Base-T, backplane devices and multi-speed fiber optics modules at 1G speed Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit a3aeea0ec8d3af854edf7dc983dc8cbe803a43e8 Author: Emil Tantilov Date: Sat Feb 26 06:40:11 2011 +0000 ixgbe: Add x540 statistic counter definitions Add defines to accumulate and display x540 PHY statistic counters on transmit/receive. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 667c75651025049b39a2b5b83d8fc09a7967cce3 Author: Emil Tantilov Date: Sat Feb 26 06:40:05 2011 +0000 ixgbe: clear correct counters for flow control on 82599 The 82599 was not correctly having some of it's counters cleared for flow control. This change corrects that. Signed-off-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 037c6d0a33453bf025c6d6b21e5a0fabe117a797 Author: Emil Tantilov Date: Fri Feb 25 07:49:39 2011 +0000 ixgbe: cleanup PHY init This change cleans up several situations in which we were either stepping over possible errors, or calling initialization routines multiple times. Also includes whitespace fixes where applicable. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 68a683cf6a5ff09faa366fc1fcf967add0211fe8 Author: Yi Zou Date: Tue Feb 1 07:22:16 2011 +0000 ixgbe: add support to FCoE DDP in target mode Add support to the ndo_fcoe_ddp_target() to allow the Intel 82599 device to also provide DDP offload capability when the upper FCoE protocol stack is operating as a target. Signed-off-by: Yi Zou Signed-off-by: Kiran Patil Signed-off-by: Jeff Kirsher commit 4ea09c9caaebc98d06a39c435d4359912cfbb5e2 Author: Yi Zou Date: Tue Feb 1 07:22:11 2011 +0000 vlan: add support to ndo_fcoe_ddp_target() Add the new target ddp offload support ndo_fcoe_ddp_target(). Signed-off-by: Yi Zou Signed-off-by: Kiran Patil Signed-off-by: Jeff Kirsher commit 6247e086188dd2ba5bfd64f9a876fe42b0cf39fb Author: Yi Zou Date: Tue Feb 1 07:22:06 2011 +0000 net: add ndo_fcoe_ddp_target() to support FCoE DDP in target mode The Fiber Channel over Ethernet (FCoE) Direct Data Placement (DDP) can also be used for FCoE target, where the DDP used for read I/O on an initiator can be used on an FCoE target to speed up the write I/O to the target from the initiator. The added ndo_fcoe_ddp_target() works in the similar way as the existing ndo_fcoe_ddp_setup() to allow the underlying hardware set up the DDP context accordingly when it gets called from the FCoE target implementation on top the existing Open-FCoE fcoe/libfc protocol stack so without losing the ability to provide DDP for read I/O as an initiator, it can also provide DDP offload to the write I/O coming from the initiator as a target. Signed-off-by: Yi Zou Signed-off-by: Kiran Patil Tested-by: Kavindya Deegala Signed-off-by: Jeff Kirsher commit 90827996c59135b73e54463dac38710d5ddf1d2a Author: Don Skidmore Date: Sat Mar 5 18:59:20 2011 -0800 ixgbe: fix missing function pointer conversion In the previous commit: commit 5e655105e3e19d746f9e95c514b014c11c3d1b6a Author: Don Skidmore Date: Fri Feb 25 01:58:04 2011 +0000 ixgbe: add function pointer for semaphore function there was one release of the semaphore function call which did not get converted to a function pointer. Signed-off-by: Jeff Kirsher commit 0a915b95d67f3bf63121c04aeb4eaebb183feb58 Author: Carolyn Wyborny Date: Sat Feb 26 07:42:37 2011 +0000 igb: Add stats output for OS2BMC feature on i350 devices This patch adds statistics output for OS2BMC feature which is configured by eeprom on capable devices. Signed-off-by: Carolyn Wyborny Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher commit a1d76e10ae73348997f55efffc977e792d76a2c6 Author: Emil Tantilov Date: Mon Feb 14 08:19:24 2011 +0000 e1000e: fix build issue due to undefined reference to crc32_le kernel build fails with: drivers/built-in.o: In function `e1000_lv_jumbo_workaround_ich8lan': (.text+0x3e7a8): undefined reference to `crc32_le' when CONFIG_CRC32 is not set or does not match the CONFIG_E1000E selection. Signed-off-by: Emil Tantilov Reviewed-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit fe3fa43039d47ee4e22caf460b79b62a14937f79 Merge: ee009e4 026eb16 Author: James Morris Date: Tue Mar 8 11:38:10 2011 +1100 Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next commit ee009e4a0d4555ed522a631bae9896399674f064 Author: David Howells Date: Mon Mar 7 15:06:20 2011 +0000 KEYS: Add an iovec version of KEYCTL_INSTANTIATE Add a keyctl op (KEYCTL_INSTANTIATE_IOV) that is like KEYCTL_INSTANTIATE, but takes an iovec array and concatenates the data in-kernel into one buffer. Since the KEYCTL_INSTANTIATE copies the data anyway, this isn't too much of a problem. Signed-off-by: David Howells Signed-off-by: James Morris commit fdd1b94581782a2ddf9124414e5b7a5f48ce2f9c Author: David Howells Date: Mon Mar 7 15:06:09 2011 +0000 KEYS: Add a new keyctl op to reject a key with a specified error code Add a new keyctl op to reject a key with a specified error code. This works much the same as negating a key, and so keyctl_negate_key() is made a special case of keyctl_reject_key(). The difference is that keyctl_negate_key() selects ENOKEY as the error to be reported. Typically the key would be rejected with EKEYEXPIRED, EKEYREVOKED or EKEYREJECTED, but this is not mandatory. Signed-off-by: David Howells Signed-off-by: James Morris commit b9fffa3877a3ebbe0a5ad5a247358e2f7df15b24 Author: David Howells Date: Mon Mar 7 15:05:59 2011 +0000 KEYS: Add a key type op to permit the key description to be vetted Add a key type operation to permit the key type to vet the description of a new key that key_alloc() is about to allocate. The operation may reject the description if it wishes with an error of its choosing. If it does this, the key will not be allocated. Signed-off-by: David Howells Reviewed-by: Mimi Zohar Signed-off-by: James Morris commit 633e804e89464d3875e59de1959a53f9041d3094 Author: David Howells Date: Mon Mar 7 15:05:51 2011 +0000 KEYS: Add an RCU payload dereference macro Add an RCU payload dereference macro as this seems to be a common piece of code amongst key types that use RCU referenced payloads. Signed-off-by: David Howells Signed-off-by: Mimi Zohar Signed-off-by: James Morris commit 1cc26bada9f6807814806db2f0d78792eecdac71 Merge: eae61f3 214d93b Author: James Morris Date: Tue Mar 8 10:55:06 2011 +1100 Merge branch 'master'; commit 'v2.6.38-rc7' into next commit 6118e35a7126c1062b1a0f6737b84b4fe4d5c8d4 Author: Hagen Paul Pfeifer Date: Fri Mar 4 11:45:06 2011 +0000 af_unix: remove unused struct sockaddr_un cruft Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit efea2c6b2efc1716b2c0cf257cc428d6cd3ed6e2 Author: Hagen Paul Pfeifer Date: Fri Mar 4 11:45:05 2011 +0000 sctp: several declared/set but unused fixes Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit e143038f4dda10a51985b9a3f9fb07d73a5eadfa Author: Hagen Paul Pfeifer Date: Fri Mar 4 11:45:04 2011 +0000 af_packet: struct socket declared/assigned but unused Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit 4b66fef9b591b95f447aea12242a1133deb0bd22 Author: Hagen Paul Pfeifer Date: Fri Mar 4 11:45:03 2011 +0000 mcast: net_device dev not used ip6_mc_source(), ip6_mc_msfilter() as well as ip6_mc_msfget() declare and assign dev but do not use the variable afterwards. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit 06f0c1392c20d708ffae067fdcad604882e19200 Author: Shan Wei Date: Fri Mar 4 01:23:58 2011 +0000 s2io: fix uninitialized compile warning drivers/net/s2io.c:7559: warning: ‘tcp_len’ may be used uninitialized in this function Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 541ac7c9b30ee2ff84ad87f27e0bc069e143afb5 Author: Changli Gao Date: Wed Mar 2 21:07:14 2011 +0000 bonding: COW before overwriting the destination MAC address When there is a ptype handler holding a clone of this skb, whose destination MAC addresse is overwritten, the owner of this handler may get a corrupted packet. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit cca134fe784a01cf4eb9f0621b0104591b7ddfba Author: Changli Gao Date: Wed Mar 2 18:26:21 2011 +0000 bonding: remove the unused dummy functions when net poll controller isn't enabled These two functions are only used when net poll controller is enabled. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit c4d9e4a0b9960fbf4d945bdad47ba005abe8813c Author: Olof Johansson Date: Fri Mar 4 16:11:43 2011 -0800 ARM: tegra: enable new drivers in defconfig Enable new platforms and tegra drivers in tegra_defconfig. Also enable some of the common devices several platforms, and GUID partition tables to make it possible to boot a tegra_defconfig kernel with a ChromiumOS filesystem. Signed-off-by: Olof Johansson Acked-by: Stephen Warren commit 65b935aa998f8df4d96ea746110af0ad7a6f8e76 Author: Marc Dietrich Date: Mon Mar 7 21:01:31 2011 +0100 ARM: tegra: Add Toshiba AC100 support This patch adds the config infrastructure, the pinmux and basic board setup code for PAZ00 (name of board inside the AC100/AZ). Signed-off-by: Marc Dietrich Signed-off-by: Olof Johansson commit 06fc9a30052b82d87da4a34a9c0bb3bf7338412c Author: Stephen Warren Date: Fri Mar 4 22:42:32 2011 -0700 ARM: tegra: harmony: Set WM8903 gpio_base This is the final patch to enable audio support on Harmony. It additionally relies on the latest ASoC branch being merged in, which provides the header defining the gpio_base field in the WM8903 platform data. Signed-off-by: Stephen Warren Signed-off-by: Olof Johansson commit fba3b2fc1b427696d004f5b22191620f90fe8412 Author: Stephen Warren Date: Fri Mar 4 22:42:31 2011 -0700 ARM: tegra: harmony: I2C-related portions of audio support This patch is the portion of the audio-related setup that relies additionally on the latest Tegra I2C driver being merged. * Define platform data for WM8903 audio codec * Register WM8903 as an I2C device Signed-off-by: Stephen Warren Signed-off-by: Olof Johansson commit de4855d928409caf9c366a9af643bb855aab6bf6 Author: Olof Johansson Date: Fri Mar 4 15:26:46 2011 -0800 ARM: tegra: harmony: register i2c devices Register the base i2c busses on harmony. Devices coming at a later date, but this allows for hand-probing of some of them at least. Signed-off-by: Olof Johansson Acked-by: Stephen Warren commit f9a795af4d3b886140e790507a9158ebe3bc6a4a Author: Olof Johansson Date: Fri Mar 4 15:21:53 2011 -0800 ARM: tegra: seaboard: register i2c devices Register the base i2c devices on seaboard. A few more are pending, but it's a start. Signed-off-by: Olof Johansson Acked-by: Stephen Warren commit ef28a4e6ecb8fbe742ea51fc9ec836b5289d1301 Merge: e3f48d3 7a8fc77 Author: David S. Miller Date: Mon Mar 7 15:39:24 2011 -0800 Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 commit e3f48d37cf87a4a94e9f05fddc39b0e5f2307c27 Author: Jiri Pirko Date: Mon Feb 28 20:26:31 2011 +0000 net: allow handlers to be processed for orig_dev This was there before, I forgot about this. Allows deliveries to ptype_base handlers registered for orig_dev. I presume this is still desired. Signed-off-by: Jiri Pirko Reviewed-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit ef2b1a0f1eb299c2d00addfee3a2631395d9bdb5 Author: Stephen Warren Date: Fri Mar 4 22:44:29 2011 -0700 ARM: tegra: harmony: Beginnings of audio support This change includes everything required to enable audio on Harmony, except those parts which rely on code not currently in Tegra's for-next branch, i.e. except those parts which rely on merges of the Tegra I2C driver or latest ASoC subsystem. * Define GPIO names for audio-related GPIOs * Set up platform data and platform device for ASoC machine driver * Register audio-related platform devices * Initialize audio-related clocks * Correctly configure pinmux and GPIO enables for audio-related pins Signed-off-by: Stephen Warren Signed-off-by: Olof Johansson commit 986afbe493b09846dffbe5c1bf9a428a839b6ca2 Author: Stephen Warren Date: Fri Mar 4 22:44:28 2011 -0700 ARM: tegra: create defines for SD-related GPIO names This ensures they're kept in sync between platform_data definitions and the GPIO table initialization. Signed-off-by: Stephen Warren Signed-off-by: Olof Johansson commit b9652c2d127e994748d4bffc45369ed423d5ae8d Author: Stephen Warren Date: Fri Mar 4 22:44:27 2011 -0700 ARM: tegra: add devices.c entries for audio For I2S, DAS, PCM devices Signed-off-by: Stephen Warren Signed-off-by: Olof Johansson commit f21b538ced88a39a6dd9ef4e2c5d9aac300f428b Author: Padmanabh Ratnakar Date: Mon Mar 7 03:09:36 2011 +0000 be2net: Add multicast filter capability for Lancer Lancer requires multicast capability flag set during IFACE_CREATE for adding multicast filters. Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: Subramanian Seetharaman Signed-off-by: David S. Miller commit 63fcb27fdce614ac1b7cc6251bfcb7077f3002b3 Author: Padmanabh Ratnakar Date: Mon Mar 7 03:09:17 2011 +0000 be2net: Disarm CQ and EQ to disable interrupt in Lancer For Lancer disable interrupts in close by disarming CQs and EQs. Change the order of calls in be_close to achieve the correct result. Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: Subramanian Seetharaman Signed-off-by: David S. Miller commit d8a29d315969b0edbf4a37a1a91c361e222909a2 Author: Padmanabh Ratnakar Date: Mon Mar 7 03:09:04 2011 +0000 be2net: Remove TX Queue stop in close Remove TX Queue stop in close Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: Subramanian Seetharaman Signed-off-by: David S. Miller commit 8b7756ca52b11225395a9fadf9ed200f03983b46 Author: Padmanabh Ratnakar Date: Mon Mar 7 03:08:52 2011 +0000 be2net: Change f/w command versions for Lancer Change f/w command versions for Lancer Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: Subramanian Seetharaman Signed-off-by: David S. Miller commit 37eed1cbbd446dc2808e1bff717010aa978fc0de Author: Padmanabh Ratnakar Date: Mon Mar 7 03:08:36 2011 +0000 be2net: Add error recovery during load for Lancer Add error recovery during load for Lancer Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: Subramanian Seetharaman Signed-off-by: David S. Miller commit 19fad86f3b34f52eebc511f6cdb99e82f53aee94 Author: Padmanabh Ratnakar Date: Mon Mar 7 03:08:16 2011 +0000 be2net: Checksum field valid only for TCP/UDP L4 checksum field is valid only for TCP/UDP packets in Lancer Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: Subramanian Seetharaman Signed-off-by: David S. Miller commit e80d9da651b19a79a1500d6bb808fcbcb39a869d Author: Padmanabh Ratnakar Date: Mon Mar 7 03:07:58 2011 +0000 be2net: Remove ERR compl workaround for Lancer Workaround added for Lancer in handling RX ERR completion received when no RX buffers are posted is not needed. Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: Subramanian Seetharaman Signed-off-by: David S. Miller commit 3be0686b6e2f953afe83626e871b4a7b0ceae49b Author: David S. Miller Date: Mon Mar 7 15:01:10 2011 -0800 ipv4: Inline fib_semantic_match into check_leaf This elimiates a lot of pure overhead due to parameter passing. Signed-off-by: David S. Miller commit 4c8237cd76a0510677dc2e3dd0f8866ec8e0b1e5 Author: David S. Miller Date: Mon Mar 7 14:27:38 2011 -0800 ipv4: Validate route entry type at insert instead of every lookup. fib_semantic_match() requires that if the type doesn't signal an automatic error, it must be of type RTN_UNICAST, RTN_LOCAL, RTN_BROADCAST, RTN_ANYCAST, or RTN_MULTICAST. Checking this every route lookup is pointless work. Instead validate it during route insertion, via fib_create_info(). Also, there was nothing making sure the type value was less than RTN_MAX, so add that missing check while we're here. Signed-off-by: David S. Miller commit 6bad88dac0e648c6978a02c6afb0dc2f4fa484bb Author: K. Y. Srinivasan Date: Mon Mar 7 13:35:48 2011 -0800 Staging: hv: Remove the vm_device structure Consolidate all device related state in struct hv_device by moving the device field from struct vm_device to struct hv_device. As part of this, also get rid of struct vm_device since the consolidation is complete. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit d5889771a4acd321ad6f1242b3186cf4a47d7d55 Author: K. Y. Srinivasan Date: Mon Mar 7 13:35:30 2011 -0800 Staging: hv: Eliminate device_id from vm_device Both device abstractions: vm_device and hv_device maintain state to reperesent the device instance (and they refer to them by different names - device_id in vm_device and dev_instance in hv_device). In preparation for consolidating all device state in struct hv_device; eliminate device_id from struct vm_device. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 65c22791dbc08bd6a793c12c070675e9159e4b5f Author: K. Y. Srinivasan Date: Mon Mar 7 13:35:10 2011 -0800 Staging: hv: Get rid of class_id from vm_device Both device abstractions: vm_device and hv_device maintain state to reperesent the device type (and they refer to them by different names - class_id in vm_device and dev_type in hv_device). In preparation for consolidating all device state in struct hv_device; eliminate class_id from struct vm_device. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 70b0af4f52b3da6aeac2bd03221217beff4746a1 Author: K. Y. Srinivasan Date: Mon Mar 7 13:34:48 2011 -0800 Staging: hv: Remove probe_error from vm_device In preparation for consolidating all device related state into struct hv_device, move probe_error from vm_device to hv_device. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit a3c7fe9a333516a14b34cf57684e864ecd2145ce Author: K. Y. Srinivasan Date: Mon Mar 7 13:34:27 2011 -0800 Staging: hv: Move probe_failed_work_item from vm_device In preparation for consolidating all device related state into struct hv_device, move probe_failed_work_item from vm_device to hv_device. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 4af27d7036cfd8403814ca7448474a5c18b8b906 Author: K. Y. Srinivasan Date: Mon Mar 7 13:34:01 2011 -0800 Staging: hv: Eliminate storvsc_driver_context structure With the consolidation of all driver state into one data structure; storvsc_driver_context structure is not needed; get rid of it. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit d8de5dc6847e9272d3c648e62f6481ac5b200eb6 Author: K. Y. Srinivasan Date: Mon Mar 7 13:33:41 2011 -0800 Staging: hv: Eliminate netvsc_driver_context With the consolidation of all driver state into one data structure; netvsc_driver_context structure is not needed; get rid of it. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 680eeb15c0c71642b8a1a3a2583aa160cdd6ba7e Author: K. Y. Srinivasan Date: Mon Mar 7 14:16:46 2011 -0800 Staging: hv: Eliminate mousevsc_driver_context With the consolidation of all driver state into one data structure; mousevsc_driver_context structure is not needed; get rid of it. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit cc7df8727de87b1552278f153eaa1d244bcb7555 Author: Donghwa Lee Date: Tue Mar 8 07:17:09 2011 +0900 ARM: EXYNOS4: enabled lcd and backlight in NURI board This patch enables lcd and backlight drivers in NURI board. Signed-off-by: Donghwa Lee Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 67a5ee2d5e8fde860188f2ba145a724e6f453d42 Author: K. Y. Srinivasan Date: Mon Mar 7 13:32:58 2011 -0800 Staging: hv: Eliminate blkvsc_driver_context structure With the consolidation of all driver state into one data structure; blkvsc_driver_context structure is not needed; get rid of it. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 150f93989ef327698f64527b334a6d2129066704 Author: K. Y. Srinivasan Date: Mon Mar 7 13:32:31 2011 -0800 Staging: hv: Eliminate driver_context structure We need to move the following elements from struct driver_context: class_id and driver in one step. As part of this operation get rid of the struct driver_context. With this patch we will have consolidated all driver state into one data structure: struct hv_driver. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 06de23f788245414344316b02ccb1e6fdc21bf9a Author: K. Y. Srinivasan Date: Mon Mar 7 13:24:23 2011 -0800 Staging: hv: Change the signature for vmbus_child_driver_unregister In preperation for moving the element driver from the struct driver_context to struct hv_driver, change the signature for the function vmbus_child_driver_unregister() to take a pointer to struct device_driver. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit c643269d67236661b44ff3605b77fb6e10925fdd Author: K. Y. Srinivasan Date: Mon Mar 7 13:23:43 2011 -0800 Staging: hv: Change the signature for vmbus_child_driver_register In preparation for moving the element driver from the struct driver_context to struct hv_driver, change the signature for the function vmbus_child_driver_register() to take a pointer to struct device_driver. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit b9bd2f9b358613fb697c849a5300f890db54fbcf Author: K. Y. Srinivasan Date: Mon Mar 7 13:23:18 2011 -0800 Staging: hv: Remove unnecessary function pointers in driver_context Get rid of the unnecessary function pointers for probe(), remove() and shutdown() from struct driver_context. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 38fadc3e1f2ed55544acb75823ba7b2929597f68 Author: K. Y. Srinivasan Date: Mon Mar 7 13:22:20 2011 -0800 Staging: hv: Use generic device_driver shutdown function In preparation for moving all the state from struct driver_context to struct hv_driver, eliminate the shutdown() function from struct driver_context and use generic device_driver shutdown() function. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 94851c343d1f98f866760c96a8956e30b07e579c Author: K. Y. Srinivasan Date: Mon Mar 7 13:21:47 2011 -0800 Staging: hv: Use generic device_driver remove function In preparation for moving all the state from struct driver_context to struct hv_driver, eliminate the remove() function from struct driver_context and use generic device_driver remove() function. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit f5fb4a205cbfff4acd2f567bb8f7a38892ad0dc6 Author: Inderpal Singh Date: Tue Mar 8 07:13:45 2011 +0900 ARM: EXYNOS4: Enable watchdog parent clock This patch adds the parent clock for watchdog timer for EXYNOS4. Signed-off-by: Inderpal Singh Signed-off-by: Kukjin Kim commit 904777c784eed64f6138b82da592c89bf0d37b9c Author: K. Y. Srinivasan Date: Mon Mar 7 13:20:57 2011 -0800 Staging: hv: Use generic device_driver probe function In preparation for moving all the state from struct driver_context to struct hv_driver, eliminate the probe() function from struct driver_context and use generic device_driver probe function. Signed-off-by: K. Y. Srinivasan Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit d542f180cd40a571a218e11b640dec27a3f627d0 Author: Alberto Mardegan Date: Mon Mar 7 19:48:24 2011 +0200 staging: samsung-laptop: Samsung R410P backlight driver Here's a trivial patch which adds support to the backlight device found in Samsung R410 Plus laptops. Signed-off-by: Alberto Mardegan Signed-off-by: Greg Kroah-Hartman commit 5917def58ab9f5848f2d1da835a33a490d0c8c69 Author: Tomas Winkler Date: Sun Mar 6 10:59:03 2011 +0200 staging/easycap: reduce code nesting in easycap_sound.c Reshuffle error handling to reduce indentation nesting This reduce number of lines exceeding 80 characters from 41 to 15 use: if (error) (return, goto, continue) CODE instead of: if (good) else Cc: Dan Carpenter Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 07ba111f0d5127d4c830799605e2cd0922611bf5 Author: Tomas Winkler Date: Sun Mar 6 00:55:24 2011 +0200 staging/easycap: easycap_settings.c don't copy constant strings twice eliminate copying twice a constant string just capture it using const char * pointer piggyback some other style fixes Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 31410596a87a71d677d21c2503b0549ff3df63a4 Author: Tomas Winkler Date: Sun Mar 6 00:55:23 2011 +0200 staging/easycap: add first level indentation to easycap_settings.c Add first level indentation to easycap_sound_settings with astyle -t8 10 lines over 80 characters were left out for further fix Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit cb81fa07f8beaead14ce500a0e43171591a03ea7 Author: Tomas Winkler Date: Sun Mar 6 00:55:22 2011 +0200 staging/easycap: kill EASYCAP_IS_VIDEODEV_CLIENT compilation conditional remove EASYCAP_IS_VIDEODEV_CLIENT and irrelevant code as the define is always set in the in-kernel driver Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit c0b3a8a034c225727a810977aee0ccd72b2d92c9 Author: Tomas Winkler Date: Sun Mar 6 00:55:21 2011 +0200 staging/easycap: reduce code duplication for ssa stk settings reduce code duplication in register settings instead of if (ntsc) else use cfg = (ntsc) ? configNTSC : configPAL; in addition change while loops to more readable for loops Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit fd49b7879890d0f17c1cb86eb07e449d9c9f0699 Author: Tomas Winkler Date: Sun Mar 6 00:55:20 2011 +0200 staging/easycap: wait_i2c should be static wait_i2c is only used from easycap_low.c so remove it from the easycap.h and mark it static Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 4495c15f29a11c41d0a69a6e848307b0db7cc196 Author: Xiaochen Wang Date: Sun Mar 6 22:53:21 2011 +0800 staging: rtl8712: check _malloc return value Description: The original check is wrong. Signed-off-by: Xiaochen Wang Acked-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit cd92274093876c57fa4de0f219a552911ef9adc6 Author: Xiaochen Wang Date: Sun Mar 6 22:24:14 2011 +0800 staging: rtl8712: check copy_from_user return value Description:return -EFAULT if copy_to_user() fails Signed-off-by: Xiaochen Wang Acked-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 9603ff50b5d56e6ee64b10116ff640320732f9c8 Author: Xiaochen Wang Date: Sun Mar 6 22:04:15 2011 +0800 staging: rtl8192e use kmemdup and check its return value use kmemdup instead of kmalloc and memcpy, and check its return value Signed-off-by: Xiaochen Wang Signed-off-by: Greg Kroah-Hartman commit 0875abf83df7d74bf9858c125e82835bd1ca349c Author: Xiaochen Wang Date: Fri Mar 4 13:09:00 2011 +0800 staging: rtl8187se: check kmalloc return value check kmalloc return value Signed-off-by: Xiaochen Wang Signed-off-by: Greg Kroah-Hartman commit 9025c0faeefdbffd0b65e155876824e4e8de1723 Author: Dowan Kim Date: Fri Mar 4 17:47:43 2011 -0800 staging: brcm80211: FIX for bug that prevents system from entering suspend state The attempt to enter to suspend mode can be hindered when the network interface is disabled. When system enters the suspend mode with the network interface disabled, network layer calls ifdown() followed by cfg80211 layer calling wl_cfg80211_suspend() which is registered as suspend handler for cfg80211 layer. ifdown() call ultimately funnels down to __wl_cfg80211_down() call where WL_STATUS_READY bit is cleared via call to "clear_bit(WL_STATUS_READY, &wl->status)" But CHECK_SYS_UP()checks WL_STATUS_READY bit thinking it's not ready and returns -EIO from suspend handler which intern prevents entering into system suspend state CHECK_SYS_UP() is mainly used in the code path where upper layer would request certain wifi related activity to be performed by the firmware, where this calls helps to make sure our firmware would be in ready state to respond to those requests But in the case of wl_cfg80211_suspend() code path there is no need to check for firmware status for any reason Signed-off-by: Dowan Kim Signed-off-by: Greg Kroah-Hartman commit 2d2322b269c2524996a259024f82c7e318719696 Author: wwang Date: Fri Mar 4 10:56:36 2011 +0800 staging: rts_pstor: fix a bug that a greenhouse sd card can't be recognized A greenhouse sd card can't be recognized using rts5209. To fix this bug, these modifications are applied: 1, Move some codes which clear sd internal variables from sd_init_type to sd_prepare_reset. So sd_init_type is useless any more and is removed entirely; 2, If a sd card can't pass sd3.0 mode, the action of tunning phase should be avoided when retrying sd2.0 mode. Signed-off-by: wwang Signed-off-by: Greg Kroah-Hartman commit 1254a459a376962ba771618742af47c8a1b92a6e Author: Mark Allyn Date: Thu Mar 3 16:38:28 2011 -0800 staging: sep: remove unused ioctls Also remove associated functions, structures, and defines Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 41e568d14ec0aca1b2bb19563517aad3b06d6805 Author: huajun li Date: Fri Mar 4 10:56:18 2011 +0800 Staging: Merge ENE UB6250 SD card codes from keucr to drivers/usb/storage The usb portion of this driver can now go into drivers/usb/storage. This leaves the non-usb portion of the code still in staging. Signed-off-by: Huajun Li Signed-off-by: Greg Kroah-Hartman commit 153775d94899503f5f66baaa9751a43c74d4f371 Author: Mike McCormack Date: Thu Mar 3 22:47:41 2011 +0900 staging: rtl8192e: unused Remove dot11PowerSaveMode and RT_PS_MODE Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 73aaa501567043f6dca6be662a87fb08388df40f Author: Mike McCormack Date: Thu Mar 3 22:47:29 2011 +0900 staging: rtl8192e: Move card specific structures out of ieee80211 library header Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 73fdfd7b78bfa8b0735d39be82519e18ad2fdff8 Author: Mike McCormack Date: Thu Mar 3 22:47:16 2011 +0900 staging: rtl8192e: Delete unused members from struct r8192_priv Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 83969021b2133450e9f7b018ae28dd6afb9a10f4 Author: Mike McCormack Date: Thu Mar 3 22:46:42 2011 +0900 staging: rtl8192e: Delete non-existing function declarations Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit c9c0a1e7d9df0bd83458236bd1e084fefab4725d Author: Mike McCormack Date: Thu Mar 3 22:46:32 2011 +0900 staging: rtl8192e: Delete unused dm_change_dynamic_initgain_thresh Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 262cd816029fb0e6e257c48d86582914a4831d3f Author: Mike McCormack Date: Thu Mar 3 22:46:17 2011 +0900 staging: rtl8192e: Pass r8192_priv to MgntActSet_RF_State Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 7088dfb69877a07712d56bd9f3d2f48b4e7db30e Author: Mike McCormack Date: Thu Mar 3 22:46:04 2011 +0900 staging: rtl8192e: Pass r8192_priv around instead of net_device Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 4fc2102522838b9933743fe38d22494efb1100da Author: Mike McCormack Date: Thu Mar 3 22:45:54 2011 +0900 staging: rtl8192e: Remove redundant function declarations Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit af59c39d5cbaba5e6c83da94907e02744bd47670 Author: Mike McCormack Date: Thu Mar 3 22:45:42 2011 +0900 staging: rtl8192e: Pass r8192_priv around instead of net_device Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 480ab9dccb9b82ff9fca3118abd65e9f7908a085 Author: Mike McCormack Date: Thu Mar 3 22:45:24 2011 +0900 staging: rtl8192e: Convert more functions to use r8192_priv Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit d9ffa6c2e9752bb3c87995e2d97444c713dbc07f Author: Mike McCormack Date: Thu Mar 3 22:45:08 2011 +0900 staging: rtl8192e: Pass r8192e_priv to phy functions Phy functions shouldn't be associated with net_device. Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 5aa68752f993b9e411196bbc44a202aadee42de2 Author: Mike McCormack Date: Thu Mar 3 22:44:58 2011 +0900 staging: rtl8192e: Pass r8192_priv to eprom_read Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 31d664e56bb508aaa00de3952f0746dcd9d18a01 Author: Mike McCormack Date: Thu Mar 3 22:44:47 2011 +0900 staging: rtl8192e: Move PowerSaveControl to r8192e_priv This variable is not used by the ieee80211 library, so move it rtl8192e's private struct. Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 774dee1c1af9dd4994d5055bf2507c9ad72991e3 Author: Mike McCormack Date: Thu Mar 3 22:44:37 2011 +0900 staging: rtl8192e: Move variables to ieee80211 struct Move variables only accessed by the RTL ieee80211 library into its private struct. Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 8e0af57d9eb893a27e35d09e29d89b974a5d375d Author: Mike McCormack Date: Thu Mar 3 22:44:28 2011 +0900 staging: rtl8192e: Move definition of RT_RF_CHANGE_SOURCE Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 181d1dff582a10c0af2adf9f5f06ac17dbdeae8a Author: Mike McCormack Date: Thu Mar 3 22:41:53 2011 +0900 staging: rtl8192e: Move RfOffReason to r8192e_priv struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 4559854d2db145e5c9a7c217f058e7bad706c097 Author: Mike McCormack Date: Thu Mar 3 22:41:35 2011 +0900 staging: rtl8192e: Move eRFPowerState to r8192e_priv struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 477dfe7069ba8458f7ffe25c5ffcb91e70407bba Author: Mike McCormack Date: Thu Mar 3 22:41:25 2011 +0900 staging: rtl8192e: Remove pointless hw_sleep_wq Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 0d65112ac0f083c77514c9e83958860d542b1d1a Author: Mike McCormack Date: Thu Mar 3 22:41:12 2011 +0900 staging: rtl8192e: Remove unnecessary ps_lock Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 09f143791cc88bdbff0f1f8f2a6a747da896601b Author: Mike McCormack Date: Thu Mar 3 22:41:02 2011 +0900 staging: rtl8192e: Use single spinlock in MgntActSet_RF_State Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 0903602e2c2f796d63ef7b73e2888c6d13899140 Author: Mike McCormack Date: Thu Mar 3 22:40:52 2011 +0900 staging: rtl8192e: Remove SetRFPowerState Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit fea84ba0f982a57598a92cd806904395f1b8839f Author: Mike McCormack Date: Thu Mar 3 22:40:41 2011 +0900 staging: rtl8192e: Remove SetRFPowerStateInProgress Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 2cb61ea25b49049f9281007f8b534e5d384ebba5 Author: Mike McCormack Date: Thu Mar 3 22:40:30 2011 +0900 staging: rtl8192e: Add a spinlock around SetRFPowerState8190 Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit bc54f3393c0563a00c13d2b58aca23ae153bdd3b Author: Marek Belisko Date: Thu Mar 3 12:38:17 2011 +0000 staging: gma500: fix build errors This patch will fix following compilation error: drivers/staging/gma500/psb_drv.c:1635: error: unknown field ‘pci_driver’ specified in initializer drivers/staging/gma500/psb_drv.c:1636: error: unknown field ‘name’ specified in initializer drivers/staging/gma500/psb_drv.c:1636: warning: initialization from incompatible pointer type drivers/staging/gma500/psb_drv.c:1637: error: unknown field ‘id_table’ specified in initializer drivers/staging/gma500/psb_drv.c:1637: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1637: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1638: error: unknown field ‘resume’ specified in initializer drivers/staging/gma500/psb_drv.c:1638: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1638: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1639: error: unknown field ‘suspend’ specified in initializer drivers/staging/gma500/psb_drv.c:1639: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1639: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1640: error: unknown field ‘probe’ specified in initializer drivers/staging/gma500/psb_drv.c:1640: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1640: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1641: error: unknown field ‘remove’ specified in initializer drivers/staging/gma500/psb_drv.c:1641: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1641: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1643: error: unknown field ‘driver’ specified in initializer drivers/staging/gma500/psb_drv.c:1643: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1643: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c: In function ‘psb_init’: drivers/staging/gma500/psb_drv.c:1664: error: implicit declaration of function ‘drm_init’ drivers/staging/gma500/psb_drv.c: In function ‘psb_exit’: drivers/staging/gma500/psb_drv.c:1669: error: implicit declaration of function ‘drm_exit’ Signed-off-by: Marek Belisko Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 487e873dd3f8d7ede7635896e19376ef78157721 Author: Alan Cox Date: Thu Mar 3 12:38:04 2011 +0000 staging: gma500: Resync the patch queue with GregKH's space cleanup. Remove all sorts of bits we can get rid of. We are now a very simple KMS driver relying on the stolen memory for our framebuffer base (which is for the moment hardcoded). To support multiple frame buffers and some accel bits we will need some kind of memory allocator, possibly a minimal use of GEM. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2145cff54f512907a4c4fa906f957fa62406e558 Author: Jonathan Neuschäfer Date: Thu Mar 3 14:25:08 2011 +0100 staging: keucr: use kernel byteorder functions Signed-off-by: Jonathan Neuschäfer Reviewed-by: Jack Stone Signed-off-by: Greg Kroah-Hartman commit 22a55690c124e89cd7dcad301cc8f43dd9c4aa0a Author: Jonathan Neuschäfer Date: Thu Mar 3 14:25:07 2011 +0100 staging: keucr: remove unused typedef VOID Signed-off-by: Jonathan Neuschäfer Signed-off-by: Greg Kroah-Hartman commit 6888393c43c95a40d551989e89cbf572423619e6 Author: Tomas Winkler Date: Thu Mar 3 00:10:51 2011 +0200 staging/easycap: convert comparison to NULL into boolean convert if (NULL != ptr) to if (ptr) convert if (NULL == ptr) to if (!ptr) Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit febd32bcfd09aeb543b229fd2896814a26d74d20 Author: Tomas Winkler Date: Thu Mar 3 00:10:50 2011 +0200 staging/easycap: replace if(false == var) with if (!var) 's/(false == \([^ ]\+\))/(!\1)/g' Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 27d683ab79a408a6a48cb01a200af9abf82cca5a Author: Tomas Winkler Date: Thu Mar 3 00:10:49 2011 +0200 staging/easycap: replace if(true == var) with if (var) 's/(true == \([^ ]\+\))/(\1)/g' Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit a90f36206f0af9d6e2378a5f9c02dea081a04ae5 Author: Tomas Winkler Date: Thu Mar 3 00:10:48 2011 +0200 staging/easycap: more style fixing in easycap_main.c mostly indentation fixes and some line over 80 characters fixes Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 817368f19af206d382be1347165f1bb2817a666a Author: Aaro Koskinen Date: Thu Mar 3 00:26:35 2011 +0200 staging: xgifb: remove private ioctls Drop the badly defined and broken private ioctl interface. Since the driver is in staging, and some of the ioctls are clearly unsafe or not even working, it's unlikely that there are any users. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 5d884b97c5143f0d4097cefefbf9f7f755fd54fa Author: Thomas Viehweger Date: Wed Mar 2 23:00:20 2011 +0100 staging: lirc: fix for "lirc_dev: lirc_register_driver: driver pointer must be not NULL!" Unable to load the module lirc_parallel without the attached patch. Signed-off-by: Thomas Viehweger Signed-off-by: Greg Kroah-Hartman commit d5c97c1099f5617dc1ba3d1f0058d1341b1faf4c Author: Javi Merino Date: Mon Mar 7 21:13:07 2011 +0000 kref: Fix typo in kref documentation container_of() should refer to the struct created in the example. Signed-off-by: Javi Merino Cc: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit f1a304e7941cc76353363a139cbb6a4b1ca7c737 Author: Pratheesh Gangadhar Date: Sat Mar 5 04:30:17 2011 +0530 UIO: add PRUSS UIO driver support This patch implements PRUSS (Programmable Real-time Unit Sub System) UIO driver which exports SOC resources associated with PRUSS like I/O, memories and IRQs to user space. PRUSS is dual 32-bit RISC processors which is efficient in performing embedded tasks that require manipulation of packed memory mapped data structures and handling system events that have tight real time constraints. This driver is currently supported on Texas Instruments DA850, AM18xx and OMAP-L138 devices. For example, PRUSS runs firmware for real-time critical industrial communication data link layer and communicates with application stack running in user space via shared memory and IRQs. Signed-off-by: Pratheesh Gangadhar Reviewed-by: Thomas Gleixner Reviewed-by: Arnd Bergmann Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 256ee435b9a9ee9cca69602fe8046b27ca99fbee Author: Joe Perches Date: Tue Mar 1 07:06:12 2011 +0000 netdevice: Convert printk to pr_info in netif_tx_stop_queue This allows any caller to be prefaced by any specific pr_fmt to better identify which device driver is using this function inappropriately. Add terminating newline. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e27c3c5c7e0fb107990c7f465a3525312f6d45aa Author: Lars-Peter Clausen Date: Mon Mar 7 08:42:00 2011 +0100 ARM: s3c24xx: Switch to common GPIO controlled UDC pullup implementation Currently all boards using the s3c2410_udc driver use a GPIO to control the state of the pullup, as a result the same code is reimplemented in each board This patch changes these boards to use the common implementation for GPIO controlled pullup in the UDC driver. Signed-off-by: Lars-Peter Clausen Acked-by: Vasily Khoruzhick Signed-off-by: Greg Kroah-Hartman commit a74022a55e44fe2044ac3660452cafecb300aece Author: Lars-Peter Clausen Date: Mon Mar 7 08:41:59 2011 +0100 USB: s3c2410_udc: Add common implementation for GPIO controlled pullups Currently all boards using the s3c2410_udc driver use a GPIO to control the state of the pullup, as a result the same code is reimplemented in each board file. This patch adds support for using a GPIO to control the pullup state to the udc driver, so the boards can use a common implementation. Signed-off-by: Lars-Peter Clausen Signed-off-by: Greg Kroah-Hartman commit 09173b589d547c002b6a2b560e150c4d7bb56c99 Author: Anand Gadiyar Date: Wed Feb 16 16:47:19 2011 +0530 arm: omap4: 4430sdp: drop ehci support Most revisions of the OMAP4 Blaze/SDP platform do not have the EHCI signals routed by default. The pads are routed for the alternate HSI functionality instead, and explicit board modifications are needed to route the signals to the USB PHY on the board. Also, turning on the PHY connected to the EHCI port causes a board reboot during bootup due to an unintended short on the rails - this affects many initial revisions of the board, and needs a minor board mod to fix (or as a workaround, one should not attempt to power on the USB PHY). Given that these boards need explicit board mods to even get EHCI working (separate from the accidental short above), we should not attempt to enable EHCI by default. So drop the EHCI support from the board files for the Blaze/SDP platforms. Signed-off-by: Anand Gadiyar Cc: Keshava Munegowda Cc: Tony Lindgren Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit fa417c369b48a8f7acaf9aba1ff94b0969b0cb7e Author: Sergei Shtylyov Date: Thu Mar 3 21:10:05 2011 +0300 USB: OHCI: use pci_dev->revision Commit ab1666c1364a209e6141d7c14e47a42b5f00eca2 (USB: quirk PLL power down mode) added code that reads the revision ID from the PCI configuration register while it's stored by PCI subsystem in the 'revision' field of 'struct pci_dev'... Signed-off-by: Sergei Shtylyov Signed-off-by: Greg Kroah-Hartman commit dfb2130c453c2c6d36b5e0f39eca289cbdbb631d Author: Pavankumar Kondeti Date: Fri Mar 4 22:45:02 2011 +0530 USB: Rename "msm72k_otg.c" to "msm_otg.c" This driver is used across all MSM SoCs. Hence give a generic name. All Functions and strutures are also using "msm_otg" as prefix. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit d3cf2a8d4ddd121dbf4ad48c995648af04e0cfbf Author: Arvid Brodin Date: Mon Mar 7 15:36:21 2011 +0100 usb/isp1760: Fix crash when unplugging bug This fixes a problem with my previous patch series where there's a great risk that the kernel will crash when unplugging interrupt devices from the USB port. These lines must have got missing when I rebased the patches from the older kernel I was working with to 2.6.37 and 2.6-next: This fixes a bug where the kernel may crash if you unplug a USB device that has active interrupt transfers. Signed-off-by: Arvid Brodin Signed-off-by: Greg Kroah-Hartman commit 9b37596a2e860404503a3f2a6513db60c296bfdc Author: Alan Stern Date: Mon Mar 7 11:11:52 2011 -0500 USB: move usbcore away from hcd->state The hcd->state variable is a disaster. It's not clearly owned by either usbcore or the host controller drivers, and they both change it from time to time, potentially stepping on each other's toes. It's not protected by any locks. And there's no mechanism to prevent it from going through an invalid transition. This patch (as1451) takes a first step toward fixing these problems. As it turns out, usbcore uses hcd->state for essentially only two things: checking whether the controller's root hub is running and checking whether the controller has died. Therefore the patch adds two new atomic bitflags to the hcd structure, to store these pieces of information. The new flags are used only by usbcore, and a private spinlock prevents invalid combinations (a dead controller's root hub cannot be running). The patch does not change the places where usbcore sets hcd->state, since HCDs may depend on them. Furthermore, there is one place in usb_hcd_irq() where usbcore still must use hcd->state: An HCD's interrupt handler can implicitly indicate that the controller died by setting hcd->state to HC_STATE_HALT. Nevertheless, the new code is a big improvement over the current code. The patch makes one other change. The hcd_bus_suspend() and hcd_bus_resume() routines now check first whether the host controller has died; if it has then they return immediately without calling the HCD's bus_suspend or bus_resume methods. This fixes the major problem reported in Bugzilla #29902: The system fails to suspend after a host controller dies during system resume. Signed-off-by: Alan Stern Tested-by: Alex Terekhov CC: Signed-off-by: Greg Kroah-Hartman commit de701c74a34005e637e1ca2634fbf28fd1debba2 Author: Vivek Goyal Date: Mon Mar 7 21:09:32 2011 +0100 blk-throttle: Some cleanups and race fixes in limit update code When throttle group limits are updated through cgroups, a thread is woken up to process these updates. While reviewing that code, oleg noted couple of race conditions existed in the code and he also suggested that code can be simplified. This patch fixes the races simplifies the code based on Oleg's suggestions: - Use xchg(). - Introduced a common function throtl_update_blkio_group_common() which is shared now by all iops/bps update functions. Reviewed-by: Oleg Nesterov Reviewed-by: Paul E. McKenney Signed-off-by: Vivek Goyal Fixed a merge issue, throtl_schedule_delayed_work() takes throtl_data as the argument now, not the queue. Signed-off-by: Jens Axboe commit 550462378515a82279e07f12e2c105f617f112f8 Author: Mayank Rana Date: Mon Mar 7 10:28:42 2011 +0530 serial: msm_serial_hs: Add MSM high speed UART driver This driver supports UART-DM HW on MSM platforms. It uses the on chip DMA to drive data transfers and has optional support for UART power management independent of Linux suspend/resume and wakeup from Rx. The driver was originally developed by Google. It is functionally equivalent to the version available at: http://android.git.kernel.org/?p=kernel/experimental.git the differences being: 1) Remove wakelocks and change unsupported DMA API. 2) Replace clock selection register codes by macros. 3) Fix checkpatch errors and add inline documentation. 4) Add runtime PM hooks for active power state transitions. 5) Handle error path and cleanup resources if required. CC: Nick Pelly Signed-off-by: Sankalp Bose Signed-off-by: Mayank Rana Signed-off-by: Greg Kroah-Hartman commit 231d704b4ab7491473c0b1a9cd0c6e0d1cba85b9 Author: Vivek Goyal Date: Mon Mar 7 21:05:14 2011 +0100 blk-throttle: process limit change only through one function With the help of cgroup interface one can go and upate the bps/iops limits of existing group. Once the limits are udpated, a thread is woken up to see if some blocked group needs recalculation based on new limits and needs to be requeued. There was also a piece of code where I was checking for group limit update when a fresh bio comes in. This patch gets rid of that piece of code and keeps processing the limit change at one place throtl_process_limit_change(). It just keeps the code simple and easy to understand. Signed-off-by: Vivek Goyal Signed-off-by: Jens Axboe commit 00bff392c81e4fb1901e5160fdd5afdb2546a6ab Author: Xiaotian Feng Date: Thu Mar 3 18:08:24 2011 +0800 tty_audit: fix tty_audit_add_data live lock on audit disabled The current tty_audit_add_data code: do { size_t run; run = N_TTY_BUF_SIZE - buf->valid; if (run > size) run = size; memcpy(buf->data + buf->valid, data, run); buf->valid += run; data += run; size -= run; if (buf->valid == N_TTY_BUF_SIZE) tty_audit_buf_push_current(buf); } while (size != 0); If the current buffer is full, kernel will then call tty_audit_buf_push_current to empty the buffer. But if we disabled audit at the same time, tty_audit_buf_push() returns immediately if audit_enabled is zero. Without emptying the buffer. With obvious effect on tty_audit_add_data() that ends up spinning in that loop, copying 0 bytes at each iteration and attempting to push each time without any effect. Holding the lock all along. Suggested-by: Alexander Viro Signed-off-by: Xiaotian Feng Signed-off-by: Greg Kroah-Hartman commit b71dc8873427bb5bf0ce31b968c3f219a1d6d014 Author: Arnd Bergmann Date: Thu Mar 3 18:38:22 2011 +0100 tty: move cd1865.h to drivers/staging/tty/ The file is required by the specialix driver, which was moved to drivers/staging/. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman commit 8d971e98a7be749445ac6eb9eb37b116f1a6d3c0 Author: Greg Kroah-Hartman Date: Mon Mar 7 12:03:07 2011 -0800 Staging: tty: fix build with epca.c driver I forgot to move the digi*.h files from drivers/char/ to drivers/staging/tty/ Thanks to Randy for pointing out the issue. Reported-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit d07bfd8b6f20a81d7ec65c50f35b053d9e3aa740 Author: Johannes Berg Date: Mon Mar 7 15:48:41 2011 +0100 mac80211: fix scan race, simplify code The scan code has a race that Michael reported he ran into, but it's easy to fix while at the same time simplifying the code. The race resulted in the following warning: ------------[ cut here ]------------ WARNING: at net/mac80211/scan.c:310 ieee80211_rx_bss_free+0x20c/0x4b8 [mac80211]() Modules linked in: [...] [] (unwind_backtrace+0x0/0xe0) from [] (warn_slowpath_common+0x4c/0x64) [... backtrace wasn't useful ...] Reported-by: Michael Buesch Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2a6672f2c425e6d1da2ef7f3169e417cd1f5a6cd Author: RafaÅ‚ MiÅ‚ecki Date: Mon Mar 7 15:09:19 2011 +0100 b43: trivial: update B43_PHY_N description (PHY support) Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit ea29cae9d701d3f57d401e6c295244bcc26fab8e Author: Michael Buesch Date: Mon Mar 7 13:31:24 2011 +0100 p54spi: Update kconfig help text This updates the p54spi Kconfig help text. The driver works well on n8x0, so remove the words "experimental" and "untested". Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit b196d031f2bb29c253050d554130e41c7e3cbfb0 Author: Michael Buesch Date: Mon Mar 7 13:09:12 2011 +0100 mac80211: Add log message to ieee80211_restart_hw() Add a log message to ieee80211_restart_hw() to highlight that special codepath in the logs. This helps debugging bugs in the rarely tested restart code. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 118253ca46262342b87909927fec6214fa4a06a4 Author: Stanislaw Gruszka Date: Mon Mar 7 09:22:24 2011 +0100 iwlwifi: fix iwl-rx.c compilation My commit 466a19a003f3b45a755bc85f967c21da947f9a00 "iwlwifi: move rx handlers code to iwl-rx.c" breaks compilation on 32 bits. Fix that. Reported-by: Guy, Wey-Yi Reported-by: Daniel Halperin Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 9ac4793359f374e4e9ec6a71b65677096c024acd Author: Shan Wei Date: Mon Mar 7 15:18:11 2011 +0800 wireless:ath: use resource_size() help function Signed-off-by: Shan Wei Signed-off-by: John W. Linville commit 2d0123a5d635e336dbab21eba62e8dd4eb3e39a0 Author: Shan Wei Date: Fri Mar 4 15:14:16 2011 +0800 mac80211: remove unused macros Compile test only. Signed-off-by: Shan Wei Signed-off-by: John W. Linville commit e4b0b32aa1c0dd7ae6340833dd6b19de46409a88 Author: Ben Greear Date: Thu Mar 3 14:39:05 2011 -0800 ath5k: Put hardware in PROMISC mode if there is more than 1 stations. It seems ath5k has issues receiving broadcast packets (ARPs) when using multiple STA interfaces associated with multiple APs. This patch ensures the NIC is always in PROMISC mode if there are more than 1 stations associated. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 208277f74e449fca082c1895086bd44c159efba5 Author: Shawn Guo Date: Mon Feb 21 18:42:55 2011 +0800 ARM: mxs: make ssp error irq definition consistent Signed-off-by: Shawn Guo Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 3baa4feeadf22ae72dad217f31ea739d881fc149 Author: Shawn Guo Date: Tue Feb 22 21:36:27 2011 +0800 ARM: mxs: add dma device Signed-off-by: Shawn Guo Tested-by: Wolfram Sang Signed-off-by: Sascha Hauer commit 4ca94366b314c22fda49cbe2c51ceb7bb3e16932 Author: Shawn Guo Date: Mon Feb 21 18:31:45 2011 +0800 ARM: mxs: add dma channel definitions Signed-off-by: Shawn Guo Tested-by: Wolfram Sang Signed-off-by: Sascha Hauer commit b73d77b2b75091b09d31f5c47924c99d4f19930a Author: Shawn Guo Date: Sun Mar 6 00:40:22 2011 +0800 ARM: mxs/mx23evk: add framebuffer device Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 122eb103924316c1229f1b8aeea7492893d910c9 Author: Shawn Guo Date: Sun Mar 6 00:40:21 2011 +0800 ARM: mxs: fix typo "GPO" in iomux-mx23.h Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit db63a493838473e3ae87e0db06bb6ddd817f20a2 Author: Shawn Guo Date: Sun Mar 6 00:40:19 2011 +0800 ARM: mxs: add helper macro for pad control This patch is to add pad control helper macro to make the code easy to read. The need is being seen when adding pad definitions for LCDIF which gets ~30 pads to define. Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 65e7a3222fd9f47eafa908ef3e350ce4f953914e Author: Uwe Kleine-König Date: Thu Mar 3 22:36:57 2011 +0100 ARM: mxc91231: select MXC_AVIC This fixes: arch/arm/kernel/built-in.o: In function `__irq_svc': io.c:(.text+0x2e0): undefined reference to `avic_base' arch/arm/kernel/built-in.o: In function `__irq_usr': io.c:(.text+0x4c8): undefined reference to `avic_base' arch/arm/mach-mxc91231/built-in.o: In function `mxc91231_init_irq': magx-zn5.c:(.init.text+0x18): undefined reference to `mxc_init_irq' and was broken by c7259df (ARM i.MX irq: Compile avic irq code only on SoCs that need it) Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit c23eb89ef71cda127cfcfee84292cb2fb5747d4d Author: Richard Zhao Date: Thu Mar 3 16:40:03 2011 +0800 ARM: imx3x: clean up ARCH_MX3X Move to SOC_SOC_IMX3X. Leave ARCH_MX31/35 definitions there, in case some place prevent multi-soc single image. Signed-off-by: Richard Zhao Acked-by: Marc Kleine-Budde Signed-off-by: Sascha Hauer commit 76851671287209759f63c090ffaffca56ba00358 Author: Richard Zhao Date: Thu Mar 3 16:40:02 2011 +0800 ARM: imx5x: clean up ARCH_MX5X Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc using ARCH_MX5X. Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 48f6b0999673cce33e4a54d89c78460cc28e5156 Author: Sascha Hauer Date: Wed Mar 2 09:27:42 2011 +0100 ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers The boards are currently using otg_ulpi_create and mxc_ulpi_access_ops, both are only present if CONFIG_USB_ULPI is set. To remove the need of ifdefs in the board code introduce a imx_otg_ulpi_create functions which expands to a static inline function if compiled without ulpi. Signed-off-by: Sascha Hauer commit 94573e6623cf9159f036adc670a3d4b29e6d86fe Author: Sascha Hauer Date: Wed Mar 2 10:10:14 2011 +0100 ARM i.MX31 lilly: remove incomplete otg support The platform data for the otg port is present but never used, so remove it. Signed-off-by: Sascha Hauer Cc: Daniel Mack commit ff255feba1c575311378a3d7a3867e46549c8aa6 Author: Sascha Hauer Date: Thu Feb 17 15:08:12 2011 +0100 ARM i.MX: iomux v1 initialization away from initcall This saves us from soc level dispatching in generic files Signed-off-by: Sascha Hauer commit 5ae30b477e9fb7319e2976fbf3521c0fac2625f1 Author: Sascha Hauer Date: Thu Feb 17 14:43:48 2011 +0100 ARM i.MX: Move gpio initialization to SoC specific files This saves us from soc level dispatching in generic files Signed-off-by: Sascha Hauer commit 9685a3609d7f15297987c511c323b43693317960 Author: Gwenhael Goavec-Merou Date: Wed Mar 2 08:11:05 2011 +0000 MX1: Add structure, registration functions for framebuffer and rename LCDC INT Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Sascha Hauer commit 54c4bd658ee7cfdaec57d5fb8677e9bf8a380df5 Author: Fabio Estevam Date: Wed Mar 2 13:30:53 2011 -0300 ARM: mx5/mx53_evk: Fix IOMUX for UART3 On mx53_evk board only RX/TX pins are used on UART3. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit d79c01b0a212ae25c7b2c63274fffacf38dbcaaa Author: Fabio Estevam Date: Wed Mar 2 13:30:52 2011 -0300 ARM: mx5/mx53_smd: Fix IOMUX for UART2 On mx53_smd board only RX/TX pins are used on UART2. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 1a46cce8564b3f4e42c283bd7d18ad9674383ef5 Author: Fabio Estevam Date: Wed Mar 2 11:26:49 2011 -0300 ARM: mx3/mx35_3ds: Use MX35 USB OTG Erratum Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 761b6d1a3efd50b3f15f9e78615297802e0f91d2 Author: Wolfram Sang Date: Tue Mar 1 10:21:51 2011 +0100 arm: mxs: add irq_chip-name for GPIO IRQs Reported-by: Alexander Stein Signed-off-by: Wolfram Sang Acked-by: Shawn Guo Signed-off-by: Sascha Hauer commit 2e8fd696145819c6c5d6ac08c603af655e7f2298 Author: Sascha Hauer Date: Fri Jan 14 15:32:49 2011 +0100 ARM i.MX23/28: Add framebuffer device support Signed-off-by: Sascha Hauer Cc: Shawn Guo commit f0a523b5e5e2db4e8518ae20f466c0a6be7e145e Author: Sascha Hauer Date: Fri Jan 14 15:22:31 2011 +0100 video: Add i.MX23/28 framebuffer driver changes since v2: - use v3 and v4 for specifying the ip version instead of i.MX23/28. This is a better namespace when future versions are added. - rename mach/fb.h to mach/mxsfb.h changes since v1: - Add a LCDC_ prefix to the register names. - use set/clear registers where appropriate - protect call to mxsfb_disable_controller() in mxsfb_remove() with a (host->enabled) as suggested by Lothar Wassmann Signed-off-by: Sascha Hauer Acked-by: Shawn Guo Cc: Paul Mundt Cc: linux-fbdev@vger.kernel.org commit 8d8eb17765dc8e232e30a9fb55f89c0056fa17ea Author: Uwe Kleine-König Date: Wed Mar 2 10:59:49 2011 +0100 ARM: mxc91231/iomux: allow pin_list to be const While at it remove some useless consts from unsigned int arguments. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 10a3c45c6821d3ffe974bc5937693f18a16dd96c Author: Uwe Kleine-König Date: Wed Mar 2 10:59:48 2011 +0100 ARM: iomux-imx31: allow pin_list to be const This fixes the following warning in a mx3_defconfig build: arch/arm/mach-mx3/mach-bug.c: In function 'bug_board_init': arch/arm/mach-mx3/mach-bug.c:47: warning: passing argument 1 of 'mxc_iomux_setup_multiple_pins' discards qualifiers from pointer target type While at it remove some useless consts from unsigned int arguments. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 2093023889b8c15bb90acb435e33e2843ef0153c Author: Fabio Estevam Date: Tue Mar 1 16:59:48 2011 -0300 ARM: mx53_smd: Add I2C support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit ff864521a93ca3932e281828d41f709e107dad70 Author: Fabio Estevam Date: Tue Mar 1 16:59:47 2011 -0300 ARM: mx25_3ds: Add I2C support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 5885f0362b3fbe476b7ef0af0beac7a114a0a8dd Author: Fabio Estevam Date: Tue Mar 1 16:59:46 2011 -0300 ARM: mx27_3ds: Add I2C support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 3d94302442cce1124a0adc0402bf609d9d8d808c Author: Fabio Estevam Date: Tue Mar 1 16:59:45 2011 -0300 ARM: mx31_3ds: Add I2C support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 352cd9a0b849494a44a46c60219b8b6ea99f1d70 Author: Fabio Estevam Date: Tue Mar 1 16:59:44 2011 -0300 ARM: mx35_3ds: Add I2C support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit a5e2051b720fb5bcb35f0edfc80c108448acb713 Author: Javier Martin Date: Tue Mar 1 15:02:08 2011 +0100 ARM: Add SSI and aic3204 code to Visstrim_M10 boards. Visstrim_M10 boards have an TI tlv320aic3204 codec attached to SSI1. Signed-off-by: Javier Martin Signed-off-by: Sascha Hauer commit 3fc6b60976d01feda083e2a05b3c40217ad32799 Author: Uwe Kleine-König Date: Tue Mar 1 21:30:58 2011 +0100 ARM: mx3/cpuimx35: fix build failure It seems vim's autocompletion played tricks on me without me noticing. This was intruduced in 97976e2 (ARM: mx3: use .init_early to initialize cpu type, reset address and iomuxer) Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 772edeaec182fa98a2b4ed0753ca3dfd4f51d6a8 Author: Richard Zhu Date: Mon Feb 28 19:32:02 2011 +0800 ARM: imx53_loco: add esdhc device support Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 359219025e20a3ad61f081a82e0feec0583aca9b Author: Richard Zhu Date: Mon Feb 28 19:32:03 2011 +0800 ARM: imx51/53: add sdhc3/4 clock Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit a77dd2aa92388d61f7344a32b06fd1de70e71928 Author: Wolfram Sang Date: Mon Feb 28 17:40:05 2011 +0100 arm: mxs: tx28: add i2c bus and connected RTC Signed-off-by: Uwe Kleine-König Signed-off-by: Wolfram Sang Signed-off-by: Sascha Hauer commit 30feed37f21e00655475d8bf17bcea02221e53d2 Author: Wolfram Sang Date: Mon Feb 28 17:40:04 2011 +0100 arm: mxs: add i2c-devices for mx28 Signed-off-by: Wolfram Sang Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 19373c04b9c260b83e268e40e3210c01281efb6d Author: Gwenhael Goavec-Merou Date: Wed Feb 23 16:58:39 2011 +0000 MX1: Add registration functions for SPI. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Sascha Hauer commit 13f40686b1dc8cc3c2110d3f902e0b3ec9ddee10 Author: Gwenhael Goavec-Merou Date: Wed Feb 23 16:58:36 2011 +0000 MX1: Add data structure for SPI Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Sascha Hauer commit e893f7cb47f7e472d852922547f1283bd12f7d26 Author: Gwenhael Goavec-Merou Date: Wed Feb 23 16:58:38 2011 +0000 MX1: Register clock for SPI2 Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Sascha Hauer commit 40b2747b5b4f49a5f268c71321677fa98f63f046 Author: Gwenhael Goavec-Merou Date: Wed Feb 23 16:58:37 2011 +0000 MX1: Rename SPI interrupt name and base address. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Sascha Hauer commit 4dbbaa69e12a2dfd57a156ff3e233dabc9a9e885 Author: Ryan Lortie Date: Sat Feb 26 19:41:53 2011 -0500 ARM: imx35: fix trivial copy/paste error Change imx31_add_imx_keypad() to imx35_add_imx_keypad() in mach-mx3/devices-imx35.h. Signed-off-by: Ryan Lortie Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit d058b649336e16d110744888fd4287733a4ea854 Author: Ryan Lortie Date: Sat Feb 26 19:41:52 2011 -0500 ARM: imx35: fix ATA_DATA3 pad control address According to the "i.MX35 (MCIMX35) Multimedia Applications Processor Reference Manual" the correct address for the pad control register IOMUXC_SW_PAD_CTL_PAD_ATA_DATA3 is 0x06ec, not 0x6e8. Signed-off-by: Ryan Lortie Acked-by: Marc Reilly Signed-off-by: Sascha Hauer commit 20fcd4aa019af7576f8ee704c6fd2908811981d5 Author: Eric Bénard Date: Fri Feb 25 13:49:15 2011 +0100 i.MX25: add sdma clock definitions Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 1cb59f9f79f4ed89845f6f8bebf0273442e1ccd5 Author: Lothar Waßmann Date: Fri Dec 10 16:22:47 2010 +0100 ARM: mxs: Initial support for Ka-Ro TX28 Based on code created by Lothar Waßmann, Sascha Hauer, Wolfram Sang and me. Signed-off-by: Lothar Waßmann Signed-off-by: Sascha Hauer Signed-off-by: Wolfram Sang Signed-off-by: Uwe Kleine-König commit ccb24d50b7ee242a2bf2dd208193f7335a3a0d7d Author: Sascha Hauer Date: Wed Feb 16 10:46:12 2011 +0100 ARM: mxs: Add missing EXPORT_SYMBOL for mxs_reset_block It is used for example in the i2c driver which can be compiled modular. Signed-off-by: Sascha Hauer Signed-off-by: Uwe Kleine-König commit f9c540456ab662a3b5d79c1fa93c51305a97fdf3 Author: Alexander Sverdlin Date: Mon Mar 7 20:29:58 2011 +0300 ASoC: Remove warnings in ep93xx-i2s.c Remove warnings in ep93xx-i2s.c Signed-off-by: Alexander Sverdlin Acked-by: Ryan Mallon Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 383f8465d1579635d7b7df5d7a1d1966b6ffb868 Author: Alexander Sverdlin Date: Mon Mar 7 20:29:36 2011 +0300 ASoC: Extend range of supported sample rates for CS4271 CODEC. Extend range of supported sample rates for CS4271 CODEC. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5ece3cafbd88d4da5c734e1810c4a2e6474b57b2 Author: Mi Jinlong Date: Fri Feb 18 09:08:31 2011 +0800 nfsd41: modify the members value of nfsd4_op_flags The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS) equals to ALLOWED_AS_FIRST_OP, maybe that's not what we want. OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS, can't appears as the first operation with out SEQUENCE ops. This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which was introduced by f9bb94c4. Cc: stable@kernel.org Reviewed-by: Benny Halevy Signed-off-by: Mi Jinlong Signed-off-by: J. Bruce Fields commit b0b0c0a26e846ae6646af9f59a3d2ea06b49cbc7 Author: Kevin Coffman Date: Wed Mar 2 19:51:42 2011 -0500 nfsd: add proc file listing kernel's gss_krb5 enctypes Add a new proc file which lists the encryption types supported by the kernel's gss_krb5 code. Newer MIT Kerberos libraries support the assertion of acceptor subkeys. This enctype information allows user-land (svcgssd) to request that the Kerberos libraries limit the encryption types that it uses when generating the subkeys. Signed-off-by: Kevin Coffman Signed-off-by: J. Bruce Fields commit 540c8cb6a576f34a9a0b04467f46bb6e67a1f852 Author: Kevin Coffman Date: Wed Mar 2 19:51:41 2011 -0500 gss:krb5 only include enctype numbers in gm_upcall_enctypes Make the value in gm_upcall_enctypes just the enctype values. This allows the values to be used more easily elsewhere. Signed-off-by: Kevin Coffman Signed-off-by: J. Bruce Fields commit 46d4cef9cf54f2f8b15216e3f6dad69750c69e0c Author: Jesper Juhl Date: Sun Mar 6 00:30:35 2011 +0100 NFSD, VFS: Remove dead code in nfsd_rename() Currently we have the following code in fs/nfsd/vfs.c::nfsd_rename() : ... host_err = nfsd_break_lease(odentry->d_inode); if (host_err) goto out_drop_write; if (ndentry->d_inode) { host_err = nfsd_break_lease(ndentry->d_inode); if (host_err) goto out_drop_write; } if (host_err) goto out_drop_write; ... 'host_err' is guaranteed to be 0 by the time we test 'ndentry->d_inode'. If 'host_err' becomes != 0 inside the 'if' statement, then we goto 'out_drop_write'. So, after the 'if' statement there is no way that 'host_err' can be anything but 0, so the test afterwards is just dead code. This patch removes the dead code. Signed-off-by: Jesper Juhl Signed-off-by: J. Bruce Fields commit 35079582e72efcabf7c70f3d3ee4f96e6f196606 Author: Shan Wei Date: Fri Jan 14 17:35:59 2011 +0800 nfsd: kill unused macro definition These macros had never been used for several years. So, remove them. Signed-off-by: Shan Wei Signed-off-by: J. Bruce Fields commit f32cb53219a956b96a4cd1ee7c6b1b8a48d40e9f Author: Namhyung Kim Date: Mon Jan 17 15:45:59 2011 +0900 locks: use assign_type() Signed-off-by: Namhyung Kim Signed-off-by: J. Bruce Fields commit d7433142b63d727b5a217c37b1a1468b116a9771 Author: Eric Sandeen Date: Fri Mar 4 16:04:08 2011 -0600 ext3: Always set dx_node's fake_dirent explicitly. (crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea by Andreas Schlick ) When ext3_dx_add_entry() has to split an index node, it has to ensure that name_len of dx_node's fake_dirent is also zero, because otherwise e2fsck won't recognise it as an intermediate htree node and consider the htree to be corrupted. CC: stable@kernel.org Signed-off-by: Eric Sandeen Signed-off-by: Jan Kara commit 9b74c7d6ba8b95b4feb8c17b2b38d72eb4240ea4 Author: Mark Brown Date: Mon Mar 7 12:23:10 2011 +0000 ASoC: Add LM4857 to SND_SOC_ALL_CODECS Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 47ae63e0c2e5fdb582d471dc906eb29be94c732f Merge: c59a333 467cffb Author: Chris Wilson Date: Mon Mar 7 12:32:44 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Apply the trivial conflicting regression fixes, but keep GPU semaphores enabled. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c commit a077ff9034897232ab4208f55880221390bd6877 Author: Lars-Peter Clausen Date: Mon Mar 7 08:04:59 2011 +0100 ASoC: Add driver for the dfbmcs320 bluetooth module This patch adds a codec driver for the dfbmcs320 bluetooth module, which is used on the neo1973 boards. The patch also modifies the neo1937_wm8753 sound board driver to use the new driver instead of registering the bluetooth DAI manually. Previously there was a name mismatch between the bluetooth DAI and the bluetooth DAI link and the sound card was not instantiated, with this patch the issue is no longer present and sound support works again. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f5c4ffbd65892829f7ec503a89ea24eb0fc952dc Author: Lars-Peter Clausen Date: Mon Mar 7 08:04:58 2011 +0100 ASoC: Samsung: Merge neo1937_wm8753 and neo1973_gta02_wm8753 sound board driver The neo1973(GTA01) and neo1973_gta02(GTA02) have a very similar audio hardware setup. They both use the same codec with the same routing to the gsm modem and bluetooth chip. But they do use different AMPs though and there are some minor differences in the speaker setup. As a result most of the code of those two drivers is identical. So from a maintenance point of view it makes sense to merge them into a single driver. It also reduces the size of kernel images supporting both the GTA01 and GTA02. As a side-effect of this merge the GTA01 for example gains support for routing audio to and from the bluetooth DAI. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b7874e4490aa201be2f904ffd8bb88a7b9970c6a Author: Lars-Peter Clausen Date: Mon Mar 7 08:04:57 2011 +0100 ASoC: neo1973_gta02_wm8753: Use gpio_request_array to request gpios Using gpio_request_array instead of requesting and setting up each gpio by hand makes the code more readable and more compact. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit da70a3e926b9d8456240ede505c8854d89c90e49 Author: Lars-Peter Clausen Date: Mon Mar 7 08:04:56 2011 +0100 ASoC: neo1973_gta02_wm8753: Remove lm4853_{set,get}_state This patch drops the lm4853_{set,get}_state functions and the "Amp State Switch" control. Those were noops which existed to maintain alsa state file compatibility. Since the control names have changed due to internal changes in the ASoC core and state file compatibility was broken anyway it makes sense to drop them. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9b0a25f0386f9775b69c46ced9b5632b649f00ba Author: Lars-Peter Clausen Date: Mon Mar 7 08:04:55 2011 +0100 ASoC: neo1973_wm8753: Move lm4857 specefic code to its own module This patch moves the code for the lm4857 AMP from the neo1973_wm8753 sound board driver to its own module. The lm4857 is a generic AMP IC and not specific to the neo1973. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 004c52e009e3c585eb0692740b714867fd2b3555 Author: Lars-Peter Clausen Date: Mon Mar 7 08:04:54 2011 +0100 ASoC: neo1973_wm8753: Remove scenario management code. It has been proven to be inflexible to do scenario management in kernel space. Since actual neo1973 board support has not been merged in mainline and this patch has been in the neo1973 tree for some time now it should be safe to remove this functionality without breaking existing userspace. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 841a451f687807110c247ee01b27dab862221d7f Author: Javier Martin Date: Mon Mar 7 08:47:09 2011 +0100 ASoC: Add machine driver for Visstrim_M10 board. Visstrim_M10 boards have an external tlcv320aic3205 codec attached to SSI1. This driver glues together both interfaces. External amplifier is not supported in this first version. Signed-off-by: Javier Martin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 79a54ea1ede0f028e5b0be1016bff8f49326a265 Author: Axel Lin Date: Fri Mar 4 15:22:03 2011 +0800 ASoC: Constify i2c_device_id table Signed-off-by: Axel Lin Acked-by: Alexander Sverdlin Acked-by: Timur Tabi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 573f26e3c36ca7036d117bc89d498856073e7284 Author: Axel Lin Date: Fri Mar 4 15:18:18 2011 +0800 ASoC: tlv320dac33: add MODULE_DEVICE_TABLE The device table is required to load modules based on modaliases. Signed-off-by: Axel Lin Acked-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a2721fd9fa6d4181fd66c58316d3893b597ba118 Author: Mark Brown Date: Mon Mar 7 11:09:25 2011 +0000 ASoC: Add missing debugfs conditionals Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 20d660653a488c1c88db6fe51c2459e00cb79230 Author: Mark Brown Date: Mon Mar 7 11:07:24 2011 +0000 ASoC: Fix outdated API usage in tlv320aic32x4 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c59a333f73868ca6fbcecea99b3542e2c62a3a5c Author: Chris Wilson Date: Sun Mar 6 13:51:29 2011 +0000 drm/i915: Only wait on a pending flip if we intend to write to the buffer ... as if we are only reading from it, we can do that concurrently with the queue flip. Signed-off-by: Chris Wilson commit 3d3dc149eda48566619d165f6b34e5eeca00edf1 Author: Chris Wilson Date: Sat Feb 12 10:33:12 2011 +0000 drm/i915/dp: Sanity check eDP existence Some hardware claims to have both an LVDS panel and an eDP output. Whilst this may be true in a rare case, more often it is just broken hardware. If we see an eDP device we know that it must be connected and so we can confirm its existence with a simple probe. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34165 Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=24822 Signed-off-by: Chris Wilson commit b873c5d692d4d5453cceed18bb06c62bb1a73ac0 Merge: a603271 e83a46b Author: Jens Axboe Date: Mon Mar 7 09:40:21 2011 +0100 Merge branch 'block-for-2.6.39-core' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.39/core commit b8cec4a415e807a2f8679efa89558a040a7003de Merge: 5e2b61f e44d8fe Author: David S. Miller Date: Mon Mar 7 00:37:13 2011 -0800 Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge commit a60327107b56573c305ecc78e471dbdbb4d2f426 Author: Gui Jianfeng Date: Mon Mar 7 09:28:09 2011 +0100 cfq-iosched: Fix update_vdisktime logic The update_vdisktime logic is broken since commit b54ce60eb7f61f8e314b8b241b0469eda3bb1d42, st->min_vdisktime never makes a progress. Fix it. Thanks Vivek for pointing it out. Signed-off-by: Gui Jianfeng Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit ef8a41df8c140f10108de75b01b6369d6e49113c Author: Shaohua Li Date: Mon Mar 7 09:26:29 2011 +0100 cfq-iosched: give busy sync queue no dispatch limit If there are a sync and an async queue and the sync queue's think time is small, we can ignore the sync queue's dispatch quantum. Because the sync queue will always preempt the async queue, we don't need to care about async's latency. This can fix a performance regression of aiostress test, which is introduced by commit f8ae6e3eb825. The issue should exist even without the commit, but the commit amplifies the impact. The initial post does the same optimization for RT queue too, but since I have no real workload for it, Vivek suggests to drop it. Signed-off-by: Shaohua Li Reviewed-by: Gui Jianfeng Signed-off-by: Jens Axboe commit 93803e0140c6216b68fe926ccc611297120da273 Author: Jens Axboe Date: Mon Mar 7 08:59:06 2011 +0100 cfq-iosched: fix race in cfq_set_request() We need to hold the queue lock over the reference increment, it's not atomic anymore. Signed-off-by: Jens Axboe commit f36871b044ef9db422e123acda4099e62bbfe18d Author: Kyungmin Park Date: Mon Mar 7 13:31:43 2011 +0900 ARM: EXYNOS4: Remove meaningless REGULATOR config option The regulator API ifdefs itself out when not enabled so there is no need for users to do this. Signed-off-by: Kyungmin Park [kgene.kim@samsung.com: edited description] Signed-off-by: Kukjin Kim commit 9130090b5f04f7e7bc29b944e0b1ba494fff3f98 Author: Dave Chinner Date: Mon Mar 7 10:09:35 2011 +1100 xfs: kill support/debug.[ch] The remaining functionality in debug.[ch] is effectively just assert handling, conditional debug definitions and hex dumping. The hex dumping and assert function can be moved into the new printk module, while the rest can be moved into top-level header files. This allows fs/xfs/support/debug.[ch] to be completely removed from the codebase. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 0b932cccbdc09a72aa370456a59b40ecd6b10baf Author: Dave Chinner Date: Mon Mar 7 10:08:35 2011 +1100 xfs: Convert remaining cmn_err() callers to new API Once converted, kill the remainder of the cmn_err() interface. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 8221112b4377a3b69f2016b5cc3c550d51dd3139 Author: Dave Chinner Date: Mon Mar 7 10:07:35 2011 +1100 xfs: convert the quota debug prints to new API Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 6d4a8ecb344bddbbb8c71deb4dcea0be6955cfc3 Author: Dave Chinner Date: Mon Mar 7 10:06:35 2011 +1100 xfs: rename xfs_cmn_err_fsblock_zero() The "cmn_err" part of the function name is no longer relevant. Rename the function to xfs_alert_fsblock_zero() to match the new logging API. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 5348778699bba92bf28b79863e09e7181d8cf95c Author: Dave Chinner Date: Mon Mar 7 10:05:35 2011 +1100 xfs: convert xfs_fs_cmn_err to new error logging API Continue to clean up the error logging code by converting all the callers of xfs_fs_cmn_err() to the new API. Once done, remove the unused old API function. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit af34e09da42801c97f39f768c715f5511d914b52 Author: Dave Chinner Date: Mon Mar 7 10:04:35 2011 +1100 xfs: kill xfs_fs_mount_cmn_err() macro The xfs_fs_mount_cmn_err() hides a simple check as to whether the mount path should output an error or not. Remove the macro and open code the check. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 65333b4c3d46909872796321d15f179cb0e32028 Author: Dave Chinner Date: Mon Mar 7 10:03:35 2011 +1100 xfs: kill xfs_fs_repair_cmn_err() macro In certain cases of inode corruption, the xfs_fs_repair_cmn_err() macro is used to output an extra message in the corruption report. That extra message is "unmount and run xfs_repair", which really applies to any corruption report. Each case that this macro is called (except one) a following call to xfs_corruption_error() is made to optionally dump more information about the error. Hence, move the output of "run xfs_repair" to xfs_corruption_error() so that it is output on all corruption reports. Also, convert the callers of the repair macro that don't call xfs_corruption_error() to call it, hence provide consiÑ•tent error reporting for all cases where xfs_fs_repair_cmn_err() used to be called. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 6a19d9393a5402e69fc52f5da8a828b8499a8265 Author: Dave Chinner Date: Mon Mar 7 10:02:35 2011 +1100 xfs: convert xfs_cmn_err to xfs_alert_tag Continue the conversion of the old cmn_err interface be converting all the conditional panic tag errors to xfs_alert_tag() and then removing xfs_cmn_err(). Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit a0fa2b679ecd15b4bdbb46cd2420b6affde91cf9 Author: Dave Chinner Date: Mon Mar 7 10:01:35 2011 +1100 xfs: Convert xlog_warn to new logging interface Convert the xfs log operations to use the new error logging interfaces. This removes the xlog_{warn,panic} wrappers and makes almost all errors emit the device they belong to instead of just refering to "XFS". Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 4f10700a2e4bb2ff3d3a80f08412e21109e6d4b5 Author: Dave Chinner Date: Mon Mar 7 10:00:35 2011 +1100 xfs: Convert linux-2.6/ files to new logging interface Convert the files in fs/xfs/linux-2.6/ to use the new xfs_ logging format that replaces the old Irix inherited cmn_err() interfaces. While there, also convert naked printk calls to use the relevant xfs logging function to standardise output format. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 0b863b333f529c7ddd8bee58e6696a7254417a05 Author: Rakib Mullick Date: Sun Mar 6 17:26:10 2011 +0600 drivers, pch_dma: Fix warning when CONFIG_PM=n. When CONFIG_PM=n, we get the following warning: drivers/dma/pch_dma.c:741: warning: ‘pch_dma_suspend’ defined but not used drivers/dma/pch_dma.c:755: warning: ‘pch_dma_resume’ defined but not used To fix it, wrap pch_dma_{suspend,resume} and pch_dma_{save,restore}_regs functions with CONFIG_PM. Signed-off-by: Rakib Mullick Signed-off-by: Vinod Koul commit 29782da5f0206335e2325508ba4fee0d624ddab6 Author: Viresh Kumar Date: Fri Mar 4 14:58:32 2011 +0530 dmaengine/dw_dmac fix: use readl & writel instead of __raw_readl & __raw_writel On ARMv7 cores, device memory mapped as Normal Non-cacheable, may not guarantee ordered access causing failures in device drivers that do not use the mandatory memory barriers. readl & writel versions contain necessary memory barriers for this. commit 79f64dbf68c8a9779a7e9a25e0a9f0217a25b57a: "ARM: 6273/1: Add barriers to the I/O accessors if ARM_DMA_MEM_BUFFERABLE" can be referred for more information on this. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit 1c5b0538c719f52cface39f699fb5d39a50149d6 Author: Viresh Kumar Date: Thu Mar 3 15:47:26 2011 +0530 avr32: at32ap700x: Specify DMA Flow Controller, Src and Dst msize Now that the dw_dmac DMA driver supports configurable Flow Controller, source and destination burst or msize, we need to specify which ones to use. Msize or burst size was previously hardcoded to 1, Flow controller was DMA for both M2P & P2M transfers. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit e51dc53b8c7fa2d9ac4ef8f317f5dfe07a79e65a Author: Viresh Kumar Date: Thu Mar 3 15:47:25 2011 +0530 dw_dmac: Setting Default Burst length for transfers as 16. This patch sets default Burst length for all transfer to 16. This will enhance performance when user doesn't have any chan->private data. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit ee66509d7f354eecb45ac99f21ea6aa8650dea7e Author: Viresh KUMAR Date: Fri Mar 4 15:42:51 2011 +0530 dw_dmac: Allow src/dst msize & flow controller to be configured at runtime Msize or Burst Size is peripheral dependent in case of prep_slave_sg and cyclic_prep transfers, and in case of memcpy transfers it is platform dependent. So msize configuration must come from platform data. Also some peripherals (ex: JPEG), need to be flow controller for dma transfers, so this information in case of slave_sg & cyclic_prep transfers must come from platform data. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit 59c22fc11d12b69da36c6585a38229863ba0bb16 Author: Viresh Kumar Date: Thu Mar 3 15:47:23 2011 +0530 dw_dmac: Changing type of src_master and dest_master to u8. src_master & dest_master don't required u32 as they have values limited to u8 only. Also their description is missing from doc style comment. This patch fixes above mentioned issues. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit 93317e8e35b77633d589fe0e132291195757d785 Author: Viresh Kumar Date: Thu Mar 3 15:47:22 2011 +0530 dw_dmac: Pass Channel Priority from platform_data In Synopsys designware, channel priority is programmable. This patch adds support for passing channel priority through platform data. By default Ascending channel priority will be followed, i.e. channel 0 will get highest priority and channel 7 will get lowest. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit b0c3130d69bda5cd91aa3b3f08e7878df49fde69 Author: Viresh Kumar Date: Thu Mar 3 15:47:21 2011 +0530 dw_dmac: Pass Channel Allocation Order from platform_data In SPEAr Platform channels 4-7 have more Fifo depth. So we must get better channel first. This patch introduces concept of channel allocation order in dw_dmac. If user doesn't pass anything or 0, than normal (ascending) channel allocation will follow, else channels will be allocated in descending order. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit e518076ef8cb56adb558ff56ad5bfa0cd9f3abd9 Author: Viresh Kumar Date: Thu Mar 3 15:47:20 2011 +0530 dw_dmac: Mark all tx_descriptors with DMA_CRTL_ACK after xfer finish dwc_desc_get checks all descriptors for DMA_CTRL_ACK before allocating them for transfers. And descriptors are not marked with DMA_CRTL_ACK after transfer finishes. Thus descriptor once used is not usable again. This patch marks descriptors with DMA_CRTL_ACK after dma xfer finishes Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit 418e74070662e1ae7d9bb5202f773d35c9a7f05e Author: Viresh Kumar Date: Fri Mar 4 15:42:50 2011 +0530 dw_dmac: Change value of DWC_MAX_COUNT to 4095. Every descriptor can transfer a maximum count of 4095 (12 bits, in control reg), So we must have DWC_MAX_COUNT as 4095 instead of 2048. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit a02274564dd78f7edde3c9ff197ed44f2f8a5a81 Author: Viresh Kumar Date: Thu Mar 3 15:47:18 2011 +0530 dw_dmac: Adding support for 64 bit access width for memcpy xfers Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit 569432efa7975f5795efb8142134f5a098942381 Author: Viresh Kumar Date: Thu Mar 3 15:47:17 2011 +0530 dw_dmac: Calling dwc_scan_descriptors from dwc_tx_status() after taking lock Lock must be taken before calling dwc_scan_descriptors, as this may access/modify shared data and queues. dwc_tx_status wasn't taking lock before calling this routine. This patch add code that takes lock before calling dwc_scan_descriptors. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit f336e42f73d93b74fd21bf9176ee6c7ab8b195c5 Author: Viresh Kumar Date: Thu Mar 3 15:47:16 2011 +0530 dw_dmac: Move single descriptor from dwc->queue to dwc->active_list in dwc_complete_all dwc_complete_all and other routines was removing all descriptors from dwc->queue and pushing them to dwc->active_list. Only one was required to be removed. Also we are calling dwc_dostart, once list is fixed. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit cb689a706d17ef19a61735670ded60466dd015fa Author: Viresh Kumar Date: Thu Mar 3 15:47:15 2011 +0530 dw_dmac: Replace module_init() with subsys_initcall() In some cases users of dw_dmac are initialized before dw_dmac, and if they try to use dw_dmac, they simply fail. So its better we register init() routine of driver using subsys_initcall() instead of module_init(), so that dma driver is available at the earliest possible. Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit f44ad7e91dd12bed0959b3e715f4f3ab84951a59 Author: Viresh Kumar Date: Thu Mar 3 15:47:14 2011 +0530 dw_dmac: Remove compilation dependency from AVR32 and put on HAVE_CLK This driver will now be used in atleast two platforms AVR32 & ARM. And there is no actual hardware dependency of this driver over AVR32 or ARM. So this dependency can be removed altogether. Also dw_dmac driver uses clk framework and must have compilation dependency on HAVE_CLK Signed-off-by: Viresh Kumar Signed-off-by: Vinod Koul commit 7f0030b211579939461468f25b80c73e293c46e0 Author: Arnaldo Carvalho de Melo Date: Sun Mar 6 13:07:30 2011 -0300 perf report tui: Improve multi event session support When multiple events were used in 'perf record', allow the user to choose which one is wanted before showing the per event histograms. Annotations will be performed on the chosen event. Allow going back and forth from event to event quickly using just the arrow keys and enter. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: William Cohen LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit e248de331a452f8771eda6ed4bb30d92c82df28b Author: Arnaldo Carvalho de Melo Date: Sat Mar 5 21:40:06 2011 -0300 perf tools: Improve support for sessions with multiple events By creating an perf_evlist out of the attributes in the perf.data file header, so that we can use evlists and evsels when reading recorded sessions in addition to when we record sessions. More work is needed to allow tools to allow the user to select which events are wanted when browsing sessions, be it just one or a subset of them, aggregated or showed at the same time but with different indications on the UI to allow seeing workloads thru different views at the same time. But the overall goal/trend is to more uniformly use evsels and evlists. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 3d3b5e95997208067c963923db90ed1517565d14 Author: Arnaldo Carvalho de Melo Date: Fri Mar 4 22:29:39 2011 -0300 perf evlist: Split perf_evlist__id_hash The previous situation was to receive an fd from where to read the event ID. Spin off a routine for when we have the ID handy, not having to read it from some fd. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 60098917c06d154d06ce030c125266eab9e60768 Author: Arnaldo Carvalho de Melo Date: Fri Mar 4 21:19:21 2011 -0300 perf hists browser: Handle browsing empty hists tree Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 Merge: 0fff6b9 53936c5 Author: Russell King Date: Sun Mar 6 08:42:55 2011 +0000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable commit 31bb68a314e9a2c9fbe054441b18c0608585605e Author: Alexander Sverdlin Date: Thu Mar 3 10:53:52 2011 +0100 ARM: 6780/1: EDB93xx: Add support for CS4271 SPI-connected CODEC Add support for CS4271 SPI-connected CODEC to EDB93xx. Signed-off-by: Alexander Sverdlin Acked-by: H Hartley Sweeten Acked-by: liam Girdwood Signed-off-by: Russell King commit d7603d5122d9700fb8f36fa08b04f4e900fef059 Author: Arnaldo Carvalho de Melo Date: Fri Mar 4 14:51:33 2011 -0300 perf hists: Remove needless global col lenght calcs To support multiple events we need to do these calcs per 'struct hists' instance, and it turns out we already do that at: __hists__add_entry hists__inc_nr_entries hists__calc_col_len for all the unfiltered hist_entry instances we stash in the rb tree, so trow away the dead code. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a03f35ceeb3d279da35c5a914ac01a4b1effb0a1 Author: Arnaldo Carvalho de Melo Date: Thu Mar 3 16:43:03 2011 -0300 perf report tui: Fix multi event switching TAB/UNTAB were not hotkeys, so didn't exit hists__browse back to hists__tui_browse_tree, allowing just the first event to be browsed. Reported-by: William Cohen Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: William Cohen LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 31be83aeaee22fa165862ad449c7131ceaf1cf91 Author: Al Viro Date: Fri Mar 4 01:43:36 2011 -0500 omfs: make readdir stop when filldir says so filldir returning an error does *not* mean "skip this entry, try the next one"... Signed-off-by: Al Viro Signed-off-by: Bob Copeland commit d932805b3dc8c6d80d8948f7d7d0d8336d53b2ed Author: Al Viro Date: Fri Mar 4 01:31:03 2011 -0500 omfs: merge unlink() and rmdir(), close leak in rename() In case of directory-overwriting rename(), omfs forgot to mark the victim doomed, so omfs_evict_inode() didn't free it. We could fix that by calling omfs_rmdir() for directory victims instead of doing omfs_unlink(), but it's easier to merge omfs_unlink() and omfs_rmdir() instead. Note that we have no hardlinks here. It also makes the checks in omfs_rename() go away - they fold into what omfs_remove() does when it runs into a directory. Signed-off-by: Al Viro Signed-off-by: Bob Copeland commit cdb26496dba00d5c4375261be6518b3e94260444 Author: Al Viro Date: Fri Mar 4 01:18:19 2011 -0500 omfs: stop playing silly buggers with omfs_unlink() in ->rename() Since omfs directories are hashes of inodes and name is part of inode, we have to remove inode from old directory before we can put it into new one / under new name. So instead of bump i_nlink call omfs_unlink, which does omfs_delete_entry() decrement i_nlink and mark parent dirty in case of success decrement i_nlink if omfs_unlink failed and hadn't done it itself let's just call omfs_delete_entry() and dirty the parent ourselves... Signed-off-by: Al Viro Signed-off-by: Bob Copeland commit 013e4f4a285d8c7d952d8d7be9f10783a85b5d3c Author: Al Viro Date: Fri Mar 4 01:14:55 2011 -0500 omfs: rename() needs to mark old_inode dirty after ctime update we *do* mark it dirty before, but it doesn't guarantee that we don't get preempted just before assignment to ->i_ctime, with inode getting written out before we get CPU back... Signed-off-by: Al Viro Signed-off-by: Bob Copeland commit 53936c56dcaf1db818fe953ae05592a8b5e345b5 Author: Alexander Clouter Date: Sat Mar 5 11:31:04 2011 +0000 ARM: orion5x: fix compiler cast warnings in ts78xx-setup.c Signed-off-by: Alexander Clouter [np: used min_t() as suggested by Sergei Shtylyov ] Signed-off-by: Nicolas Pitre commit b3882330843650b751817712db57b9a7061e7879 Author: Alexander Clouter Date: Sat Mar 5 11:49:36 2011 +0000 ARM: orion5x: use safer FPGA ID 'default' for TS-78xx Originally the FPGA ID checking switch statement left disabled all the TS implemented FPGA devices if the ID was unknown to it. Michael Spang created a fix in f9b1184e that changed the default to enable the devices in the event TS silently release more revisions into the wild, this unfortunately breaks custom FPGA bitstreams. This patch amends the switch statement so that the TS devices are only enabled if on the revision number is unknown (whilst the magic matches). Changelog: v2: neater implementation and some cosmetic changes v1: initial release <20110305112937.GA22117@chipmunk> Signed-off-by: Alexander Clouter Signed-off-by: Nicolas Pitre commit 198868f35de99e7197829314076e5465c37e4cc5 Author: Mingming Cao Date: Sat Mar 5 11:52:45 2011 -0500 ext4: Use single thread to perform DIO unwritten convertion While running ext4 testing on multiple core, we found there are per cpu ext4-dio-unwritten threads processing conversion from unwritten extents to written for IOs completed from async direct IO patch. Per filesystem is enough, we don't need per cpu threads to work on conversion. Signed-off-by: Mingming Cao commit e44d8fe2b5c27ecc230f886d4cc49fcbd86f87a0 Author: Sven Eckelmann Date: Fri Mar 4 21:36:41 2011 +0000 batman-adv: Disallow regular interface as mesh device When trying to associate a net_device with another net_device which already exists, batman-adv assumes that this interface is a fully initialized batman mesh interface without checking it. The behaviour when accessing data behind netdev_priv of a random net_device is undefined and potentially dangerous. Reported-by: Linus Lüssing Signed-off-by: Marek Lindner commit 7cefb149a6b0e4f7c5adfa27dcf285b729063848 Author: Linus Lüssing Date: Wed Mar 2 17:39:31 2011 +0000 batman-adv: Remove unused hdr_size variable in route_unicast_packet() Signed-off-by: Linus Lüssing Signed-off-by: Marek Lindner commit e6c10f433af9c98994c94a10ae862c152fcfb2a9 Author: Marek Lindner Date: Fri Feb 18 12:33:20 2011 +0000 batman-adv: rename batman_if struct to hard_iface Signed-off-by: Marek Lindner commit 4389e47af856635eb17d03b2572a50576c12db24 Author: Marek Lindner Date: Fri Feb 18 12:33:19 2011 +0000 batman-adv: rename global if_list to hardif_list Batman-adv works with "hard interfaces" as well as "soft interfaces". The new name should better make clear which kind of interfaces this list stores. Signed-off-by: Marek Lindner commit d0072609baebaffb522083d367f4f195187f60f8 Author: Marek Lindner Date: Wed Jan 19 20:01:44 2011 +0000 batman-adv: remove orig_hash spinlock Signed-off-by: Marek Lindner commit 1605d0d60b66b9461cfcff86f8cfc80964f23430 Author: Marek Lindner Date: Fri Feb 18 12:28:11 2011 +0000 batman-adv: increase refcount in create_neighbor to be consistent Signed-off-by: Marek Lindner commit 7b36e8eef989fc59535b4f1d3fc0f83afaf419d4 Author: Marek Lindner Date: Fri Feb 18 12:28:10 2011 +0000 batman-adv: Correct rcu refcounting for orig_node It might be possible that 2 threads access the same data in the same rcu grace period. The first thread calls call_rcu() to decrement the refcount and free the data while the second thread increases the refcount to use the data. To avoid this race condition all refcount operations have to be atomic. Reported-by: Sven Eckelmann Signed-off-by: Marek Lindner commit 7aadf889e897155c45cda230d2a6701ad1fbff61 Author: Marek Lindner Date: Fri Feb 18 12:28:09 2011 +0000 batman-adv: remove extra layer between hash and hash element - hash bucket Signed-off-by: Marek Lindner commit 39901e716275da4e831b40f9e45a1b61d6a776dc Author: Marek Lindner Date: Fri Feb 18 12:28:08 2011 +0000 batman-adv: separate ethernet comparing calls from hash functions Note: The function compare_ether_addr() provided by the Linux kernel requires aligned memory. Signed-off-by: Marek Lindner commit 9e0b33c221f1364e4d7562177a918eef8e85317a Author: Linus Lüssing Date: Fri Feb 18 12:20:13 2011 +0000 batman-adv: Fix possible buffer overflow in softif neigh list output When printing the soft interface table the number of entries in the softif neigh list are first being counted and a fitting buffer allocated. After that the softif neigh list gets locked again and the buffer printed - which has the following two issues: For one thing, the softif neigh list might have grown when reacquiring the rcu lock, which results in writing outside of the allocated buffer. Furthermore 31 Bytes are not enough for printing an entry with a vid of more than 2 digits. The manual buffering is unnecessary, we can safely print to the seq directly during the rcu_read_lock(). Signed-off-by: Linus Lüssing Signed-off-by: Marek Lindner commit 43c70ad5ce5691cce24dae6610731694c0f3fcc8 Author: Linus Lüssing Date: Sun Feb 13 21:13:04 2011 +0000 batman-adv: Increase orig_node refcount before releasing rcu read lock When unicast_send_skb() is increasing the orig_node's refcount another thread might have been freeing this orig_node already. We need to increase the refcount in the rcu read lock protected area to avoid that. Signed-off-by: Linus Lüssing Signed-off-by: Marek Lindner commit 5d02b3cdfafeb23ab7cf43ef1d2118007370e8d0 Author: Linus Lüssing Date: Sun Feb 13 21:13:02 2011 +0000 batman-adv: Make bat_priv->curr_gw an rcu protected pointer The rcu protected macros rcu_dereference() and rcu_assign_pointer() for the bat_priv->curr_gw need to be used, as well as spin/rcu locking. Otherwise we might end up using a curr_gw pointer pointing to already freed memory. Reported-by: Sven Eckelmann Signed-off-by: Linus Lüssing Signed-off-by: Marek Lindner commit f3e0008f01b275bd08bd416cfcaa7021dd6bc277 Author: Marek Lindner Date: Tue Jan 25 21:52:11 2011 +0000 batman-adv: make broadcast seqno operations atomic Batman-adv could receive several payload broadcasts at the same time that would trigger access to the broadcast seqno sliding window to determine whether this is a new broadcast or not. If these incoming broadcasts are accessing the sliding window simultaneously it could be left in an inconsistent state. Therefore it is necessary to make sure this access is atomic. Reported-by: Linus Lüssing Signed-off-by: Marek Lindner commit 0ede9f41b217d8982ab426e3c8c1b692a280a16f Author: Marek Lindner Date: Tue Jan 25 21:52:10 2011 +0000 batman-adv: protect bit operations to count OGMs with spinlock Reported-by: Linus Lüssing Signed-off-by: Marek Lindner commit ed75ccbe26f4a672a41556120390e67c80a2c441 Author: Marek Lindner Date: Thu Feb 10 14:33:51 2011 +0000 batman-adv: Correct rcu refcounting for batman_if It might be possible that 2 threads access the same data in the same rcu grace period. The first thread calls call_rcu() to decrement the refcount and free the data while the second thread increases the refcount to use the data. To avoid this race condition all refcount operations have to be atomic. Reported-by: Sven Eckelmann Signed-off-by: Marek Lindner commit 7d2b554826195372764910da2f0dcb0d9b869108 Author: Marek Lindner Date: Thu Feb 10 14:33:50 2011 +0000 batman-adv: Correct rcu refcounting for softif_neigh It might be possible that 2 threads access the same data in the same rcu grace period. The first thread calls call_rcu() to decrement the refcount and free the data while the second thread increases the refcount to use the data. To avoid this race condition all refcount operations have to be atomic. Reported-by: Sven Eckelmann Signed-off-by: Marek Lindner commit 25b6d3c17eaa92ae9700eb8235bc79782613354a Author: Marek Lindner Date: Thu Feb 10 14:33:49 2011 +0000 batman-adv: Correct rcu refcounting for gw_node It might be possible that 2 threads access the same data in the same rcu grace period. The first thread calls call_rcu() to decrement the refcount and free the data while the second thread increases the refcount to use the data. To avoid this race condition all refcount operations have to be atomic. Reported-by: Sven Eckelmann Signed-off-by: Marek Lindner commit 44524fcdf6ca19b58c24f7622c4af1d8d8fe59f8 Author: Marek Lindner Date: Thu Feb 10 14:33:53 2011 +0000 batman-adv: Correct rcu refcounting for neigh_node It might be possible that 2 threads access the same data in the same rcu grace period. The first thread calls call_rcu() to decrement the refcount and free the data while the second thread increases the refcount to use the data. To avoid this race condition all refcount operations have to be atomic. Reported-by: Sven Eckelmann Signed-off-by: Marek Lindner commit a4c135c561106c397bae33455acfca4aa8065a30 Author: Simon Wunderlich Date: Wed Jan 19 20:01:43 2011 +0000 batman-adv: protect bonding with rcu locks bonding / alternating candidates need to be secured by rcu locks as well. This patch therefore converts the bonding list from a plain pointer list to a rcu securable lists and references the bonding candidates. Signed-off-by: Simon Wunderlich Signed-off-by: Marek Lindner commit 2ae2daf6c3f23364862a7d4f2ca79eab041b701b Author: Marek Lindner Date: Wed Jan 19 20:01:42 2011 +0000 batman-adv: protect ogm counter arrays with spinlock Signed-off-by: Marek Lindner commit 16b1aba849eeb45d51a5de731cf103143439ffe1 Author: Marek Lindner Date: Wed Jan 19 20:01:42 2011 +0000 batman-adv: protect originator nodes with reference counters Signed-off-by: Marek Lindner commit fb778ea173fcd58b8fc3d75c674f07fab187b55f Author: Marek Lindner Date: Wed Jan 19 20:01:40 2011 +0000 batman-adv: protect each hash row with rcu locks Signed-off-by: Marek Lindner commit a775eb847ae66211577d4fd2c46749b77c9993c9 Author: Marek Lindner Date: Wed Jan 19 20:01:39 2011 +0000 batman-adv: protect neigh_nodes used outside of rcu_locks with refcounting Signed-off-by: Marek Lindner commit 1a241a57be46cda985c7c36e24d49f67de6bfb53 Author: Marek Lindner Date: Wed Jan 19 19:16:10 2011 +0000 batman-adv: free neighbors when an interface is deactivated hardif_disable_interface() calls purge_orig_ref() to immediately free all neighbors associated with the interface that is going down. purge_orig_neighbors() checked if the interface status is IF_INACTIVE which is set to IF_NOT_IN_USE shortly before calling purge_orig_ref(). Signed-off-by: Marek Lindner commit f987ed6ebd991009cd9f6190ce319e8b50d6be1f Author: Marek Lindner Date: Sun Dec 12 21:57:12 2010 +0000 batman-adv: protect neighbor list with rcu locks Signed-off-by: Marek Lindner commit 9591a79f280ede740e44aeb8ad93a6692d482dce Author: Marek Lindner Date: Sun Dec 12 21:57:11 2010 +0000 batman-adv: convert neighbor list to hlist Signed-off-by: Marek Lindner commit a8e7f4bc38c4a90ee308cd7f1f8604f71db59d05 Author: Marek Lindner Date: Sun Dec 12 21:57:10 2010 +0000 batman-adv: protect neighbor nodes with reference counters Signed-off-by: Marek Lindner commit 4fdef2183e6598cc977a9bb9321ef99a44125da3 Author: John Johansen Date: Sat Mar 5 02:18:02 2011 -0800 AppArmor: Cleanup make file to remove cruft and make it easier to read Cleanups based on comments from Sam Ravnborg, * remove references to the currently unused af_names.h * add rlim_names.h to clean-files: * rework cmd_make-XXX to make them more readable by adding comments, reworking the expressions to put logical components on individual lines, and keep lines < 80 characters. Signed-off-by: John Johansen Acked-by: Sam Ravnborg commit 4ba8216cd90560bc402f52076f64d8546e8aefcb Author: Arnd Bergmann Date: Tue Jan 25 22:52:22 2011 +0100 BKL: That's all, folks This removes the implementation of the big kernel lock, at last. A lot of people have worked on this in the past, I so the credit for this patch should be with everyone who participated in the hunt. The names on the Cc list are the people that were the most active in this, according to the recorded git history, in alphabetical order. Signed-off-by: Arnd Bergmann Acked-by: Alan Cox Cc: Alessio Igor Bogani Cc: Al Viro Cc: Andrew Hendry Cc: Andrew Morton Cc: Christoph Hellwig Cc: Eric W. Biederman Cc: Frederic Weisbecker Cc: Hans Verkuil Acked-by: Ingo Molnar Cc: Jan Blunck Cc: John Kacur Cc: Jonathan Corbet Cc: Linus Torvalds Cc: Matthew Wilcox Cc: Oliver Neukum Cc: Paul Menage Acked-by: Thomas Gleixner Cc: Trond Myklebust commit ae7eb8979ccfa5e9e888101b9c940f20bd0f4115 Author: Matt Fleming Date: Sun Feb 27 13:58:00 2011 +0000 fs/locks.c: Remove stale FIXME left over from BKL conversion The comment is no longer true as (now that the BKL conversion is finished) a spinlock _is_ now used to protect file_lock_list, blocked_list and inode->i_flock. Signed-off-by: Matt Fleming Signed-off-by: Arnd Bergmann commit b0d0d915d1d1a0fe486849f3e41333c66df620c4 Author: Arnd Bergmann Date: Tue Jan 25 21:49:56 2011 +0100 ipx: remove the BKL This replaces all instances of lock_kernel in the IPX code with lock_sock. As far as I can tell, this is safe to do, because there is no global state that needs to be locked in IPX, and the code does not recursively take the lock or sleep indefinitely while holding it. Compile-tested only. Signed-off-by: Arnd Bergmann Acked-by: David S. Miller Cc: Arnaldo Carvalho de Melo Cc: netdev@vger.kernel.org commit 60d9f461a20ba59219fdcdc30cbf8e3a4ad3f625 Author: Arnd Bergmann Date: Sun Jan 23 00:21:11 2011 +0100 appletalk: remove the BKL This changes appletalk to use lock_sock instead of lock_kernel for serialization. I tried to make sure that we don't hold the socket lock during sleeping functions, but I did not try to prove whether the locks are necessary in the first place. Compile-tested only. Signed-off-by: Arnd Bergmann Acked-by: David S. Miller Cc: Arnaldo Carvalho de Melo Cc: David Miller Cc: netdev@vger.kernel.org commit 77b2283604bdd7053494a97b0e2fee97148206c6 Author: Arnd Bergmann Date: Sat Jan 22 23:44:59 2011 +0100 x25: remove the BKL This replaces all instances of lock_kernel in x25 with lock_sock, taking care to release the socket lock around sleeping functions (sock_alloc_send_skb and skb_recv_datagram). It is not clear whether this is a correct solution, but it seem to be what other protocols do in the same situation. Includes a fix suggested by Eric Dumazet. Signed-off-by: Arnd Bergmann Acked-by: David S. Miller Tested-by: Andrew Hendry Cc: linux-x25@vger.kernel.org Cc: netdev@vger.kernel.org Cc: Eric Dumazet commit 7a8fc77b3744e26ce1249d9ccb23e356d6010679 Author: Francois Romieu Date: Tue Mar 1 17:18:33 2011 +0100 r8169: convert to new VLAN model. Signed-off-by: Francois Romieu Reviewed-by: Jesse Gross commit 54405cde762408b00a445466a40da4f7f33a8479 Author: Oliver Neukum Date: Thu Jan 6 21:55:13 2011 +0100 r8169: support control of advertising. This allows "ethtool advertise" to control the speed and duplex features the device offers the switch. Signed-off-by: Oliver Neukum Signed-off-by: Francois Romieu commit 5a5e4443150713347a7a7e4d0880b343348f5811 Author: Hayes Wang Date: Tue Feb 22 17:26:21 2011 +0800 r8169: support the new chips for RTL8105E. Signed-off-by: Hayes Wang Acked-by: Francois Romieu commit ac23f25355ef53f3d14352fcff3c6817527a9749 Author: Jan Beulich Date: Fri Mar 4 15:52:35 2011 +0000 x86: Really print supported CPUs if PROCESSOR_SELECT=y I'm sure it was a mere oversight that the CONFIG_ prefixes are missing. Signed-off-by: Jan Beulich Cc: Dave Jones LKML-Reference: <4D7118D30200007800034F79@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit ca764aaf025d2c83054191895b366fa81a9ccf48 Merge: d04c579 078a198 Author: Ingo Molnar Date: Sat Mar 5 07:32:45 2011 +0100 Merge branch 'x86-mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into x86/mm commit 6909262429b70a162e9e7053672cfd8024c9275d Author: Lin Ming Date: Thu Mar 3 10:34:50 2011 +0800 perf: Avoid the percore allocations if the CPU is not HT capable Signed-off-by: Lin Ming Signed-off-by: Peter Zijlstra LKML-Reference: <1299119690-13991-5-git-send-email-ming.m.lin@intel.com> Signed-off-by: Ingo Molnar commit 5e2b61f78411be25f0b84f97d5b5d312f184dfd1 Author: David S. Miller Date: Fri Mar 4 21:47:09 2011 -0800 ipv4: Remove flowi from struct rtable. The only necessary parts are the src/dst addresses, the interface indexes, the TOS, and the mark. The rest is unnecessary bloat, which amounts to nearly 50 bytes on 64-bit. Signed-off-by: David S. Miller commit 1018b5c01636c7c6bda31a719bda34fc631db29a Author: David S. Miller Date: Fri Mar 4 21:35:25 2011 -0800 ipv4: Set rt->rt_iif more sanely on output routes. rt->rt_iif is only ever inspected on input routes, for example DCCP uses this to populate a route lookup flow key when generating replies to another packet. Therefore, setting it to anything other than zero on output routes makes no sense. Signed-off-by: David S. Miller commit 4157434c23f8f5126a2ffd3cc7b2c3bd928be075 Author: David S. Miller Date: Fri Mar 4 21:31:48 2011 -0800 ipv4: Use passed-in protocol in ip_route_newports(). Signed-off-by: David S. Miller commit 3c0afdca44af795dd315c20cc525927a459abe30 Author: David S. Miller Date: Fri Mar 4 21:26:07 2011 -0800 ipv4: Get peer more cheaply in rt_init_metrics(). We know this is a new route object, so doing atomics and stuff makes no sense at all. Signed-off-by: David S. Miller commit 44713b67db10c774f14280c129b0d5fd13c70cf2 Author: David S. Miller Date: Fri Mar 4 21:24:47 2011 -0800 ipv4: Optimize flow initialization in output route lookup. We burn a lot of useless cycles, cpu store buffer traffic, and memory operations memset()'ing the on-stack flow used to perform output route lookups in __ip_route_output_key(). Only the first half of the flow object members even matter for output route lookups in this context, specifically: FIB rules matching cares about: dst, src, tos, iif, oif, mark FIB trie lookup cares about: dst FIB semantic match cares about: tos, scope, oif Therefore only initialize these specific members and elide the memset entirely. On Niagara2 this kills about ~300 cycles from the output route lookup path. Likely, we can take things further, since all callers of output route lookups essentially throw away the on-stack flow they use. So they don't care if we use it as a scratch-pad to compute the final flow key. Signed-off-by: David S. Miller Acked-by: Eric Dumazet commit adef658ddf71e709eb1bdc181b86c62b933b967b Author: Michael Jones Date: Fri Feb 25 16:55:11 2011 +0100 spi/omap_mcspi: catch xfers of non-multiple SPI word size If an SPI access was not a multiple of the SPI word size, the while() loop would spin and the rx/tx ptrs would be incremented indefinitely. Signed-off-by: Michael Jones Signed-off-by: Grant Likely commit f9b1184e12e5ff8129b04837dffddb5a3c390473 Author: Michael Spang Date: Fri Mar 4 23:50:57 2011 -0500 ARM: Enable TS-78XX features in unknown revisions When the manufacturer increases the revision number the platform devices for the RTC, NAND, and RNG disappear. We should assume new revisions have these devices instead of assuming they do not. Signed-off-by: Michael Spang Signed-off-by: Nicolas Pitre commit 65e8354ec13a45414045084166cb340c0d7ffe8a Author: Eric Dumazet Date: Fri Mar 4 14:33:59 2011 -0800 inetpeer: seqlock optimization David noticed : ------------------ Eric, I was profiling the non-routing-cache case and something that stuck out is the case of calling inet_getpeer() with create==0. If an entry is not found, we have to redo the lookup under a spinlock to make certain that a concurrent writer rebalancing the tree does not "hide" an existing entry from us. This makes the case of a create==0 lookup for a not-present entry really expensive. It is on the order of 600 cpu cycles on my Niagara2. I added a hack to not do the relookup under the lock when create==0 and it now costs less than 300 cycles. This is now a pretty common operation with the way we handle COW'd metrics, so I think it's definitely worth optimizing. ----------------- One solution is to use a seqlock instead of a spinlock to protect struct inet_peer_base. After a failed avl tree lookup, we can easily detect if a writer did some changes during our lookup. Taking the lock and redo the lookup is only necessary in this case. Note: Add one private rcu_deref_locked() macro to place in one spot the access to spinlock included in seqlock. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d72751ede1b9bf993d7bd3377305c8e9e36a3cc4 Merge: 0a0e9ae 85a7045 Author: David S. Miller Date: Fri Mar 4 12:48:25 2011 -0800 Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 85a7045a90052749885e166f40af5e9140032287 Merge: 29546a6 e46395a Author: John W. Linville Date: Fri Mar 4 14:10:40 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 410f2bb30d27252cc55a5f41668de60de62e5dc8 Author: Stanislaw Gruszka Date: Fri Mar 4 17:51:51 2011 +0100 iwlwifi: avoid too frequent recover from statistics Usually H/W generate statistics notify once per about 100ms, but sometimes we can receive notify in shorter time, even 2 ms. This can be problem for plcp health and ack health checking. I.e. with 2 plcp errors happens randomly in 2 ms duration, we exceed plcp delta threshold equal to 100 (2*100/2). Also checking ack's in short time, can results not necessary false positive and firmware reset, for example when channel is noised and we do not receive ACKs frames or when remote device does not send ACKs at the moment. Patch change code to do statistic check and possible recovery only if 99ms elapsed from last check. Forced delay should assure we have good statistic data to estimate hardware state. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 6198c387b25b528fd89a48bf67f0402d828ffa18 Author: Stanislaw Gruszka Date: Fri Mar 4 17:51:50 2011 +0100 iwlwifi: cleanup iwl_good_plcp_health Make iwl_good_plcp_health code easiest to read. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 466a19a003f3b45a755bc85f967c21da947f9a00 Author: Stanislaw Gruszka Date: Fri Mar 4 17:51:49 2011 +0100 iwlwifi: move rx handlers code to iwl-rx.c Put generic rx_handlers (except iwlagn_rx_reply_compressed_ba) to iwl-rx.c . Make functions static and change prefix from iwlagn_ to iwl_ . Beautify iwl_setup_rx_handlers and do some other minor coding style changes. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 9d468d2269b64222a706f52b965998ee64d0b4bf Author: Helmut Schaa Date: Fri Mar 4 13:31:31 2011 +0100 mac80211: Remove redundant preamble and RTS flag setup in minstrel_ht mac80211 does the same afterwards anyway. Hence, just drop this redundant code. Signed-off-by: Helmut Schaa Acked-by: Felix Fietkau Signed-off-by: John W. Linville commit db7889cda3571bfd0d3a3fc79ca0cd16bb321ff2 Author: Ben Greear Date: Thu Mar 3 16:25:59 2011 -0800 ath9k: Fix txq memory address printing in debugfs. No use printing addresses of pointers, just print the pointers themselves. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 557d99a26945e21992f693787334143d0355f60a Author: Gertjan van Wingerde Date: Thu Mar 3 19:47:21 2011 +0100 rt2x00: Remove unused rt2x00queue_get_queue function. Now that all accesses to the data_queue structures is done via the specialized rt2x00queue_get_tx_queue function or via direct accesses, there is no need for the rt2x00queue_get_queue function anymore, so remove it. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a24408307e930e21912e82c125648400041d66fb Author: Gertjan van Wingerde Date: Thu Mar 3 19:46:55 2011 +0100 rt2x00: Optimize getting the beacon queue structure. In the spirit of optimizing the code to get the queue structure of TX queues, also optimize the code to get beacon queues. We can simply use the bcn queue field of the rt2x00_dev structure instead of using the rt2x00queue_get_queue function. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 61c6e4893f3070b6473ca4ec3176c7471d44278b Author: Gertjan van Wingerde Date: Thu Mar 3 19:46:29 2011 +0100 rt2x00: Include ATIM queue support in rt2x00queue_get_tx_queue. The ATIM queue is considered to be a TX queue by the drivers that support the queue. Therefore include support for the ATIM queue to the rt2x00queue_get_tx_queue function so that the drivers that support the ATIM queue can also use that function. Add the support in such a way that drivers that do not support the ATIM queue are not penalized in their efficiency. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit e74df4a7562da56a7e4dbf41ff167b2f44e84a50 Author: Gertjan van Wingerde Date: Thu Mar 3 19:46:09 2011 +0100 rt2x00: Don't treat ATIM queue as second beacon queue. Current code for the atim queue is strange, as it is considered in the rt2x00_dev structure as a second beacon queue. Normalize this by letting the atim queue have its own struct data_queue pointer in the rt2x00_dev structure. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 3736fe5808577f9d3a31a565ef4e78ceae250c98 Author: Helmut Schaa Date: Thu Mar 3 19:45:39 2011 +0100 rt2x00: Fix comment in rt2800pci We don't use interrupt threads anymore. Fix the comment. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 0aa13b2e06fbb8327c7acb4ccf684b2b65c302ce Author: Helmut Schaa Date: Thu Mar 3 19:45:16 2011 +0100 rt2x00: Revise irqmask locking for PCI devices The PCI device irqmask is locked by a spin_lock. Currently spin_lock_irqsave is used everywhere. To reduce the locking overhead replace spin_lock_irqsave in hard irq context with spin_lock and in soft irq context with spin_lock_irq. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 567108ebd352f21640c536ea3b39584f9e7c28f8 Author: Helmut Schaa Date: Thu Mar 3 19:44:53 2011 +0100 rt2x00: Remove now unused crypto.aid field Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 1ed3811c33d525be1c657261db1713f294c40c60 Author: Helmut Schaa Date: Thu Mar 3 19:44:33 2011 +0100 rt2x00: Fix rt2800 key assignment in multi bssid setups When setting up multiple BSSIDs in AP mode on an rt2800pci device we previously used the STAs AID to select an appropriate key slot. But since the AID is per VIF we can end up with two STAs having the same AID and thus using the same key index. This resulted in one STA overwriting the key information of another STA. Fix this by simply searching for the next unused entry in the pairwise key table. Also bring the key table init in sync with deleting keys by initializing the key table entries to 0 instead of 1. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 4df10c8c1353e5db781a9a781cc585698b24f30d Author: Helmut Schaa Date: Thu Mar 3 19:44:10 2011 +0100 rt2x00: Use an enum instead of u16 for the rate_mode TX descriptor field This makes the code less error-prone. Acked-by: Gertjan van Wingerde Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 55b585e29095ce64900b6192aadf399fa007161e Author: Helmut Schaa Date: Thu Mar 3 19:43:49 2011 +0100 rt2x00: Don't call ieee80211_get_tx_rate for MCS rates ieee80211_get_tx_rate is not valid for HT rates. Hence, restructure the TX desciptor creation to be aware of MCS rates. The generic TX desciptor creation now cares about the rate_mode (CCK, OFDM, MCS, GF). As a result, ieee80211_get_tx_rate gets only called for legacy rates. Acked-by: Gertjan van Wingerde Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2517794b702cf62bb049e57c0825fc4573f8a6a3 Author: Helmut Schaa Date: Thu Mar 3 19:43:25 2011 +0100 rt2x00: Move TX descriptor field "ifs" into plcp substruct "ifs" is only used by no-HT devices. Move it into the plcp substruct and fill in the value only for no-HT devices. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit fe107a5234de1f1576df466b2ea8d01868f6ee77 Author: Ivo van Doorn Date: Thu Mar 3 19:42:58 2011 +0100 rt2x00: Optimize TX descriptor memory layout Some fields only need to be u8 and for ifs and txop we can use the already available enums. Acked-by: Gertjan van Wingerde Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 26a1d07f4176099a7b6f45009dad054e6ad5b7e4 Author: Helmut Schaa Date: Thu Mar 3 19:42:35 2011 +0100 rt2x00: Optimize TX descriptor handling HT and no-HT rt2x00 devices use a partly different TX descriptor. Optimize the tx desciptor memory layout by putting the PLCP and HT substructs into a union and introduce a new driver flag to decide which TX desciptor format is used by the device. This saves us the expensive PLCP calculation fOr HT devices and the HT descriptor setup on no-HT devices. Acked-by: Gertjan van Wingerde Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7fe7ee77765161217f60ec9facabd9d2b38d98fe Author: Helmut Schaa Date: Thu Mar 3 19:42:01 2011 +0100 rt2x00: Generate sw sequence numbers only for devices that need it Newer devices like rt2800* own a hardware sequence counter and thus don't need to use a software sequence counter at all. Add a new driver flag to shortcut the software sequence number generation on devices that don't need it. rt61pci, rt73usb and rt2800* seem to make use of a hw sequence counter while rt2400pci and rt2500* need to do it in software. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 208f19dceeeebcae2f9fb8f88953e2f66949b0f0 Author: Helmut Schaa Date: Thu Mar 3 19:41:03 2011 +0100 rt2x00: Use unlikely for unexpected error condition in rt2x00_mac_tx rt2x00queue_write_tx_frame is unlikely to fail. Tell the compiler. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5356d963304638735b4b53dfbded7a1c4ae0818d Author: Helmut Schaa Date: Thu Mar 3 19:40:33 2011 +0100 rt2x00: Add unlikely macro to special case tx status handling This special case shouldn't happen very often. Only if a frame that is not intended to be aggregated ends up in an AMPDU _and_ was intended to be sent at a different MCS rate as the aggregate. Hence, using unlikely is justified. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c262e08b79204f57aba1f180d6ebdb5ea9db01dd Author: Helmut Schaa Date: Thu Mar 3 19:39:56 2011 +0100 rt2x00: Remove useless NULL check Since tx_info->control.vif was already accessed before it cant't be NULL here. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 87443e875c8ad1f0c25b1255bdeb88de934e151e Author: Helmut Schaa Date: Thu Mar 3 19:39:27 2011 +0100 rt2x00: Make use of unlikely during tx status processing These conditions are unlikely to happen, tell the compiler. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 11f818e0eb50864c7e6f8af38d8f8822f992906a Author: Helmut Schaa Date: Thu Mar 3 19:38:55 2011 +0100 rt2x00: Optimize calls to rt2x00queue_get_queue In some cases (tx path for example) we don't need to check for non-tx queues in rt2x00queue_get_queue. Hence, introduce a new method rt2x00queue_get_tx_queue that is only valid for tx queues and use it in places where only tx queues are valid. Furthermore, this new method is quite short and as such can be inlined to avoid the function call overhead. This only converts the txdone functions of drivers that don't use an ATIM queue and the generic tx path. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit adde5882bc6c21de7ee80ee15dfd58c7e9a472ac Author: Gabor Juhos Date: Thu Mar 3 11:46:45 2011 +0100 rt2x00: fix whitespace damage in the rt2800 specific code The rt2800 specific code contains a lots of whitespace damage caused by the commit 'rt2x00: Add support for RT5390 chip'. This patch fixes those whitespace errors. Signed-off-by: Gabor Juhos Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit ba9a6214539df3e647d8259b101dbc60216ecc31 Author: RafaÅ‚ MiÅ‚ecki Date: Tue Mar 1 21:40:41 2011 +0100 b43: N-PHY: rev3+: implement gain ctl workarounds Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit 9838985162935a9db12962403808d43f3d225952 Author: RafaÅ‚ MiÅ‚ecki Date: Tue Mar 1 21:40:40 2011 +0100 b43: N-PHY: rev3+: add tables with gain ctl workarounds Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit 0f4091b9af7151cf510bcf9160e970982c883101 Author: RafaÅ‚ MiÅ‚ecki Date: Tue Mar 1 21:40:39 2011 +0100 b43: N-PHY: rev3+: correct switching analog core Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit a7a9a24dcd2c57edf148ca9a14a510a5765ecf20 Author: Michael Buesch Date: Tue Mar 1 20:03:05 2011 +0100 lib-average: Make config option selectable Make CONFIG_AVERAGE selectable for out-of-tree users such as compat-wireless. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit b06af7a57de42707fee6eec784ee507960cc9131 Author: Vasanthakumar Thiagarajan Date: Tue Mar 1 08:59:36 2011 -0800 ath9k_hw: Read noise floor only for available chains for AR9003 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 582d00641b03efa892b3d2cfe6b45c1fe6d422a1 Author: Vasanthakumar Thiagarajan Date: Tue Mar 1 05:30:55 2011 -0800 ath9k: Add a debugfs interface to dump chip registers //ieee80211/phyX/ath9k/regdump is the interface to dump the registers. Signed-off-by: Felix Fietkau Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 6410db593e8c1b2b79a2f18554310d6da9415584 Author: Larry Finger Date: Mon Feb 28 23:36:09 2011 -0600 rtl8187: Change rate-control feedback The driver for the RTL8187L chips returns IEEE80211_TX_STAT_ACK for all packets, even if the maximum number of retries was exhausted. In addition it fails to setup max_rates in the ieee80211_hw struct, This behavior may be responsible for the problems noted in Bug 14168. As the bug is very old, testers have not been found, and I do not have the case where the indicated signal is less than -70 dBm. Signed-off-by: Larry Finger Acked-by: Hin-Tak Leung Cc: Stable Signed-off-by: John W. Linville commit 1ffe4dd126bcad84f0701ca271a7f10494d0c2c8 Author: John W. Linville Date: Tue Mar 1 13:53:02 2011 -0500 rtlwifi: usb parts should depend on CONFIG_USB ERROR: "usb_unanchor_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! ERROR: "usb_control_msg" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! ERROR: "usb_submit_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! ERROR: "usb_get_dev" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! ERROR: "usb_kill_anchored_urbs" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! ERROR: "usb_put_dev" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! ERROR: "usb_free_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! ERROR: "usb_anchor_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! ERROR: "usb_alloc_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! make[2]: *** [__modpost] Error 1 make[1]: *** [modules] Error 2 make: *** [sub-make] Error 2 The USB-part of rtlwifi should depend on CONFIG_USB. This also corrects the existing check for CONFIG_PCI to build pci.o. Reported-by: Geert Uytterhoeven Signed-off-by: John W. Linville commit e2ab758d1649684df5270898ca848e6824ecf38e Merge: 95f84f2 f8f79a5 Author: John W. Linville Date: Fri Mar 4 14:01:20 2011 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 95f84f2959482ee25b5cfe28a048a331ded8667c Merge: a177584 95a7761 Author: John W. Linville Date: Fri Mar 4 14:00:29 2011 -0500 Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx commit a177584609f7eb2ab1f1c0211bee4ec20d98d892 Merge: e46395a b8534e0 Author: John W. Linville Date: Fri Mar 4 13:59:44 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 commit c8adf9a3e873eddaaec11ac410a99ef6b9656938 Author: Ram Pai Date: Mon Feb 14 17:43:20 2011 -0800 PCI: pre-allocate additional resources to devices only after successful allocation of essential resources. Linux tries to pre-allocate minimal resources to hotplug bridges. This works fine as long as there are enough resources to satisfy all other genuine resource requirements. However if enough resources are not available to satisfy any of these nice-to-have pre-allocations, the resource-allocator reports errors and returns failure. This patch distinguishes between must-have resource from nice-to-have resource. Any failure to allocate nice-to-have resources are ignored. This behavior can be particularly useful to trigger automatic reallocation when the OS discovers genuine allocation-conflicts or genuine unallocated-requests caused by buggy allocation behavior of the native BIOS/uEFI. https://bugzilla.kernel.org/show_bug.cgi?id=15960 captures the movitation behind the patch. This patch is verified to resolve the above bug. changelog v2: o fixed a bug where pci_assign_resource() was called on a resource of zero resource size. changelog v3: addressed Bjorn's comment o "Please don't indent and right-justify the changelog". o removed add_size from struct resource. The additional size is now tracked using a linked list. changelog v4: o moved freeing up of elements in head list from assign_requested_resources_sorted() to __assign_resources_sorted(). o removed a wrong reference to 'add_size' in pbus_size_mem(). o some code optimizations in adjust_resources_sorted() and assign_requested_resources_sorted() changelog v5: o moved freeing up of elements in head list from assign_requested_resources_sorted() to __assign_resources_sorted(). o removed a wrong reference to 'add_size' in pbus_size_mem(). o some code optimizations in adjust_resources_sorted() and assign_requested_resources_sorted() changelog v5: o factored out common code and made them into separate independent patches o added comments in kdoc format o added a BUG_ON in pci_assign_unassigned_resources() to catch for memory leak. Signed-off-by: Ram Pai Signed-off-by: Jesse Barnes commit fc075e1da1b96ef65c32e83648055606b8204b58 Author: Ram Pai Date: Mon Feb 14 17:43:19 2011 -0800 PCI: introduce reset_resource() Introduce reset_resource() which factors out resource reset logic. Signed-off-by: Ram Pai Signed-off-by: Jesse Barnes commit 094732a520caae81ae1532af29da82a4fa953472 Author: Ram Pai Date: Mon Feb 14 17:43:18 2011 -0800 PCI: data structure agnostic free list function Replace free_failed_list() with a free_list() call. free_list() can handle 'resource_list_x', 'resource_list' and any linked list linked through ->next Signed-off-by: Ram Pai Signed-off-by: Jesse Barnes commit 13583b16592a9a85093dd9aa3d4e8cd76e4f0cd4 Author: Ram Pai Date: Mon Feb 14 17:43:17 2011 -0800 PCI: refactor io size calculation code Refactor code that calculates the io size in pbus_size_io() and pbus_mem_io() into separate functions. Signed-off-by: Ram Pai Signed-off-by: Jesse Barnes commit 87e3dc3855430bd254370afc79f2ed92250f5b7c Author: Jiri Slaby Date: Mon Feb 28 10:45:10 2011 +0100 PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH Some broken BIOSes on ICH4 chipset report an ACPI region which is in conflict with legacy IDE ports when ACPI is disabled. Even though the regions overlap, IDE ports are working correctly (we cannot find out the decoding rules on chipsets). So the only problem is the reported region itself, if we don't reserve the region in the quirk everything works as expected. This patch avoids reserving any quirk regions below PCIBIOS_MIN_IO which is 0x1000. Some regions might be (and are by a fast google query) below this border, but the only difference is that they won't be reserved anymore. They should still work though the same as before. The conflicts look like (1f.0 is bridge, 1f.1 is IDE ctrl): pci 0000:00:1f.1: address space collision: [io 0x0170-0x0177] conflicts with 0000:00:1f.0 [io 0x0100-0x017f] At 0x0100 a 128 bytes long ACPI region is reported in the quirk for ICH4. ata_piix then fails to find disks because the IDE legacy ports are zeroed: ata_piix 0000:00:1f.1: device not available (can't reserve [io 0x0000-0x0007]) References: https://bugzilla.novell.com/show_bug.cgi?id=558740 Signed-off-by: Jiri Slaby Cc: Bjorn Helgaas Cc: "David S. Miller" Cc: Thomas Renninger Signed-off-by: Jesse Barnes commit 47e9037ac16637cd7f12b8790ea7ce6680e42168 Author: Stefano Stabellini Date: Mon Feb 28 16:20:11 2011 +0000 PCI hotplug: acpiphp: set current_state to D0 in register_slot If a device doesn't support power management (pm_cap == 0) but it is acpi_pci_power_manageable() because there is a _PS0 method declared for it and _EJ0 is also declared for the slot then nobody is going to set current_state = PCI_D0 for this device. This is what I think it is happening: pci_enable_device | __pci_enable_device_flags /* here we do not set current_state because !pm_cap */ | do_pci_enable_device | pci_set_power_state | __pci_start_power_transition | pci_platform_power_transition /* platform_pci_power_manageable() calls acpi_pci_power_manageable that * returns true */ | platform_pci_set_power_state /* acpi_pci_set_power_state gets called and does nothing because the * acpi device has _EJ0, see the comment "If the ACPI device has _EJ0, * ignore the device" */ at this point if we refer to the commit message that introduced the comment above (10b3dcae0f275e2546e55303d64ddbb58cec7599), it is up to the hotplug driver to set the state to D0. However AFAICT the pci hotplug driver never does, in fact drivers/pci/hotplug/acpiphp_glue.c:register_slot sets the slot flags to (SLOT_ENABLED | SLOT_POWEREDON) but it does not set the pci device current state to PCI_D0. So my proposed fix is also to set current_state = PCI_D0 in register_slot. Comments are very welcome. Signed-off-by: Stefano Stabellini Signed-off-by: Jesse Barnes commit 6058989bad05b82e78baacce69ec14f27a11b5fd Author: Narendra_K@Dell.com Date: Wed Mar 2 22:34:17 2011 +0530 PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs This patch exports ACPI _DSM (Device Specific Method) provided firmware instance number and string name of PCI devices as defined by 'PCI Firmware Specification Revision 3.1' section 4.6.7.( DSM for Naming a PCI or PCI Express Device Under Operating Systems) to sysfs. New files created are: /sys/bus/pci/devices/.../label which contains the firmware name for the device in question, and /sys/bus/pci/devices/.../acpi_index which contains the firmware device type instance for the given device. cat /sys/devices/pci0000:00/0000:00:01.0/0000:01:00.0/acpi_index 1 cat /sys/devices/pci0000:00/0000:00:01.0/0000:01:00.0/label Embedded Broadcom 5709C NIC 1 cat /sys/devices/pci0000:00/0000:00:01.0/0000:01:00.1/acpi_index 2 cat /sys/devices/pci0000:00/0000:00:01.0/0000:01:00.1/label Embedded Broadcom 5709C NIC 2 The ACPI _DSM provided firmware 'instance number' and 'string name' will be given priority if the firmware also provides 'SMBIOS type 41 device type instance and string'. Signed-off-by: Matthew Garrett Signed-off-by: Jordan Hargrave Signed-off-by: Narendra K Signed-off-by: Jesse Barnes commit cdb9755849fbaf2bb9c0a009ba5baa817a0f152d Author: Jiri Slaby Date: Mon Feb 28 10:45:09 2011 +0100 PCI: add more checking to ICH region quirks Per ICH4 and ICH6 specs, ACPI and GPIO regions are valid iff ACPI_EN and GPIO_EN bits are set to 1. Add checks for these bits into the quirks prior to the region creation. While at it, name the constants by macros. Signed-off-by: Jiri Slaby Cc: Bjorn Helgaas Cc: "David S. Miller" Cc: Thomas Renninger Signed-off-by: Jesse Barnes commit 457d9d088b026e26dbab98cad9d299c1faf4c343 Author: Prarit Bhargava Date: Tue Jan 11 15:34:35 2011 -0500 PCI: aer-inject: Override PCIe AER Mask Registers I have several systems which have the same problem: The PCIe AER corrected and uncorrected masks have all the error bits set. This results in the inablility to test with the aer_inject module & utility on those systems. Add the 'aer_mask_override' module parameter which will override the corrected or uncorrected masks for a PCI device. The mask will have the bit corresponding to the status passed into the aer_inject() function. After this patch it is possible to successfully use the aer_inject utility on those PCI slots. Successfully tested by me on a Dell and Intel whitebox which exhibited the mask problem. Signed-off-by: Prarit Bhargava Signed-off-by: Jesse Barnes commit 1d471cd1261a44a3b28350bef7e5113a4609c106 Author: Javier Martin Date: Wed Mar 2 14:52:32 2011 +0100 ASoC: Add TI tlv320aic32x4 codec support. This patch adds support for tlv320aic3205 and tlv320aic3254 codecs. It doesn't include miniDSP support for aic3254. Signed-off-by: Javier Martin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit cd97bb003276a66b2174e5dc589748e5c4bc357e Author: Benoit Cousson Date: Fri Mar 4 16:01:43 2011 +0100 Revert "OMAP4: hwmod data: Prevent timer1 to be reset and idle during init" The following commit: 38698be: OMAP2+: clockevent: set up GPTIMER clockevent hwmod right before timer init Fixed properly the issue with early init for the timer1 So reverts commit 3b03b58dab847883e6b9a431558c7d8e43fa94c6 that is now generated a warning at boot time. Signed-off-by: Benoit Cousson Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit e83a46bbb1d4c03defd733a64b727632a40059ad Merge: da52777 fd51469 Author: Tejun Heo Date: Fri Mar 4 19:09:02 2011 +0100 Merge branch 'for-linus' of ../linux-2.6-block into block-for-2.6.39/core This merge creates two set of conflicts. One is simple context conflicts caused by removal of throtl_scheduled_delayed_work() in for-linus and removal of throtl_shutdown_timer_wq() in for-2.6.39/core. The other is caused by commit 255bb490c8 (block: blk-flush shouldn't call directly into q->request_fn() __blk_run_queue()) in for-linus crashing with FLUSH reimplementation in for-2.6.39/core. The conflict isn't trivial but the resolution is straight-forward. * __blk_run_queue() calls in flush_end_io() and flush_data_end_io() should be called with @force_kblockd set to %true. * elv_insert() in blk_kick_flush() should use %ELEVATOR_INSERT_REQUEUE. Both changes are to avoid invoking ->request_fn() directly from request completion path and closely match the changes in the commit 255bb490c8. Signed-off-by: Tejun Heo commit 65f0b417dee94f779ce9b77102b7d73c93723b39 Author: Ben Hutchings Date: Tue Feb 22 17:26:10 2011 +0000 sfc: Use write-combining to reduce TX latency Based on work by Neil Turton and Kieran Mansley . The BIU has now been verified to handle 3- and 4-dword writes within a single 128-bit register correctly. This means we can enable write- combining and only insert write barriers between writes to distinct registers. This has been observed to save about 0.5 us when pushing a TX descriptor to an empty TX queue. Signed-off-by: Ben Hutchings commit 241e6663b5151733294d1a230a3fd8a4d32e187f Author: Paul E. McKenney Date: Thu Feb 10 16:54:50 2011 -0800 smp: Document transitivity for memory barriers. Transitivity is guaranteed only for full memory barriers (smp_mb()). Signed-off-by: Paul E. McKenney commit e611eecd6f9f91d74beda8cfbb3b5e02abdeb5a1 Author: Paul E. McKenney Date: Sun Jan 30 23:56:46 2011 -0800 rcu: add comment saying why DEBUG_OBJECTS_RCU_HEAD depends on PREEMPT. The build will break if you change the Kconfig to allow DEBUG_OBJECTS_RCU_HEAD and !PREEMPT, so document the reasoning near where the breakage would occur. Signed-off-by: Paul E. McKenney commit fe8e64071a4ff5925ced4f33cb32ba090a04649c Author: Amerigo Wang Date: Sun Jan 30 18:23:08 2011 +0800 rcupdate: remove dead code DEBUG_OBJECTS_RCU_HEAD depends on PREEMPT, so #ifndef CONFIG_PREEMPT is totally useless in kernel/rcupdate.c. Signed-off-by: WANG Cong Cc: Paul E. McKenney Signed-off-by: Paul E. McKenney commit fea651267e52a88e7b81e01b6717d968254b6ddb Author: Paul E. McKenney Date: Sun Jan 23 22:35:45 2011 -0800 rcu: add documentation saying which RCU flavor to choose Reported-by: Paul Mackerras Signed-off-by: Paul E. McKenney commit 37743de384951ef97c040e69039820c987849501 Author: Jesper Juhl Date: Mon Jan 10 21:43:13 2011 +0100 rcutorture: Get rid of duplicate sched.h include linux/sched.h is included twice in kernel/rcutorture.c - once is enough. Signed-off-by: Jesper Juhl Reviewed-by: Josh Triplett Signed-off-by: Paul E. McKenney commit ba74f4d7e5125d04d453b4af69c53c533e6feb80 Author: Lai Jiangshan Date: Sun Jan 9 18:09:51 2011 -0800 rcu: call __rcu_read_unlock() in exit_rcu for tiny RCU Using __rcu_read_lock() in place of rcu_read_lock() leaves any debug state as it really should be, namely with the lock still held. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit 078a198906c796981f93ff100c210506e91aade5 Author: Tejun Heo Date: Fri Mar 4 16:32:02 2011 +0100 x86-64, NUMA: Don't assume phys node 0 is always online in numa_emulation() Undetermined entries in emu_nid_to_phys[] are filled with zero assuming that physical node 0 is always online; however, this might not be true depending on hardware configuration. Find a physical node which is actually online and use it instead. Signed-off-by: Tejun Heo Reported-by: David Rientjes LKML-Reference: commit c09cedf4f75f1e47ea17f55e18e9cfb81bec8575 Author: David Rientjes Date: Fri Mar 4 15:17:21 2011 +0100 x86-64, NUMA: Clean up initmem_init() This patch cleans initmem_init() so that it is more readable and doesn't use an unnecessary array of function pointers to convolute the flow of the code. It also makes it obvious that dummy_numa_init() will always succeed (and documents that requirement) so that the existing BUG() is never actually reached. No functional change. -tj: Updated comment for dummy_numa_init() slightly. Signed-off-by: David Rientjes Signed-off-by: Tejun Heo commit 51b361b4009f4e19ae68d2bcbb35e254e91b6054 Author: Yinghai Lu Date: Fri Mar 4 14:49:28 2011 +0100 x86-64, NUMA: Fix numa_emulation code with node0 without RAM On one system that does not have RAM on node0. When numa_emulation is compiled in, and 1. boot system without numa=fake... 2. or boot system with numa=fake=128 to make emulation fail will get: [ 0.092026] ------------[ cut here ]------------ [ 0.096005] kernel BUG at arch/x86/mm/numa_emulation.c:439! [ 0.096005] invalid opcode: 0000 [#1] SMP [ 0.096005] last sysfs file: [ 0.096005] CPU 0 [ 0.096005] Modules linked in: [ 0.096005] [ 0.096005] Pid: 0, comm: swapper Not tainted 2.6.38-rc6-tip-yh-03869-gcb0491d-dirty #684 Sun Microsystems Sun Fire X4240/Sun Fire X4240 [ 0.096005] RIP: 0010:[] [] numa_add_cpu+0x56/0xcf [ 0.096005] RSP: 0000:ffffffff82437ed8 EFLAGS: 00010246 ... [ 0.096005] Call Trace: [ 0.096005] [] identify_cpu+0x2d7/0x2df [ 0.096005] [] identify_boot_cpu+0x10/0x30 [ 0.096005] [] check_bugs+0x9/0x2d [ 0.096005] [] start_kernel+0x3d7/0x3f1 [ 0.096005] [] x86_64_start_reservations+0x9c/0xa0 [ 0.096005] [] x86_64_start_kernel+0x1dd/0x1e8 [ 0.096005] Code: 74 06 48 8d 04 90 eb 0f 48 c7 c0 30 d9 00 00 48 03 04 d5 90 0f 60 82 8b 00 83 f8 ff 74 0d 0f a3 05 8b 7e 92 00 19 d2 85 d2 75 02 <0f> 0b 48 98 be 00 01 00 00 48 c7 c7 e0 44 60 82 44 8b 2c 85 e0 [ 0.096005] RIP [] numa_add_cpu+0x56/0xcf [ 0.096005] RSP [ 0.096026] ---[ end trace a7919e7f17c0a725 ]--- We need to use early_cpu_to_node() directly, because numa_cpu_node() will return node0 that is not onlined. Signed-off-by: Yinghai Lu Signed-off-by: Tejun Heo commit e994d7d23a0bae34cd28834e85522ed4e782faf7 Author: Andi Kleen Date: Thu Mar 3 10:34:48 2011 +0800 perf: Fix LLC-* events on Intel Nehalem/Westmere On Intel Nehalem and Westmere CPUs the generic perf LLC-* events count the L2 caches, not the real L3 LLC - this was inconsistent with behavior on other CPUs. Fixing this requires the use of the special OFFCORE_RESPONSE events which need a separate mask register. This has been implemented by the previous patch, now use this infrastructure to set correct events for the LLC-* on Nehalem and Westmere. Signed-off-by: Andi Kleen Signed-off-by: Lin Ming Signed-off-by: Peter Zijlstra LKML-Reference: <1299119690-13991-3-git-send-email-ming.m.lin@intel.com> Signed-off-by: Ingo Molnar commit a7e3ed1e470116c9d12c2f778431a481a6be8ab6 Author: Andi Kleen Date: Thu Mar 3 10:34:47 2011 +0800 perf: Add support for supplementary event registers Change logs against Andi's original version: - Extends perf_event_attr:config to config{,1,2} (Peter Zijlstra) - Fixed a major event scheduling issue. There cannot be a ref++ on an event that has already done ref++ once and without calling put_constraint() in between. (Stephane Eranian) - Use thread_cpumask for percore allocation. (Lin Ming) - Use MSR names in the extra reg lists. (Lin Ming) - Remove redundant "c = NULL" in intel_percore_constraints - Fix comment of perf_event_attr::config1 Intel Nehalem/Westmere have a special OFFCORE_RESPONSE event that can be used to monitor any offcore accesses from a core. This is a very useful event for various tunings, and it's also needed to implement the generic LLC-* events correctly. Unfortunately this event requires programming a mask in a separate register. And worse this separate register is per core, not per CPU thread. This patch: - Teaches perf_events that OFFCORE_RESPONSE needs extra parameters. The extra parameters are passed by user space in the perf_event_attr::config1 field. - Adds support to the Intel perf_event core to schedule per core resources. This adds fairly generic infrastructure that can be also used for other per core resources. The basic code has is patterned after the similar AMD northbridge constraints code. Thanks to Stephane Eranian who pointed out some problems in the original version and suggested improvements. Signed-off-by: Andi Kleen Signed-off-by: Lin Ming Signed-off-by: Peter Zijlstra LKML-Reference: <1299119690-13991-2-git-send-email-ming.m.lin@intel.com> Signed-off-by: Ingo Molnar commit 17e3162972cbb9796035fff1e2fd30669b0eef65 Author: Stephane Eranian Date: Wed Mar 2 17:05:01 2011 +0200 perf_events: Update PEBS event constraints This patch updates PEBS event constraints for Intel Atom, Nehalem, Westmere. This patch also reorganizes the PEBS format/constraint detection code. It is now based on processor model and not PEBS format. Two processors may use the same PEBS format without have the same list of PEBS events. In this second version, we simplified the initialization of the PEBS constraints by leveraging the existing switch() statement in perf_event_intel.c. We also renamed the constraint tables to be more consistent with regular constraints. In this 3rd version, we drop BR_INST_RETIRED.MISPRED from Intel Atom as it does not seem to work. Use MISPREDICTED_BRANCH_RETIRED instead. Also add FP_ASSIST.* o both Intel Nehalem and Westmere. I misssed those in the earlier patches. Events were tested using libpfm4 perf_examples. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4d6e6b02.815bdf0a.637b.07a7@mx.google.com> Signed-off-by: Ingo Molnar commit 08309379b7083a9ceec0f9bb96a629058fb623c4 Author: Peter Zijlstra Date: Thu Mar 3 11:31:20 2011 +0100 perf: Fix cgroup vs jump_label problem Li Zefan reported that the jump label code sleeps and we're calling it under a spinlock, *fail* ;-) Reported-by: Li Zefan Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 2d0f25201ee210a0666ec9c41538ba05a07f8bc6 Author: Li Zefan Date: Thu Mar 3 14:26:20 2011 +0800 perf cgroup: Fix a typo in kernel config s/specificied/specified Signed-off-by: Li Zefan Acked-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4D6F348C.2050804@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 1b15d0558e82df9b3659804ceb44187b98eda354 Author: Li Zefan Date: Thu Mar 3 14:26:06 2011 +0800 perf cgroup: Clean up perf_cgroup_create() - Use kzalloc() to replace kmalloc() + memset(). - Remove redundant initialization, since alloc_percpu() returns zero-filled percpu memory. Signed-off-by: Li Zefan Acked-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4D6F347E.2010806@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit f75e18cb9627b1d3d752b83a0b5563da0042c50a Author: Li Zefan Date: Thu Mar 3 14:25:50 2011 +0800 perf cgroup: Fix unmatched call to perf_detach_cgroup() In the failure path, we call perf_detach_cgroup(), but we didn't call perf_get_cgroup() prio to it. Signed-off-by: Li Zefan Acked-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4D6F346E.9070606@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 3db272c0494900fcb905a201180a78cae3addd6e Author: Li Zefan Date: Thu Mar 3 14:25:37 2011 +0800 perf cgroup: Fix leak of file reference count In perf_cgroup_connect(), fput_light() is missing in a failure path. Signed-off-by: Li Zefan Acked-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4D6F3461.6060406@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 940c5b2971de443df22eed0441bc74fb0116e9f5 Author: Lin Ming Date: Sun Feb 27 21:13:31 2011 +0800 perf: Fix the missing event initialization when pmu is found in idr Currently, the event is not initialized if pmu is found in idr. This never causes bug just because now no pmu is associated with the idr id. Signed-off-by: Lin Ming Signed-off-by: Peter Zijlstra LKML-Reference: <1298812411.2699.9.camel@localhost> Signed-off-by: Ingo Molnar commit 6d1cafd8b56ea726c10a5a104de57cc3ed8fa953 Author: Venkatesh Pallipadi Date: Tue Mar 1 16:28:21 2011 -0800 sched: Resched proper CPU on yield_to() yield_to_task_fair() has code to resched the CPU of yielding task when the intention is to resched the CPU of the task that is being yielded to. Change here fixes the problem and also makes the resched conditional on rq != p_rq. Signed-off-by: Venkatesh Pallipadi Reviewed-by: Rik van Riel Signed-off-by: Peter Zijlstra LKML-Reference: <1299025701-22168-1-git-send-email-venki@google.com> Signed-off-by: Ingo Molnar commit c02aa73b1d18e43cfd79c2f193b225e84ca497c8 Author: Darren Hart Date: Thu Feb 17 15:37:07 2011 -0800 sched: Allow users with sufficient RLIMIT_NICE to change from SCHED_IDLE policy The current scheduler implementation returns -EPERM when trying to change from SCHED_IDLE to SCHED_OTHER or SCHED_BATCH. Since SCHED_IDLE is considered to be a nice 20 on steroids, changing to another policy should be allowed provided the RLIMIT_NICE is accounted for. This patch allows the following test-case to pass with RLIMIT_NICE=40, but still fail with RLIMIT_NICE=10 when the calling process is run from a typical shell (nice 0, or 20 in rlimit terms). int main() { int ret; struct sched_param sp; sp.sched_priority = 0; /* switch to SCHED_IDLE */ ret = sched_setscheduler(0, SCHED_IDLE, &sp); printf("setscheduler IDLE: %d\n", ret); if (ret) return ret; /* switch back to SCHED_OTHER */ ret = sched_setscheduler(0, SCHED_OTHER, &sp); printf("setscheduler OTHER: %d\n", ret); return ret; } $ ulimit -e 40 $ ./test setscheduler IDLE: 0 setscheduler OTHER: 0 $ ulimit -e 10 $ ulimit -e 10 $ ./test setscheduler IDLE: 0 setscheduler OTHER: -1 Signed-off-by: Darren Hart Signed-off-by: Peter Zijlstra Cc: Richard Purdie LKML-Reference: <4D657BEE.4040608@linux.intel.com> Signed-off-by: Ingo Molnar commit a2f5c9ab79f78e8b91ac993e0543d65b661dd19b Author: Darren Hart Date: Tue Feb 22 13:04:33 2011 -0800 sched: Allow SCHED_BATCH to preempt SCHED_IDLE tasks Perform the test for SCHED_IDLE before testing for SCHED_BATCH (and ensure idle tasks don't preempt idle tasks) so the non-interactive, but still important, SCHED_BATCH tasks will run in favor of the very low priority SCHED_IDLE tasks. Signed-off-by: Darren Hart Signed-off-by: Peter Zijlstra Acked-by: Mike Galbraith Cc: Richard Purdie LKML-Reference: <1298408674-3130-2-git-send-email-dvhart@linux.intel.com> Signed-off-by: Ingo Molnar commit e0a92c17470775cd85bac52f5372ccc3dc58254a Merge: 544b4a1 0c3b916 Author: Ingo Molnar Date: Fri Mar 4 11:12:24 2011 +0100 Merge branch 'sched/urgent' into sched/core Merge reason: Add fixes before applying dependent patches. Signed-off-by: Ingo Molnar commit 888a8a3e9d79cbb9d83e53955f684998248580ec Merge: cfff2d9 b06b3d4 Author: Ingo Molnar Date: Fri Mar 4 10:40:22 2011 +0100 Merge branch 'perf/urgent' into perf/core Merge reason: Pick up updates before queueing up dependent patches. Signed-off-by: Ingo Molnar commit f89112502805c1f6a6955f90ad158e538edb319d Author: Tejun Heo Date: Fri Mar 4 10:26:36 2011 +0100 x86-64, NUMA: Revert NUMA affine page table allocation This patch reverts NUMA affine page table allocation added by commit 1411e0ec31 (x86-64, numa: Put pgtable to local node memory). The commit made an undocumented change where the kernel linear mapping strictly follows intersection of e820 memory map and NUMA configuration. If the physical memory configuration has holes or NUMA nodes are not properly aligned, this leads to using unnecessarily smaller mapping size which leads to increased TLB pressure. For details, http://thread.gmane.org/gmane.linux.kernel/1104672 Patches to fix the problem have been proposed but the underlying code needs more cleanup and the approach itself seems a bit heavy handed and it has been determined to revert the feature for now and come back to it in the next developement cycle. http://thread.gmane.org/gmane.linux.kernel/1105959 As init_memory_mapping_high() callsites have been consolidated since the commit, reverting is done manually. Also, the RED-PEN comment in arch/x86/mm/init.c is not restored as the problem no longer exists with memblock based top-down early memory allocation. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner commit f07ef1de9baeb2add514c51f59d4bc3c659c2ca4 Author: David Sterba Date: Fri Mar 4 15:28:52 2011 +0800 crypto: tcrypt - do not attempt to write to readonly variable Commit da7f033ddc9fdeb (â€crypto: cryptomgr - Add test infrastructureâ€) added a const to variable which is later used as target buffer of memcpy. crypto/tcrypt.c:217:12: warning: passing 'const char (*)[128]' to parameter of type 'void *' discards qualifiers memset(&iv, 0xff, iv_len); crypto/tcrypt.c:test_cipher_speed() - unsigned char *key, iv[128]; + const char *key, iv[128]; ... memset(&iv, 0xff, iv_len); Signed-off-by: David Sterba Signed-off-by: Herbert Xu commit 4e8b0cf46b2570331a4c4157d53906883c442a22 Author: Nishanth Aravamudan Date: Thu Feb 10 09:10:47 2011 +0000 powerpc/pseries: Add support for dynamic dma windows If firmware allows us to map all of a partition's memory for DMA on a particular bridge, create a 1:1 mapping of that memory. Add hooks for dealing with hotplug events. Dynamic DMA windows can use larger than the default page size, and we use the largest one possible. Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit 6edc642ebee87dfceb97050d51c5ab1fe539a597 Author: Tseng-Hui (Frank) Lin Date: Wed Mar 2 07:20:50 2011 +0000 powerpc: Cleanup definition of the PID register Move SPRN_PID declearations in various locations into one place. Signed-off-by: Tseng-Hui (Frank) Lin Signed-off-by: Benjamin Herrenschmidt commit a5cf4b08b6a4568570c4a2a712497ec49009661c Author: Jim Keniston Date: Wed Feb 9 13:00:09 2011 +0000 powerpc/pseries/nvram: Capture oops/panic reports in ibm, oops-log partition Create the lnx,oops-log NVRAM partition, and capture the end of the printk buffer in it when there's an oops or panic. If we can't create the lnx,oops-log partition, capture the oops/panic report in ibm,rtas-log. Signed-off-by: Jim Keniston Signed-off-by: Benjamin Herrenschmidt commit 0f4ac132365e56802cbe377313491aa84086371c Author: Jim Keniston Date: Wed Feb 9 12:43:13 2011 +0000 powerpc/nvram: Generalize code for OS partitions in NVRAM Adapt the functions used to create and write to the RTAS-log partition to work with any OS-type partition. Signed-off-by: Jim Keniston Signed-off-by: Benjamin Herrenschmidt commit 36003386f86c0624ae0662a229081ef2b11ac784 Author: Alexandre Courbot Date: Thu Mar 3 08:04:42 2011 +0000 serial: sh-sci: fix deadlock when resuming from S3 sleep S3 sleep invokes the shutdown callback of the sh-sci driver, which suspends the clocks until they are reactivated by a call to startup. However, before the latter is invoked, sci_set_termios may be called on the port by uart_resume_port. In such cases it will endlessly wait for the TEND bit to raise, which will never happen since the clocks are disabled. This patch ensures that clocks are enabled when ports registers are manipulated within sci_set_termios. Signed-off-by: Alexandre Courbot Signed-off-by: Paul Mundt commit af6ec5a22eef054f39368c662e9dafd8817374e2 Author: ALIM AKHTAR Date: Fri Mar 4 15:24:23 2011 +0900 ARM: EXYNOS4: Add ARMLEX4210 Board support file This patch adds Samsung ARMLEX4210 board support file which is based on Exynos4210. Signed-off-by: Alim Akhtar [kgene.kim@samsung.com: added clk_type for hsmmc3] Signed-off-by: Kukjin Kim commit 4d838ec03b2b0aea945a89b37abbf8c5550147fb Author: Marek Szyprowski Date: Fri Mar 4 10:19:52 2011 +0900 ARM: EXYNOS4: Add support for i2c PMICs on Universal_C210 board This patch adds basic definitions for MAX8952 & LP3974 (MAX8998 compatible) PMICs for UniversalC210 board. Power consumers for the device drivers will be added later. These two PMICs occupy I2C5 bus. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit caf8b1f234f876981bf1be0fa2651a4e97203754 Author: Minkyu Kang Date: Mon Feb 28 20:39:43 2011 +0900 ARM: EXYNOS4: Adds Samsung NURI board support This patch adds Samsung NURI board support. Signed-off-by: Minkyu Kang Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit e73f88af66fcc50083fae4b7e1c39b469179a97a Author: Dave Airlie Date: Fri Mar 4 14:50:28 2011 +1000 drm: add cap bit to denote if dumb ioctl is available or not. This allows libkms to make an easier decision. Signed-off-by: Dave Airlie commit 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 Merge: 01a16b2 b65a0e0 Author: David S. Miller Date: Thu Mar 3 21:27:42 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bnx2x/bnx2x.h commit 9f35421e09c494c36079d7cf5724ae9f832431d7 Author: Ben Skeggs Date: Mon Feb 21 11:17:35 2011 +1000 drm/core: add ioctl to query device/driver capabilities We're coming to see a need to have a set of generic capability checks in the core DRM, in addition to the driver-specific ioctls that already exist. This patch defines an ioctl to do as such, but does not yet define any capabilities. [airlied: drop the driver callback for now.] Signed-off-by: Ben Skeggs Signed-off-by: Dave Airlie commit cfff2d909cbdaf8c467bd321aa0502a548ec8f7e Author: Frederic Weisbecker Date: Fri Feb 25 21:30:16 2011 +0100 perf: Fix undefined PyVarObject_HEAD_INIT in python 2.5 PyVarObject_HEAD_INIT is undefined in python 2.5, resulting in a build crash: util/python.c:81: attention : déclaration implicite de la fonction « «PyVarObject_HEAD_INIT» » util/python.c:82: erreur: request for member «tp_name» in something not a structure or union util/python.c:117: erreur: request for member «tp_name» in something not a structure or union util/python.c:146: erreur: request for member «tp_name» in something not a structure or union util/python.c:177: erreur: request for member «tp_name» in something not a structure or union util/python.c:290: erreur: request for member «tp_name» in something not a structure or union util/python.c:359: erreur: request for member «tp_name» in something not a structure or union util/python.c:532: erreur: request for member «tp_name» in something not a structure or union util/python.c:761: erreur: request for member «tp_name» in something not a structure or union error: command 'gcc' failed with exit status 1 make: *** [python/perf.so] Erreur 1 We can fix that by defining PyVarObject_HEAD_INIT as a wrapper on PyObject_HEAD_INIT, thanks to a trick found on biopython: https://github.com/biopython/biopython/commit/d4eaf57946c7b4c32eca8d18821edf32f83e300d Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Arnaldo Carvalho de Melo commit ff9ae1babd8ce88c3f90db6278ea5f55bdcb4624 Author: Frederic Weisbecker Date: Fri Feb 25 21:57:04 2011 +0100 perf: Fix missing strndup declaration is included first without _GNU_SOURCE, so it ends up including without declaring strndup(). And further declarations, even with _GNU_SOURCE defined, are of course without effect. Therefore: util/strfilter.c: Dans la fonction «strfilter_node__new» : util/strfilter.c:134: attention : déclaration implicite de la fonction « «strndup» » util/strfilter.c:134: attention : incompatible implicit declaration of built-in function «strndup» make: *** [util/strfilter.o] Erreur 1 Just don't include ctype.h as it doesn't appear to be necessary anyway. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Arnaldo Carvalho de Melo commit 425fa41072b7dce3d88f392b335e561a770aa6c3 Author: Tao Ma Date: Thu Mar 3 22:58:37 2011 +0800 ext3: Fix an overflow in ext3_trim_fs. In a bs=4096 volume, if we call FITRIM with the following parameter as fstrim_range(start = 102400, len = 134144000, minlen = 10240), with the following code: if (len >= EXT3_BLOCKS_PER_GROUP(sb)) len -= (EXT3_BLOCKS_PER_GROUP(sb) - first_block); else last_block = first_block + len; So if len < EXT3_BLOCKS_PER_GROUP while first_block + len > EXT3_BLOCKS_PER_GROUP, last_block will be set to an overflow value which exceeds EXT3_BLOCKS_PER_GROUP. This patch fixes it and adjusts len and last_block accordingly. Cc: Lukas Czerner Cc: Jan Kara Signed-off-by: Tao Ma Signed-off-by: Jan Kara commit c871fe663a6368fd0e98f5a3bfd81b0b9c591266 Merge: d5fdafd db811ca Author: Colin Cross Date: Thu Mar 3 14:17:49 2011 -0800 Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for-next-i2c commit d5fdafd38ca0c28c4648909ce0afd0a5420309ca Author: Mike Rapoport Date: Wed Mar 2 14:34:06 2011 +0200 ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice Currently tegra_pcie_init is effectively called as subsys_initcall. With multiplatform kernel this may cause hangs on boards that don't intend to support Tegra2 PCI-e. Ensure that TrimSlice board code initializes PCI-e only when actually running on the TrimSlice. Signed-off-by: Mike Rapoport Signed-off-by: Colin Cross commit b96cc7fe190b9356633c70afae61ee0637b000ee Author: Mike Rapoport Date: Wed Mar 2 14:34:05 2011 +0200 ARM: tegra: add PCI Express power gating Signed-off-by: Mike Rapoport Signed-off-by: Colin Cross commit 1e40a97e6cb69d8b7edba801d75d1024078ce9aa Author: Mike Rapoport Date: Wed Mar 2 14:34:04 2011 +0200 ARM: tegra: PCIE minor code refactoring Move tegra_pcie_power_off before tegra_pcie_power_on for clean addition of PCIE power gating Signed-off-by: Mike Rapoport Signed-off-by: Colin Cross commit 01a16b21d6adf992aa863186c3c4e561a57c1714 Author: Patrick McHardy Date: Thu Mar 3 13:32:07 2011 -0800 netlink: kill eff_cap from struct netlink_skb_parms Netlink message processing in the kernel is synchronous these days, capabilities can be checked directly in security_netlink_recv() from the current process. Signed-off-by: Patrick McHardy Reviewed-by: James Morris [chrisw: update to include pohmelfs and uvesafb] Signed-off-by: Chris Wright Signed-off-by: David S. Miller commit 63f97425166a1a16279c1a5720e9dfcb2c12ad1b Author: Joe Perches Date: Thu Mar 3 13:30:20 2011 -0800 eql: Convert printks to pr_ and netdev_ Add pr_fmt. Removed trailing "\n" from version, add back via pr_info("%s\n", version); Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6920aaf084ec3481eec7793019d0a8395fa85484 Author: Lennert Buytenhek Date: Mon Nov 22 09:34:12 2010 +0100 ARM: Dove: Remove PXA compatibility IRQ defines. These are not currently used anywhere, but when the relevant peripherals are enabled on the Dove port, the IRQ numbers should be passed into the drivers via platform device resources rather than having the drivers get them from platform headers directly. Signed-off-by: Lennert Buytenhek Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 9eac6d0a4e7e5149a7f86575b46d710ad2e05fe2 Author: Lennert Buytenhek Date: Tue Dec 14 12:54:03 2010 +0100 ARM: Remove dependency of plat-orion GPIO code on mach directory includes. This patch makes the various mach dirs that use the plat-orion GPIO code pass in GPIO-related platform info (GPIO controller base address, secondary base IRQ number, etc) explicitly, instead of having plat-orion get those values by including a mach dir include file -- the latter mechanism is problematic if you want to support multiple ARM platforms in the same kernel image. Signed-off-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit 4ee1f6b574765a6c97f945e6b0277e5ccac38cb5 Author: Lennert Buytenhek Date: Fri Oct 15 16:50:26 2010 +0200 ARM: Remove dependency of plat-orion time code on mach directory includes. This patch makes the various mach dirs that use the plat-orion time code pass in timer and bridge addresses explicitly, instead of having plat-orion get those values by including a mach dir include file -- the latter mechanism is problematic if you want to support multiple ARM platforms in the same kernel image. Signed-off-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit 40ff15a6cb9e7e84b72ef962d9d27551fb00f54b Author: Nicolas Pitre Date: Thu Mar 3 15:12:48 2011 -0500 [ARM] Kirkwood: add LaCie d2 Network v2 to defconfig Signed-off-by: Nicolas Pitre commit 9b8ebfec7d661a23934ed3c12fe75ebd9e2e3b82 Author: Nicolas Pitre Date: Thu Mar 3 15:08:53 2011 -0500 [ARM] Kirkwood: make kirkwood_find_tclk() static Signed-off-by: Nicolas Pitre commit 9d3e1c56dee5e09c6babc96810c7105a7993908e Author: Arnaud Patard Date: Wed Mar 2 22:27:41 2011 +0100 [ARM] Kirkwood: t5325: add audio support This patch declares the i2c audio codec and initialise audio. It's adding the alc5621 codec in the i2c board info and is calling kirkwood_audio_init() to initialize kirkwood audio. Signed-off-by: Arnaud Patard Signed-off-by: Nicolas Pitre commit 17718e17a25cc989954a8430985b3133ca21422e Author: Alexander Clouter Date: Wed Feb 16 22:29:39 2011 +0000 [ARM] update FPGA revisions for TS-7800 New FPGA revisions have been released and seen in the wild on the platform, so it's time to update the list. Signed-off-by: Alexander Clouter Signed-off-by: Nicolas Pitre commit 1ab6962794b4225b67bc3b6449f11a126f455fff Author: Zintis PÄ“tersons Date: Mon Feb 14 18:38:13 2011 +0200 [ARM] Kirkwood: initialize PCIE1 for QNAP TS-419P+ Initialize PCIE1 on the 6282-based QNAP TS-419P+ since it has a Marvell 9125 SATA chip on each PCI bus. Signed-off-by: Zintis PÄ“tersons Signed-off-by: Nicolas Pitre commit 9c15364f83201802e995cbf72d833e5e1b3b9adb Author: Eric Cooper Date: Wed Feb 2 17:16:11 2011 -0500 [ARM] Kirkwood: enable PCIe for kexec Use the machine-specific kexec_reinit hook to make sure PCIe is enabled before starting a new kernel. Signed-off-by: Eric Cooper Signed-off-by: Nicolas Pitre commit 0e0cdd37709ba7ac9f0bff5de1b22f1b7987b04c Author: Eric Cooper Date: Wed Feb 2 17:16:10 2011 -0500 [ARM] Kirkwood: enable PCIe before reading device ID register PCIe may have been disabled (by kirkwood_clock_gate) if this kernel was started by kexec. Make sure PCIe is enabled before attempting to access the device ID register, otherwise the system will hang. Signed-off-by: Eric Cooper Signed-off-by: Nicolas Pitre commit 868d172b8ac23070418ec6265195e88e8d5dbe92 Author: Eric Cooper Date: Wed Feb 2 17:16:09 2011 -0500 [ARM] add machine-specific hook to machine_kexec Provide the option to call a machine-specific function before kexec'ing a new kernel. Signed-off-by: Eric Cooper Signed-off-by: Nicolas Pitre commit 026eb167ae77244458fa4b4b9fc171209c079ba7 Author: Eric Paris Date: Thu Mar 3 16:09:14 2011 -0500 SELinux: implement the new sb_remount LSM hook For SELinux we do not allow security information to change during a remount operation. Thus this hook simply strips the security module options from the data and verifies that those are the same options as exist on the current superblock. Signed-off-by: Eric Paris Reviewed-by: James Morris commit ff36fe2c845cab2102e4826c1ffa0a6ebf487c65 Author: Eric Paris Date: Thu Mar 3 16:09:14 2011 -0500 LSM: Pass -o remount options to the LSM The VFS mount code passes the mount options to the LSM. The LSM will remove options it understands from the data and the VFS will then pass the remaining options onto the underlying filesystem. This is how options like the SELinux context= work. The problem comes in that -o remount never calls into LSM code. So if you include an LSM specific option it will get passed to the filesystem and will cause the remount to fail. An example of where this is a problem is the 'seclabel' option. The SELinux LSM hook will print this word in /proc/mounts if the filesystem is being labeled using xattrs. If you pass this word on mount it will be silently stripped and ignored. But if you pass this word on remount the LSM never gets called and it will be passed to the FS. The FS doesn't know what seclabel means and thus should fail the mount. For example an ext3 fs mounted over loop # mount -o loop /tmp/fs /mnt/tmp # cat /proc/mounts | grep /mnt/tmp /dev/loop0 /mnt/tmp ext3 rw,seclabel,relatime,errors=continue,barrier=0,data=ordered 0 0 # mount -o remount /mnt/tmp mount: /mnt/tmp not mounted already, or bad option # dmesg EXT3-fs (loop0): error: unrecognized mount option "seclabel" or missing value This patch passes the remount mount options to an new LSM hook. Signed-off-by: Eric Paris Reviewed-by: James Morris commit 967faf3b718e887301adb1636c2295f03d3c694f Author: Joe Perches Date: Thu Mar 3 12:55:08 2011 -0800 mii: Convert printks to netdev_info Add a bit more data to the output. Convert string speeds to integer. Object size reduced a tiny bit. $ size drivers/net/mii.o* text data bss dec hex filename 4155 56 1000 5211 145b drivers/net/mii.o.new 4184 56 1000 5240 1478 drivers/net/mii.o.old Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 7542db8b1cb88ab15a85893d1dfb886e22b568e8 Author: Joe Perches Date: Wed Mar 2 17:50:35 2011 +0000 mv643xx_eth: Use netdev_ and pr_ Use the current logging styles. Signed-off-by: Joe Perches Acked-by: Lennert Buytenhek Signed-off-by: David S. Miller commit 50624aab5304cb8167ead32af46ac9de54e6e8ad Author: Joe Perches Date: Tue Mar 1 06:56:33 2011 +0000 tlan: Use pr_fmt, pr_ and netdev_ Neatening and standardization to the current logging mechanisms. Miscellaneous speen/speed typo correction. Signed-off-by: Joe Perches Acked-by: Sakari Ailus Signed-off-by: David S. Miller commit a576cd8700271273a572976df4f06db44a0652f3 Author: Joe Perches Date: Tue Mar 1 06:56:32 2011 +0000 tlan: Remove changelog As it isn't necessary nor really useful any longer. Signed-off-by: Joe Perches Acked-by: Sakari Ailus Signed-off-by: David S. Miller commit 1829b086d175ba07a01ff6934fd51a59bc9be4ce Author: Eric Dumazet Date: Tue Mar 1 05:48:12 2011 +0000 benet: use GFP_KERNEL allocations when possible Extend be_alloc_pages() with a gfp parameter, so that we use GFP_KERNEL allocations instead of GFP_ATOMIC when not running in softirq context. Signed-off-by: Eric Dumazet Acked-by: Ajit Khaparde Signed-off-by: David S. Miller commit e25bac968d41d994e5295f89547bdff6cb40588a Author: Alexander Clouter Date: Sat Jan 8 11:55:25 2011 +0000 [ARM] orion5x: accelerate NAND on the TS-78xx The NAND supports 32bit reads and writes so lets stop shunting 8bit chunks across the bus. Doing a dumb 'dd' benchmark, this increases performance roughly like so: * read: 1.3MB/s to 3.4MB/s * write: 614kB/s to 882kB/s Signed-off-by: Alexander Clouter Signed-off-by: Nicolas Pitre commit 6b8a66ee919e40111e3d257b2c22b5773e34ead1 Author: Joe Perches Date: Wed Mar 2 07:18:10 2011 +0000 tun: Convert logging messages to pr_ and tun_debug Use the current logging forms with pr_fmt. Convert DBG macro to tun_debug, use netdev_printk as well. Add printf verification when TUN_DEBUG not defined. Miscellaneous comment typo fix. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 2ad18bdf3b8f84c85c7da7e4de365f7c5701fb3f Author: Harry Ciao Date: Wed Mar 2 13:32:34 2011 +0800 SELinux: Compute SID for the newly created socket The security context for the newly created socket shares the same user, role and MLS attribute as its creator but may have a different type, which could be specified by a type_transition rule in the relevant policy package. Signed-off-by: Harry Ciao [fix call to security_transition_sid to include qstr, Eric Paris] Signed-off-by: Eric Paris Acked-by: Stephen Smalley commit 6f5317e730505d5cbc851c435a2dfe3d5a21d343 Author: Harry Ciao Date: Wed Mar 2 13:32:33 2011 +0800 SELinux: Socket retains creator role and MLS attribute The socket SID would be computed on creation and no longer inherit its creator's SID by default. Socket may have a different type but needs to retain the creator's role and MLS attribute in order not to break labeled networking and network access control. The kernel value for a class would be used to determine if the class if one of socket classes. If security_compute_sid is called from userspace the policy value for a class would be mapped to the relevant kernel value first. Signed-off-by: Harry Ciao Signed-off-by: Eric Paris Acked-by: Stephen Smalley commit 4bc6c2d5d8386800fde23a8e78cd4f04a0ade0ad Author: Harry Ciao Date: Wed Mar 2 13:46:08 2011 +0800 SELinux: Auto-generate security_is_socket_class The security_is_socket_class() is auto-generated by genheaders based on classmap.h to reduce maintenance effort when a new class is defined in SELinux kernel. The name for any socket class should be suffixed by "socket" and doesn't contain more than one substr of "socket". Signed-off-by: Harry Ciao Signed-off-by: Eric Paris Acked-by: Stephen Smalley commit 8d77c036b57cf813d838f859e11b6a188acdb1fb Author: Po-Yu Chuang Date: Mon Feb 28 20:48:49 2011 +0000 net: add Faraday FTMAC100 10/100 Ethernet driver FTMAC100 Ethernet Media Access Controller supports 10/100 Mbps and MII. This driver has been working on some ARM/NDS32 SoC's including Faraday A320 and Andes AG101. Signed-off-by: Po-Yu Chuang Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 29546a6404e3a4b5d13f0a9586eb5cf1c3b25167 Author: David S. Miller Date: Thu Mar 3 12:10:37 2011 -0800 ipv6: Use ERR_CAST in addrconf_dst_alloc. Signed-off-by: David S. Miller commit a45d49d1053fd5954260a70e555daabd5672577d Merge: e066008 a52055e Author: David S. Miller Date: Thu Mar 3 11:28:35 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit e066008b38ca9ace1b6de8dbbac8ed460640791d Author: David S. Miller Date: Thu Mar 3 11:24:19 2011 -0800 ipv4: Fix __ip_dev_find() to use ifa_local instead of ifa_address. Reported-by: Stephen Hemminger Reported-by: Julian Anastasov Signed-off-by: David S. Miller commit d276055c4e90a7278cd5167ba9755c9b214bcff7 Author: Eric Dumazet Date: Thu Mar 3 11:10:02 2011 -0800 net_sched: reduce fifo qdisc size Because of various alignements [SLUB / qdisc], we use 512 bytes of memory for one {p|b}fifo qdisc, instead of 256 bytes on 64bit arches and 192 bytes on 32bit ones. Move the "u32 limit" inside "struct Qdisc" (no impact on other qdiscs) Change qdisc_alloc(), first trying a regular allocation before an oversized one. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c53fa1ed92cd671a1dfb1e7569e9ab672612ddc6 Author: Patrick McHardy Date: Thu Mar 3 10:55:40 2011 -0800 netlink: kill loginuid/sessionid/sid members from struct netlink_skb_parms Netlink message processing in the kernel is synchronous these days, the session information can be collected when needed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 06dc94b1ed05f91e246315afeb1c652d6d0dc9ab Author: David S. Miller Date: Thu Mar 3 10:38:01 2011 -0800 ipv4: Fix crash in dst_release when udp_sendmsg route lookup fails. As reported by Eric: [11483.697233] IP: [] dst_release+0x18/0x60 ... [11483.697741] Call Trace: [11483.697764] [] udp_sendmsg+0x282/0x6e0 [11483.697790] [] ? memcpy_toiovec+0x51/0x70 [11483.697818] [] ? ip_generic_getfrag+0x0/0xb0 The pointer passed to dst_release() is -EINVAL, that's because we leave an error pointer in the local variable "rt" by accident. NULL it out to fix the bug. Reported-by: Eric Dumazet Signed-off-by: David S. Miller commit f8f79a5dbeb59a13a3f8101b24cbe19ec6e92d07 Author: Fry, Donald H Date: Fri Feb 25 09:44:48 2011 -0800 iwlagn: report correct temperature for WiFi/BT devices. The temperature reported by 'cat /sys/class/net/wlan?/device/temperature' is incorrect for devices with BT capability. Report the value from the correct statistics structure. Tested with 130, 100, 6205 and 5300. Signed-off-by: Don Fry Signed-off-by: Wey-Yi Guy commit 1aa0b51a033d4a1ec6d29d06487e053398afa21b Author: Konrad Rzeszutek Wilk Date: Thu Feb 17 11:23:58 2011 -0500 xen/irq: Cleanup up the pirq_to_irq for DomU PV PCI passthrough guests as well. We only did this for PV guests that are xen_initial_domain() but there is not reason not to do this for other cases. The other case is only exercised when you pass in a PCI device to a PV guest _and_ the device in question. Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 676dc3cf5bc36a9e129a3ad8fe3bd7b2ebf20f5d Author: Thomas Gleixner Date: Sat Feb 5 20:08:59 2011 +0000 xen: Use IRQF_FORCE_RESUME Mark the IRQF_NO_SUSPEND interrupts IRQF_FORCE_RESUME and remove the extra walk through the interrupt descriptors. Signed-off-by: Thomas Gleixner Signed-off-by: Konrad Rzeszutek Wilk commit 8aef4857d26c46ca3d4f1a7f3a7aa4b51a72385e Merge: f611f2d dc5f219 Author: Konrad Rzeszutek Wilk Date: Thu Mar 3 12:02:02 2011 -0500 Merge branch 'irq/for-xen' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into HEAD * 'irq/for-xen' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Add IRQF_FORCE_RESUME commit f611f2da99420abc973c32cdbddbf5c365d0a20c Author: Ian Campbell Date: Tue Feb 8 14:03:31 2011 +0000 xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend. The patches missed an indirect use of IRQF_NO_SUSPEND pulled in via IRQF_TIMER. The following patch fixes the issue. With this fixlet PV guest migration works just fine. I also booted the entire series as a dom0 kernel and it appeared fine. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit aa673c1cb3a66d0b37595251c4e8bb688efc8726 Author: Ian Campbell Date: Mon Feb 7 11:08:39 2011 +0000 xen: Fix compile error introduced by "switch to new irq_chip functions" drivers/xen/events.c: In function 'ack_pirq': drivers/xen/events.c:568: error: implicit declaration of function 'irq_move_irq' Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit c9e265e030537167c94cbed190826f02e3887f4d Author: Thomas Gleixner Date: Sat Feb 5 20:08:54 2011 +0000 xen: Switch to new irq_chip functions Convert Xen to the new irq_chip functions. Brings us closer to enable CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED Signed-off-by: Thomas Gleixner Acked-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 149f256f8ca690c28dd8aa9fb8bcdaf2e93b1e1c Author: Thomas Gleixner Date: Sat Feb 5 20:08:52 2011 +0000 xen: Remove stale irq_chip.end irq_chip.end got obsolete with the removal of __do_IRQ() Signed-off-by: Thomas Gleixner Acked-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 7214610475b2847a81478d96e4d3ba0bbe49598c Author: Ian Campbell Date: Thu Feb 3 09:49:35 2011 +0000 xen: events: do not free legacy IRQs c514d00c8057 "xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq" correctly avoids reallocating legacy IRQs (which are managed by the arch core) but erroneously did not prevent them being freed. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 89911501f3aae44a43984793341a3bf1f4c583c2 Author: Ian Campbell Date: Thu Mar 3 11:57:44 2011 -0500 xen: events: allocate GSIs and dynamic IRQs from separate IRQ ranges. There are three cases which we need to care about, PV guest, PV domain 0 and HVM guest. The PV guest case is simple since it has no access to ACPI or real APICs and therefore has no GSIs therefore we simply dynamically allocate all IRQs. The potentially interesting case here is PIRQ type event channels associated with passed through PCI devices. However even in this case the guest has no direct interaction with the physical GSI since that happens in the PCI backend. The PV domain 0 and HVM guest cases are actually the same. In domain 0 case the kernel sees the host ACPI and GSIs (although it only sees the APIC indirectly via the hypervisor) and in the HVM guest case it sees the virtualised ACPI and emulated APICs. In these cases we start allocating dynamic IRQs at nr_irqs_gsi so that they cannot clash with any GSI. Currently xen_allocate_irq_dynamic starts at nr_irqs and works backwards looking for a free IRQ in order to (try and) avoid clashing with GSIs used in domain 0 and in HVM guests. This change avoids that although we retain the behaviour of allowing dynamic IRQs to encroach on the GSI range if no suitable IRQs are available since a future IRQ clash is deemed preferable to failure right now. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Jeremy Fitzhardinge commit c9df1ce585e3bb5a2f101c1d87381b285a9f962f Author: Ian Campbell Date: Tue Jan 11 17:20:15 2011 +0000 xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq This is neater than open-coded calls to irq_alloc_desc_at and irq_free_desc. No intended behavioural change. Note that we previously were not checking the return value of irq_alloc_desc_at which would be failing for GSI Signed-off-by: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Jeremy Fitzhardinge commit cbf6aa89fc52c5253ee141d53eeb73147eb37ac0 Author: Ian Campbell Date: Tue Jan 11 17:20:14 2011 +0000 xen:events: move find_unbound_irq inside CONFIG_PCI_MSI The only caller is xen_allocate_pirq_msi which is also under this ifdef so this fixes: drivers/xen/events.c:377: warning: 'find_unbound_pirq' defined but not used when CONFIG_PCI_MSI=n Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Jeremy Fitzhardinge commit 3f2a230caf21a1f7ac75f9e4892d0e5af9ccee88 Author: Ian Campbell Date: Tue Jan 11 17:20:13 2011 +0000 xen: handled remapped IRQs when enabling a pcifront PCI device. This happens to not be an issue currently because we take pains to try to ensure that the GSI-IRQ mapping is 1-1 in a PV guest and that regular event channels do not clash. However a subsequent patch is going to break this 1-1 mapping. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Jeremy Fitzhardinge commit 6eaa412f2753d98566b777836a98c6e7f672a3bb Author: Konrad Rzeszutek Wilk Date: Tue Jan 18 20:09:41 2011 -0500 xen: Mark all initial reserved pages for the balloon as INVALID_P2M_ENTRY. With this patch, we diligently set regions that will be used by the balloon driver to be INVALID_P2M_ENTRY and under the ownership of the balloon driver. We are OK using the __set_phys_to_machine as we do not expect to be allocating any P2M middle or entries pages. The set_phys_to_machine has the side-effect of potentially allocating new pages and we do not want that at this stage. We can do this because xen_build_mfn_list_list will have already allocated all such pages up to xen_max_p2m_pfn. We also move the check for auto translated physmap down the stack so it is present in __set_phys_to_machine. [v2: Rebased with mmu->p2m code split] Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit fea41cc9b1af5f65fecf4013ad62284e6ae3a78c Author: Fry, Donald H Date: Fri Feb 25 09:43:20 2011 -0800 iwlagn: Support new 1000 microcode. iwlagn: Support new 1000 microcode. New iwlwifi-1000 microcode requires driver support for API version 5. (There is no version 4) Signed-off-by: Don Fry Signed-off-by: Wey-Yi Guy commit 95a776107a131823c87147dff083696d8814c1b3 Author: Helmut Schaa Date: Wed Mar 2 10:46:46 2011 +0100 wl12xx: Correctly set up protection if non-GF STAs are present Set the gf_protection bit when calling ACX_HT_BSS_OPERATION according to the GF bit passed by mac80211 in ht_operation_mode. [Added a proper commit message -- Luca] Signed-off-by: Helmut Schaa Signed-off-by: Luciano Coelho commit 24225b37bd78d3e2edaa1a39316c54786adaa465 Author: Arik Nemtsov Date: Tue Mar 1 12:27:26 2011 +0200 wl12xx: wakeup chip from ELP during scan Commands are sometimes sent to FW on scan completion. Make sure the chip is awake to receive them. Sending commands while the chip is in ELP can cause SDIO read errors and/or crash the FW. Signed-off-by: Arik Nemtsov Signed-off-by: Ido Yariv Signed-off-by: Luciano Coelho commit b16d4b6864e5bd7e5a6e5987f896003175235bca Author: Ido Yariv Date: Tue Mar 1 15:14:44 2011 +0200 wl12xx: Modify requested number of memory blocks Tests have shown that the requested number of memory blocks is sub-optimal. Slightly modify the requested number of memory blocks for TX. Signed-off-by: Ido Yariv Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit b07d4037051318d47c055384ef887535a0ed2d1e Author: Ido Yariv Date: Tue Mar 1 15:14:43 2011 +0200 wl12xx: Avoid redundant TX work TX might be handled in the threaded IRQ handler, in which case, TX work might be scheduled just to discover it has nothing to do. Save a few context switches by cancelling redundant TX work in case TX is about to be handled in the threaded IRQ handler. Also, avoid scheduling TX work from wl1271_op_tx if not needed. Signed-off-by: Ido Yariv Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 2da69b890f47852dc368136375f49a5d24e2d9a1 Author: Ido Yariv Date: Tue Mar 1 15:14:42 2011 +0200 wl12xx: Switch to level trigger interrupts The interrupt of the wl12xx is a level interrupt in nature, since the interrupt line is not auto-reset. However, since resetting the interrupt requires bus transactions, this cannot be done from an interrupt context. Thus, requesting a level interrupt would require to disable the irq and re-enable it after the HW is acknowledged. Since we now request a threaded irq, this can also be done by specifying the IRQF_ONESHOT flag. Triggering on an edge can be problematic in some platforms, if the sampling frequency is not sufficient for detecting very frequent interrupts. In case an interrupt is missed, the driver will hang as the interrupt line will stay high until it is acknowledged by the driver, which will never happen. Fix this by requesting a level triggered interrupt, with the IRQF_ONESHOT flag. Signed-off-by: Ido Yariv Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit a620865edf62ea2d024bbfe62162244473badfcb Author: Ido Yariv Date: Tue Mar 1 15:14:41 2011 +0200 wl12xx: Switch to a threaded interrupt handler To achieve maximal throughput, it is very important to react to interrupts as soon as possible. Currently the interrupt handler wakes up a worker for handling interrupts in process context. A cleaner and more efficient design would be to request a threaded interrupt handler. This handler's priority is very high, and can do blocking operations such as SDIO/SPI transactions. Some work can be deferred, mostly calls to mac80211 APIs (ieee80211_rx_ni and ieee80211_tx_status). By deferring such work to a different worker, we can keep the irq handler thread more I/O responsive. In addition, on multi-core systems the two threads can be scheduled on different cores, which will improve overall performance. The use of WL1271_FLAG_IRQ_PENDING & WL1271_FLAG_IRQ_RUNNING was changed. For simplicity, always query the FW for more pending interrupts. Since there are relatively long bursts of interrupts, the extra FW status read overhead is negligible. In addition, this enables registering the IRQ handler with the ONESHOT option. Signed-off-by: Ido Yariv Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 393fb560d328cc06e6a5c7b7473901ad724f82e7 Author: Ido Yariv Date: Tue Mar 1 15:14:40 2011 +0200 wl12xx: Change claiming of the SDIO bus The SDIO bus is claimed and released for each SDIO transaction. In addition to the few CPU cycles it takes to claim and release the bus, it may also cause undesired side effects such as the MMC host stopping its internal clocks. Since only the wl12xx_sdio driver drives this SDIO card, it is safe to claim the SDIO host once (on power on), and release it only when turning the power off. This patch was inspired by Juuso Oikarinen's (juuso.oikarinen@nokia.com) patch "wl12xx: Change claiming of the (SDIO) bus". Signed-off-by: Ido Yariv Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 606ea9fa0b2c01ffafb6beae92ea8e2b1473520b Author: Ido Yariv Date: Tue Mar 1 15:14:39 2011 +0200 wl12xx: Do end-of-transactions transfers only if needed On newer hardware revisions, there is no need to write the host's counter at the end of a RX transaction. The same applies to writing the number of packets at the end of a TX transaction. It is generally a good idea to avoid unnecessary SDIO/SPI transfers. Throughput and CPU usage are improved when avoiding these. Send the host's RX counter and the TX packet count only if needed, based on the hardware revision. [Changed WL12XX_QUIRK_END_OF_TRANSACTION to use BIT(0) -- Luca] Signed-off-by: Ido Yariv Signed-off-by: Ohad Ben-Cohen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 8aad24642a7c06832a75f1d20e8e3112b4fbd815 Author: Ido Yariv Date: Tue Mar 1 15:14:38 2011 +0200 wl12xx: Reorder data handling in irq_work The FW has a limited amount of memory for holding frames. In case it runs out of memory reserved for RX frames, it'll have no other choice but to drop packets received from the AP. Thus, it is important to handle RX data interrupts as soon as possible, before handling anything else. In addition, since there are enough TX descriptors to go around, it is better to first send TX frames, and only then handle TX completions. Fix this by changing the order of function calls in wl1271_irq_work. Signed-off-by: Ido Yariv Signed-off-by: Ohad Ben-Cohen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 50e9f746f63c9b881f2ca4a35dbdfd34b1a8a215 Author: Ido Yariv Date: Mon Feb 28 00:16:13 2011 +0200 wl12xx: Remove private headers in wl1271_tx_reset Frames in the tx_frames array include extra private headers, which must be removed before passing the skbs to ieee80211_tx_status. Fix this by removing any private headers in wl1271_tx_reset, similar to how this is done in wl1271_tx_complete_packet. Signed-off-by: Ido Yariv Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 11251e7e5c7c5411d1f77dbc7f9bfa2c23626749 Author: Ido Yariv Date: Mon Feb 28 00:13:58 2011 +0200 wl12xx: Don't rely on runtime PM for toggling power Runtime PM might not always be enabled. Even if it is enabled in the running kernel, it can still be temporarily disabled, for instance during suspend. Runtime PM is opportunistic in nature, and should not be relied on for toggling power. In case the interface is removed and re-added while runtime PM is disabled, the FW will fail to boot, as it is mandatory to toggle power between boots. For instance, this can happen during suspend in case one of the devices fails to suspend before the MMC host suspends, but after mac80211 was suspended. The interface will be removed and reactivated without toggling the power. Fix this by calling mmc_power_save_host/mmc_power_restore_host in wl1271_sdio_power_on/off functions. It will toggle the power to the chip even if runtime PM is disabled. The runtime PM functions should still be called to make sure runtime PM does not opportunistically power the chip off (e.g. after resuming from system suspend). Signed-off-by: Ido Yariv Signed-off-by: Ohad Ben-Cohen Signed-off-by: Luciano Coelho commit f62c317c1f7f67c249ee9254e55a02fad0d0f86b Author: Sebastien Jan Date: Wed Feb 23 14:25:16 2011 +0100 wl12xx: fix the path to the wl12xx firmwares In the linux-firmware git tree, the firmwares and the NVS are inside the ti-connectivity directory. Fix the filenames that the driver looks for accordingly. [Fixed commit message and merged with the latest changes. -- Luca] Signed-off-by: Sebastien Jan Signed-off-by: Luciano Coelho commit cd372fb3befde3bceef3fdcbc550dde50c894e36 Author: Takashi Iwai Date: Thu Mar 3 14:40:14 2011 +0100 ALSA: hda - Make common input-jack helper functions Since multiple codec drivers already use the input-jack stuff, let's make common helper functions to reduce the duplicated codes. Signed-off-by: Takashi Iwai commit a52055e055f5b551c0814c4381e43b204f9db777 Author: Don Skidmore Date: Wed Feb 23 09:58:39 2011 +0000 ixgbe: cleanup copyright string for 2011 Updating the copyrights for 2011 as well as make the ixgbe_copyright string a constant. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 5e655105e3e19d746f9e95c514b014c11c3d1b6a Author: Don Skidmore Date: Fri Feb 25 01:58:04 2011 +0000 ixgbe: add function pointer for semaphore function The X540 devices grabs semaphores differently than 82599 and 82598 devices do. They do however also grab them in allot of the same functions. So I'm adding a new MAC operation function pointer to allow us to use the correct function based on our MAC type. I'm also changing all the semaphore calls to use this new function pointer. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 93cb38dc185f31159d1be70ffcc46802312fa537 Author: Greg Rose Date: Tue Mar 1 04:37:15 2011 +0000 ixgbe: X540 Cleanup Clean up commented out include file and use #define instead of hard coded value for number of RAR entries. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 75f19c3c5eeb67d37ce96e0ea78dc0beb485a723 Author: Emil Tantilov Date: Sat Feb 19 08:43:55 2011 +0000 ixgbe: cleanup handling of I2C interface to PHY The I2C interface was not being correctly locked down per port. As such this can lead to race conditions that can cause issues. This patch cleans up the handling to make certain we are not experiencing racy I2C access. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 278675d855e03e111ca84fec6eb7d5569e56c394 Author: Emil Tantilov Date: Sat Feb 19 08:43:49 2011 +0000 ixgbe: store permanent address before initializing Rx addresses We were reading the address after it had been initialized and this results in the permanent address on the system being changed. This change corrects that by storing the address before we re-initialize it. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 8c7bea32c4ebe02dbb574a49db418036da177326 Author: Emil Tantilov Date: Sat Feb 19 08:43:44 2011 +0000 ixgbe: Numerous whitespace / formatting cleanups This patch contains a number of whitespace and formatting cleanups. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 63d778df6d817ea69cadd701abbfa1c491623b50 Author: Emil Tantilov Date: Sat Feb 19 08:43:39 2011 +0000 ixgbe: Specific check for 100 Full link speed This patch specifically checks for 100 Full link speed instead of assuming we are linked at 100 if not linked at 10G and 1G. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 84fd1d35cc868a4f7590b6dbdae2d7761287b97a Author: Borislav Petkov Date: Thu Mar 3 12:59:32 2011 +0100 x86, amd-nb: Misc cleanliness fixes Make functions used strictly in bool context return bool. Also, fixup used types and comments, and make a local function static, while at it. Signed-off-by: Borislav Petkov Cc: Borislav Petkov LKML-Reference: <20110303115932.GA8603@aftab> Signed-off-by: Ingo Molnar commit d207df2df064c19a2cf4eac8f887351fe5ce526e Merge: 1aa924e c8900a0 Author: Takashi Iwai Date: Thu Mar 3 12:56:34 2011 +0100 Merge branch 'fix/hda' into topic/hda commit d04c579f971bf7d995db1ef7a7161c0143068859 Author: Jan Beulich Date: Thu Mar 3 10:55:29 2011 +0000 x86: Work around old gas bug Add extra parentheses around a couple of definitions introduced by "x86: Cleanup vector usage" and used in assembly macro arguments, and remove spaces. Without that old (2.16.1) gas would see more macro arguments than were actually specified. Reported-and-tested-by: Andrew Morton Signed-off-by: Jan Beulich Cc: Shaohua Li LKML-Reference: <4D6F81B10200007800034B0B@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 79d5892521144d455114e4820eb30fec802b9c39 Author: Emil Tantilov Date: Sat Feb 19 08:43:34 2011 +0000 ixgbe: Drop unused code for setting up unicast addresses This change removes the unused code that was setting up the uc_addr_list. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 80960ab040dd6b3a82bfb2db9b1aaf5d6ccffbb7 Author: Emil Tantilov Date: Fri Feb 18 08:58:27 2011 +0000 ixgbe: rework ixgbe MTA handling to not drop packets This change modifies the ixgbe drivers so that it will not drop the multicast filters while updating them. Instead it uses an intermediate table to store the filter and then writes that filter to the hardware. Based on original patch from Dave Boutcher Signed-off-by: Emil Tantilov Reported-by: Dave Boutcher Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit b60c5dd31b053d008110a80aa4089d64cee60e8f Author: Don Skidmore Date: Fri Feb 18 19:29:46 2011 +0000 ixgbe: cleanup X540 PHY reset function pointer The X540 PHY reset pointer isn't currently used which is a good thing as it wouldn't work as implemented. On top of that the X540 firmware is written with the assumption that is does not need to be reset for proper initialization so it's not needed. I'm just assigning the pointer at NULL as the current implementation is rather misleading. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 28e9ad921d3b7defd8940a3e30e8241c8ed734db Author: Mark Brown Date: Wed Mar 2 18:36:34 2011 +0000 ASoC: Add a late_probe() callback to cards This is run after the DAPM widgets and routes are added, allowing setup of things like jacks using the routes. The main card probe() is run before anything else so can't be used for this purpose. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit b8ad29debd7401d257da923480d32838172c431a Author: Mark Brown Date: Wed Mar 2 18:35:51 2011 +0000 ASoC: Allow card DAPM widgets and routes to be set up at registration These will be added after all devices are registered and allow most DAI init functions in machine drivers to be replaced by simple data. Regular controls are not supported as the registration function still works in terms of CODECs. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e37a4970cd7ab6aec9e848cd3c355fd47fd18afd Author: Mark Brown Date: Wed Mar 2 18:21:57 2011 +0000 ASoC: Add a per-card DAPM context This means that rather than adding the board specific DAPM widgets to a random CODEC DAPM context they can be added to the card itself which is a bit cleaner. Previously there only was one DAPM context and it was tied to the single supported CODEC. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 88e8b9a84b41be8ea37cf3bbe192e72f84747f66 Author: Mark Brown Date: Wed Mar 2 18:18:24 2011 +0000 ASoC: Check for a CODEC before dereferencing in DAPM A CODEC pointer is optional (and is checked for in most contexts within DAPM) - add checks to the few places where it was missed. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 12ea2c782e8bd98bcbf88165b2fd1610d1b9a81d Author: Mark Brown Date: Wed Mar 2 18:17:32 2011 +0000 ASoC: Get the card directly from the DAPM context Rather than indirecting through the CODEC we can look the card up directly from the card pointer in the DAPM context. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1916a2aae52b8cb8f992599204ce06c0accd08e2 Author: Mark Brown Date: Wed Mar 2 11:04:10 2011 +0000 ASoC: Add TLV information for WM8978 DAC limiter Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 4955f631a409d55af8db9583bc5aea276a67fdea Merge: 4a5f7bd c8fb034 Author: Mark Brown Date: Thu Mar 3 11:13:15 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit c8fb034ccd38ecce61564119bcd56ce6e8e97a80 Author: Mark Brown Date: Wed Mar 2 11:01:18 2011 +0000 ASoC: Fix broken bitfield definitions in WM8978 Signed-off-by: Mark Brown Acked-by: Liam Girdwood Cc: stable@kernel.org commit 8959c910884e8faf7987391d194d508e74904c16 Author: Dimitris Papastamos Date: Tue Mar 1 12:54:39 2011 +0000 ASoC: WM8994: Ensure MICBIAS is provided with a clock The patch 'ASoC: WM8994: Improve Playback Robustness' did not handle this case properly. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c700f4e6f55c42c9aeacf365bd178f97625e00df Author: Emil Tantilov Date: Thu Feb 17 11:34:58 2011 +0000 ixgbe: Bounds checking for set_rar, clear_rar, set_vmdq, clear_vmdq This change makes it so that out of bounds requests to these calls will now return IXGBE_ERR_INVALID_ARGUMENT instead of returning 0. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 26d6899ba775ed056bd73107e3f4427ff9247f75 Author: Emil Tantilov Date: Thu Feb 17 11:34:53 2011 +0000 ixgbe: Fill out PCIe speed and width enums with values This patch fills in the values for bus speed and width of the ixgbe_bus_speed and ixgbe_bus_width enums. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 1783575c1a11f726130522b851737cddda4c14c0 Author: Emil Tantilov Date: Wed Feb 16 01:38:13 2011 +0000 ixgbe: add polling test to end of PHY reset Some PHYs require that we poll the reset bit and wait for it to clear before continuing initialization. As such we should add this check to the end of the ixgbe_reset_phy_generic routine. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 48de36c5656113ce6cfe4207da2f90f46917e53d Author: Emil Tantilov Date: Wed Feb 16 01:38:08 2011 +0000 ixgbe: Check link wants report current link state Currently check link reports the link state as down, if at any time the link had previously gone down since the last time the LINKS register was read. This does not accurately reflect the function of the check link call, which should be to return the CURRENT link state. Code now reads the LINKS registers twice, once to clear the previous and again to get the current value. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 76d97dd4c44c6847029ae9021fe0d880cad90d33 Author: Emil Tantilov Date: Wed Feb 16 10:14:00 2011 +0000 ixgbe: cleanup code in ixgbe_identify_sfp_module_generic This change cleans up several issues in ixgbe_identify_sfp_module_generic including whitespace, redundant code, I2C EEPROM reads without exception handling, and an if/elseif/else without braces. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit a4297dc2f49d46d5452a948210be44442236e685 Author: Emil Tantilov Date: Mon Feb 14 08:45:13 2011 +0000 ixgbe: Add ability to double reset on failure to clear master enable Double resets are required for recovery from certain error conditions. Between resets, it is necessary to stall to allow time for any pending HW events to complete. We use 1usec since that is what is needed for ixgbe_disable_pcie_master(). The second reset then clears out any effects of those events. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 21cc5b4f7eb7b6de90588331b7d0edb246502f46 Author: Emil Tantilov Date: Sat Feb 12 10:52:07 2011 +0000 ixgbe: set media type for 82599 T3 LOM The media type was not being set for the 82599 T3 LAN on motherboard. This change corrects that. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 894ff7cf0e0cf7596f9b0d3c30e32c87f8df2784 Author: Alexander Duyck Date: Tue Feb 15 02:12:05 2011 +0000 ixgbe: balance free_irq calls with request_irq calls We were incorrectly freeing IRQs that we had not requested. This change corrects that by making certain we only free q_vectors that we have requested IRQs for. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit dbf893ee85369debaa05b3c222a40c8ac5273a06 Author: Emil Tantilov Date: Tue Feb 8 09:42:41 2011 +0000 ixgbe: cleanup logic related to HW semaphores This change cleans up much of the logic related to the hardware semaphores on the adapters. There were a number of issues with timings that needed to be addressed. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 888be1a1e148a5a600050d455f73370f51f26d59 Author: Emil Tantilov Date: Tue Feb 8 09:48:32 2011 +0000 ixgbe: cleanup wake on LAN defines This change just cleans up a few defines in ixgbe_type.h related to wake on LAN. Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit c82a538e4ff101faae030273243d3b0a0a9e335d Author: Greg Rose Date: Fri Feb 25 03:34:18 2011 +0000 ixgbevf: Fix Compiler Warnings Fix Compiler warnings of variables that are initialized but not used. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 3b668a77bad7f03c3df28971760a3883a395ce55 Author: Carolyn Wyborny Date: Wed Mar 2 01:11:26 2011 +0000 igb: Fix strncpy calls to be safe per source code review tools This fix changes the remaining calls to strncpy that have not yet been changed to use the "sizeof(buf) - 1" syntax rather than just a number for buffer size. Signed-off-by: Carolyn Wyborny Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher commit 93ed835928f3100c95e0408df0543f35d03f7c23 Author: Carolyn Wyborny Date: Thu Feb 24 03:12:15 2011 +0000 igb: Fix reg pattern test in ethtool for i350 devices This fixes the reg_pattern_test so that the test does not fail on i350 parts. Signed-off-by: Carolyn Wyborny Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 9b082d734a938b951ed4b9b5a850ae3513d4a7e3 Author: Stefan Assmann Date: Thu Feb 24 20:03:31 2011 +0000 igb: warn if max_vfs limit is exceeded Currently there's no warning printed when max_vfs > 7 is specified with igb and the maximum of 7 is silently enforced. This patch prints a warning and informs the user of the actions taken. Signed-off-by: Stefan Assmann Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 1558310d4942427f4fd19e8ae26ca0878ab10879 Author: Dimitris Michailidis Date: Mon Feb 28 17:34:15 2011 +0000 cxgb{3,4}*: improve Kconfig dependencies - Remove the dependency of cxgb4 and cxgb4vf on INET. cxgb3 really depends on INET, keep it but add it directly to the driver's Kconfig entry. - Make the iSCSI drivers cxgb3i and cxgb4i available in the SCSI menu without requiring any options in the net driver menu to be enabled first. Add needed selects so the iSCSI drivers can build their corresponding net drivers. - Remove CHELSIO_T*_DEPENDS. Signed-off-by: Dimitris Michailidis Acked-by: Jan Beulich Signed-off-by: David S. Miller commit dc6ed1df5a5f84e45e77e2acb6fd99b995414956 Author: Shmulik Ravid Date: Sun Feb 27 05:04:38 2011 +0000 dcbnl: add support for retrieving peer configuration - cee This patch adds the support for retrieving the remote or peer DCBX configuration via dcbnl for embedded DCBX stacks supporting the CEE DCBX standard. Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit eed84713bc47ce2f7d675914f297ad9b6227a587 Author: Shmulik Ravid Date: Sun Feb 27 05:04:31 2011 +0000 dcbnl: add support for retrieving peer configuration - ieee These 2 patches add the support for retrieving the remote or peer DCBX configuration via dcbnl for embedded DCBX stacks. The peer configuration is part of the DCBX MIB and is useful for debugging and diagnostics of the overall DCB configuration. The first patch add this support for IEEE 802.1Qaz standard the second patch add the same support for the older CEE standard. Diff for v2 - the peer-app-info is CEE specific. Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 23b41168fc942a4a041325a04ecc1bd17d031a3e Author: Vlad Dogaru Date: Sat Feb 26 22:39:12 2011 +0000 netdevice: make initial group visible to userspace INIT_NETDEV_GROUP is needed by userspace, move it outside __KERNEL__ guards. Signed-off-by: Vlad Dogaru Signed-off-by: David S. Miller commit 8590a03125d8dde3993bbc7e7d13c9193f8dfd74 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:45:17 2011 -0800 Staging: hv: hv_mouse: remove unneeded function forward declaration When the code moved around earlier, this function declaration should have been removed but it wasn't. Resolve that. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit df7ed924e5f5b15828c803d666fbc260c504687a Author: Greg Kroah-Hartman Date: Wed Mar 2 19:44:13 2011 -0800 Staging: hv: hv_mouse: fix up guid variable name It wasn't a global either, yet it was called one for some reason... Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 92d40b769f2a98e949b6653d757c758e0a945baf Author: Greg Kroah-Hartman Date: Wed Mar 2 19:42:19 2011 -0800 Staging: hv: hv_mouse: get rid of hungarian notation for name of the module And, it's not even a global, so the original creator got the Hungarian notation wrong! {sigh} Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 5ff9b906c45bcb17dbf7922205dd95f9ca189a88 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:41:00 2011 -0800 Staging: hv: hv_mouse: fix up camelcase fields in struct mousevsc_prt_msg Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit e7de0adf89c2f8a36f839b9dfc98b91239f5a3d5 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:39:48 2011 -0800 Staging: hv: hv_mouse: fix up camelcase usage in struct pipe_prt_msg Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 9877fa4445b907b8aa271783e3e5ee99a143b65c Author: Greg Kroah-Hartman Date: Wed Mar 2 19:38:29 2011 -0800 Staging: hv: hv_mouse: fix up pipe size field name Make it not camelcase. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 2012d40dbda6f87537535bad38ccd84f8805de9e Author: Greg Kroah-Hartman Date: Wed Mar 2 19:36:15 2011 -0800 Staging: hv: hv_mouse: fix up camelcase use for enum pipe_prot_msg_type in structures It's a type, so call it that. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit d7fa1a4629cd94e249b1556f58030174601ddbc4 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:33:17 2011 -0800 Staging: hv: hv_mouse: use an anonymous union for struct mousevsc_prt_msg Much nicer than having an ugly 'u.' in the structure usage, welcome to the 2000's... Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit e93eff9cf4fd9d051d775972ef93c25e2df5dc1c Author: Greg Kroah-Hartman Date: Wed Mar 2 19:31:39 2011 -0800 Staging: hv: hv_mouse: clean up camelcase in struct synthhid_input_report Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 6ed10de1242f4044dabc1c115e84bbead2863524 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:29:42 2011 -0800 Staging: hv: hv_mouse: fix camelcase in struct synthhid_device_info_ack Just one field to fix up, s/Reserved/reserved/g Odd that we have to set the reserved field to 0 when we send the message, that would imply that it really isn't "reserved"... Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit c09d7a3d2e365e11c09b9c6414c17fe55bd32a8e Merge: 0a10247 4defe68 Author: Frederic Weisbecker Date: Wed Mar 2 16:09:55 2011 +0100 Merge branch '/tip/perf/filter' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git into perf/core commit 18bc44e333f9f278328eab851f27d1169d623efb Author: Greg Kroah-Hartman Date: Wed Mar 2 19:27:17 2011 -0800 Staging: hv: hv_mouse: use a real struct hid_descriptor The data coming from the vmbus is really a hid descriptor, so use that structure instead of having to mess around with a character array and pointer fun. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 98ad91ed32f6d9327b630f11315a40097e7897b2 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:24:05 2011 -0800 Staging: hv: hv_mouse: clean up camelcase when using struct hv_input_dev_info I think there's a callback we can remove that uses this variable in the future as well, but that's for another patch... Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 325eae14448a7ce5e2410f61901fd740e6e93f7d Author: Greg Kroah-Hartman Date: Wed Mar 2 19:19:58 2011 -0800 Staging: hv: hv_mouse: clean up camelcase in struct synthhid_protocol_response Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 480c28df902b5dd5947950aef39d167b5668d3fe Author: Greg Kroah-Hartman Date: Wed Mar 2 19:18:34 2011 -0800 Staging: hv: hv_mouse: clean up version structure usage Turns out no one uses the major or minor fields, but hey, we'll keep them around just to make people feel happy... Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit cb2535ad49972ab2ef3c872958bcd20b9532a308 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:11:49 2011 -0800 Staging: hv: hv_mouse: change camelcase for struct synthhid_msg Turns out no one references the data field of this structure, so I wonder if it's really even needed at all. All this is used for is the type of the message here, so this structure might be able to be dropped entirely in the future. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit e1e84017f95504348308085ae7cd0bfe268caf10 Author: Alex Deucher Date: Wed Mar 2 10:21:05 2011 -0500 drm/radeon/kms: allow max clock of 340 Mhz on hdmi 1.3+ hdmi 1.3 raises the max clock from 165 Mhz to 340 Mhz. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c4e68fa9537cb8190ba542a93558730783e49cdf Author: Greg Kroah-Hartman Date: Wed Mar 2 19:08:05 2011 -0800 Staging: hv: hv_mouse: fix build warning The trans_id variable (u64) was being incorrectly cast to a unsigned long * when it should have just been unsigned long. Fun with pointers, what a fricken mess, we need some real type safety for these types of fields somehow... Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 0ce815d54e55611e1567e17c08f57d1b2e0ab0d9 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:04:09 2011 -0800 Staging: hv: hv_mouse: fix camelcase use of struct synthhid_msg_hdr s/Header/header/g for this structure when it is used in the file. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 32ad38f7d529c31566533bb9433b8d1bf1a04ec1 Author: Greg Kroah-Hartman Date: Wed Mar 2 19:01:49 2011 -0800 Staging: hv: hv_mouse.c: clean up struct synthhid_msg_hdr Use non-CamelCase names for this structure. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit c9246c9022095d278082cae4e82312e69453769e Author: Greg Kroah-Hartman Date: Wed Mar 2 18:58:35 2011 -0800 Staging: hv: hv_mouse: use proper input define for bus type The code was so close, the bus type was in a comment, so go all the way and actually use the define here. It's as if the original author was so afraid of license issues if they referenced a define in the processed code but they felt safe to keep it in a comment. Chicken. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 0f88ea5ba24f56bc0915d60bf9c859fb8952e62c Author: Greg Kroah-Hartman Date: Wed Mar 2 18:57:04 2011 -0800 Staging: hv: hv_mouse: fix up input device info structure Make the name "hv_" specific as it's not an input layer structure we are dealing with here. Also rename the fields to be not CamelCase. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit ac2c9033d65c7b139c99c9ecd2f374f04ea5820a Author: Greg Kroah-Hartman Date: Wed Mar 2 18:50:15 2011 -0800 Staging: hv: hv_mouse: reorder functions to remove forward declarations This removes almost all forward declarations and makes all functions static, as there should not be any global functions in this module at all. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 037b653aae18147af152cc31d3c4c0cd072ffea9 Author: Greg Kroah-Hartman Date: Wed Mar 2 18:40:16 2011 -0800 Staging: hv: hv_mouse: remove inline function markings They are totally useless here, so remove them. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 4f143134c12293217e6c8d68d0018780199f6d3c Author: Greg Kroah-Hartman Date: Wed Mar 2 18:38:31 2011 -0800 Staging: hv: hv_mouse.c: remove struct mousevsc_drv_obj function callbacks They aren't needed at all either because they are never called (OnOpen, OnClose), or because we can just call the real function instead as it's never set to anything else. Just another step in unwinding the callback mess... Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 7ced4810f9a86bb0324568052c6bf27292512b43 Author: Greg Kroah-Hartman Date: Wed Mar 2 18:28:52 2011 -0800 Staging: hv: hv_mouse: unwind the initialization process a bit This unwinds the init call sequence a bit, as we don't need a callback pointer for a function that is already in this file. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit e6f83b78ec7d8a6201caf0e190d1317aaf24b299 Author: Greg Kroah-Hartman Date: Wed Mar 2 18:21:01 2011 -0800 Staging: hv: hv_mouse: remove typedefs Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit ba77a26cb570f8b506bcb7991b1e154b8bd38914 Merge: 486af18 64bc552 Author: Dave Airlie Date: Thu Mar 3 12:00:52 2011 +1000 Merge remote branch 'korg/drm-radeon-cayman' into drm-core-next * korg/drm-radeon-cayman: drm/radeon/kms: add cayman pci ids drm/radeon/kms: cayman/evergreen cs checker updates drm/radeon/kms/cayman: always set certain VGT regs at CP init drm/radeon/kms: additional default context regs for cayman drm/radeon/kms: add cayman CS check support drm/radeon/kms: add radeon_asic entry for cayman drm/radeon/kms: add cayman safe regs drm/radeon/kms/cayman: add asic init/startup/fini/suspend/resume functions drm/radeon/kms: add cayman asic reset support drm/radeon/kms: add support for cayman irqs drm/radeon/kms: add support for CP setup on cayman asics drm/radeon/kms: add support for cayman gart setup drm/radeon/kms: add gpu_init function for cayman drm/radeon/kms: add ucode loader for cayman drm/radeon/kms: add cayman chip family commit af10f941ab7807d8b0bb3c66e679d8a6bbbe7485 Author: Jan Beulich Date: Thu Feb 17 16:36:24 2011 +0000 ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree Once acpi_map_lsapic() in ia64 follows how x86 treats it wrt section placement, the whole tree from acpi_processor_set_pdc() can become __cpuinit. Signed-off-by: Jan Beulich Acked-by: Tony Luck Signed-off-by: Len Brown commit 94fcc88868e4068d3fe9aa0d719a380bfa44a0a0 Author: Greg Kroah-Hartman Date: Wed Mar 2 17:57:51 2011 -0800 Staging: hv: delete mousevsc_api.h This file is only used by one .c file (hv_mouse.c) so just move the whole thing into that file. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 64bc5524906e31c1144af29ba50c585afe333bb3 Author: Alex Deucher Date: Wed Mar 2 20:07:41 2011 -0500 drm/radeon/kms: add cayman pci ids Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 8aa75009bca5e700e9236c8e066d2f943069c883 Author: Alex Deucher Date: Wed Mar 2 20:07:40 2011 -0500 drm/radeon/kms: cayman/evergreen cs checker updates Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9b91d18d20fbd3e907cee71d1acaba7943de887a Author: Alex Deucher Date: Wed Mar 2 20:07:39 2011 -0500 drm/radeon/kms/cayman: always set certain VGT regs at CP init These should be handled by the clear_state setup, but set them directly as well just to be sure. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3d106fb44e195652ed1c9aac17e833b5302e8bfe Author: Alex Deucher Date: Wed Mar 2 20:07:38 2011 -0500 drm/radeon/kms: additional default context regs for cayman Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c175ca9a4c8cb30a61ccefacf8243350e1db4162 Author: Alex Deucher Date: Wed Mar 2 20:07:37 2011 -0500 drm/radeon/kms: add cayman CS check support Added to existing evergreen CS checker. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6430c9c12a7dbb8f60f0d8294b73b3c0bb03f64f Author: Jan Beulich Date: Thu Feb 17 16:33:53 2011 +0000 ACPI: use __init where possible in processor driver Use __init for several functions, remove an unnecessary export and a stray use of __ref. Signed-off-by: Jan Beulich Signed-off-by: Len Brown commit e348762955ebb2d4a6906d920b8f538637f1093f Author: Alex Deucher Date: Wed Mar 2 20:07:36 2011 -0500 drm/radeon/kms: add radeon_asic entry for cayman Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit fa003500ec7a057e555a1c80d68865d00fa8142c Author: Greg Kroah-Hartman Date: Wed Mar 2 17:53:58 2011 -0800 Staging: hv: delete vmbus_hid_protocol.h The .h file is not needed as only one .c file uses it, so just move it into that file. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit c9895ed5a84dc3cbc86a9d6d5656d8c187f53380 Author: Alex Deucher Date: Wed Mar 2 20:07:35 2011 -0500 drm/radeon/kms: add cayman safe regs For the CS checker. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 755d819e0cf2e09e0958c77b72aa3ce2142411c2 Author: Alex Deucher Date: Wed Mar 2 20:07:34 2011 -0500 drm/radeon/kms/cayman: add asic init/startup/fini/suspend/resume functions Cayman is different enough from evergreen to warrant it's own functions. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b9952a8ae5814b0ef2a6596c7443efd85b92e069 Author: Alex Deucher Date: Wed Mar 2 20:07:33 2011 -0500 drm/radeon/kms: add cayman asic reset support Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 127278099f25a14b00c502f64b120472b512528d Author: Alex Deucher Date: Wed Mar 2 20:07:32 2011 -0500 drm/radeon/kms: add support for cayman irqs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 0c88a02ef6b7e29a811f0d56367cc2268c4ef433 Author: Alex Deucher Date: Wed Mar 2 20:07:31 2011 -0500 drm/radeon/kms: add support for CP setup on cayman asics Cayman asics have 3 ring buffers: ring 0 supports both gfx and compute rings 1 and 2 are compute only At the moment we only support ring 0. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit fa8198eac871edef38e969e2c6a68649e0cd36e0 Author: Alex Deucher Date: Wed Mar 2 20:07:30 2011 -0500 drm/radeon/kms: add support for cayman gart setup This patch sets up the gart in legacy mode. We probably want to switch to full VM mode at some point. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit fecf1d072f96114266ed3aae8c4fb93f9c179b00 Author: Alex Deucher Date: Wed Mar 2 20:07:29 2011 -0500 drm/radeon/kms: add gpu_init function for cayman This may some work to get accel going. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9b9f93da1fdb133a2de88c22670d6c39b3634eb5 Author: Greg Kroah-Hartman Date: Wed Mar 2 17:49:30 2011 -0800 Staging: hv: hv_mouse: fix up copyright and license header Use the proper license header from the other hv drivers and remove the nonsense about derivative works, as it's rubbish. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 9b8253ce204ad9fcd2aec315066492dfbc73e409 Author: Alex Deucher Date: Wed Mar 2 20:07:28 2011 -0500 drm/radeon/kms: add ucode loader for cayman The MC ucode is no longer loaded by the vbios tables as on previous asics. It now must be loaded by the driver. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b7cfc9fe921ddd1a926803711df63e1ea52a7563 Author: Alex Deucher Date: Wed Mar 2 20:07:27 2011 -0500 drm/radeon/kms: add cayman chip family Cayman is DCE5 display plus a new 4-way shader block. 3D state programming is similar to evergreen. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 8fd16ff35c97f3bd0ec8ff25f0f86a95e638d9ad Author: Greg Kroah-Hartman Date: Wed Mar 2 17:46:00 2011 -0800 Staging: hv: hv_mouse: rename hv_mouse_drv.c As there's only one file for this driver, just name it the same as the end module name, saving one build/link step and making it simpler in the end. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 9dccaa63c706fb3a74ec90450b9dcaef0941828b Author: Greg Kroah-Hartman Date: Wed Mar 2 17:42:50 2011 -0800 Staging: hv: hv_mouse: delete mouse_vsc.c Move the mouse_vsc.c file into hv_mouse_drv.c as it makes no sense to have two files here, as we don't have to worry about the "closed vs. open" split that this code was originally written for. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit e1f1a0e682bf739f7d2189495265fb3b01f8e85a Author: Greg Kroah-Hartman Date: Wed Mar 2 17:33:26 2011 -0800 Staging: hv: mouse_vsc: fix comment coding style Also mark this as a nice FIXME as we shouldn't ever care about the value of an atomic variable, which makes me seriously doubt the validity of this reference counting code. Odds are it can be ripped out completly, or at the very least, converted to using a kref. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 6a5bfc17c31db88fc0afc70eabee1d68e60226fb Author: Greg Kroah-Hartman Date: Wed Mar 2 20:31:05 2011 -0500 Staging: hv: mouse_vsc: fix space coding style issues Lots of minor space cleanups to resolve coding style warnings and errors. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 16ecf02095bbd7f69539844dc15038359e4a29d3 Author: Greg Kroah-Hartman Date: Wed Mar 2 20:23:33 2011 -0500 Staging: hv: mouse_vsc.c: fix brace coding style issues Minor brace coding style issue cleanups. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit e8290f9f73f9a53fbeffd8de8e30cafb41475ae2 Author: Greg Kroah-Hartman Date: Wed Mar 2 20:19:05 2011 -0500 Staging: hv: hv_mouse_drv.c: minor coding style cleanups Knock off some of the simple coding style issues in this file Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 76e63665c338069085c4e0ca1b2093dc26258d7a Author: Greg Kroah-Hartman Date: Wed Mar 2 20:15:14 2011 -0500 Staging: hv: enable mouse driver to build But we disable it from automatically loading as that would be bad. This way people can build it easier and start cleaning it up, as it needs it. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit b2833a0578453449dce1b8b8e54f67a544c5e37f Merge: 12d7d4e d594f1f b176654 0a0d128 0005ae7 Author: Tony Lindgren Date: Wed Mar 2 17:11:18 2011 -0800 Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus Conflicts: arch/arm/mach-omap2/omap_hwmod_44xx_data.c commit 5cd435b4ab881280fb0b8ce6686cfceb005d98c8 Author: Banajit Goswami Date: Mon Feb 28 23:02:32 2011 +0530 ARM: SAMSUNG: Add PWM backlight support on Samsung S5PV210 This patch adds support for LCD backlight control using PWM timer for Samsung's SMDKV210 board. Signed-off-by: Banajit Goswami Signed-off-by: Kukjin Kim commit baa0c0609307e46531e9d5d6f5b9a510ceb8e30c Author: Banajit Goswami Date: Mon Feb 28 20:37:21 2011 +0530 ARM: SAMSUNG: Add PWM backlight support on Samsung S5PC100 This patch adds support for LCD backlight using PWM timer for Samsung SMDKC100 board. Signed-off-by: Banajit Goswami Signed-off-by: Kukjin Kim commit b0fd644f444c680838140aff4e766389ee6ad9a3 Author: Banajit Goswami Date: Mon Feb 28 23:31:17 2011 +0530 ARM: SAMSUNG: Add PWM backlight support on Samsung S5P6450 This patch adds support for LCD backlight control using PWM timer for Samsung SMDK6450 board. Signed-off-by: Banajit Goswami Signed-off-by: Kukjin Kim commit fec524aa05775b1582644f54842c6a30a9b7bbe5 Author: Banajit Goswami Date: Mon Feb 28 20:31:27 2011 +0530 ARM: SAMSUNG: Add PWM backlight support on Samsung S5P6440 This patch adds support for LCD backlight control using PWM timer for Samsung SMDK6440 board. Signed-off-by: Banajit Goswami Signed-off-by: Kukjin Kim commit 075d108989f71e6c7c287c258ebc3faf53066458 Author: Banajit Goswami Date: Mon Feb 28 17:42:35 2011 +0530 ARM: SAMSUNG: Add PWM backlight support on Samsung S3C6410 This patch adds support for LCD backlight using PWM timer for Samsung SMDK6410 board. Signed-off-by: Banajit Goswami Signed-off-by: Kukjin Kim commit 2ce30137094969123a8846ca4f68c2628ea4a658 Author: Banajit Goswami Date: Mon Feb 28 22:24:51 2011 +0530 ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung This patch does the following:- 1. It moves file pwm.c from plat-s3c24xx to plat-samsung. This will enable all machines with Samsung SoCs to make use of the same code. 2. The device definitions have been separated to a new file dev-pwm.c for better clarity and structure. 3. It will enable all Samsung S3C and S5P series SoC's to use common PWM Kconfig definition. Signed-off-by: Banajit Goswami Signed-off-by: Kukjin Kim commit 12d7d4e0ed8fecf7f74c89483b55b300be6e5901 Merge: aca6ad0 790ab7e Author: Tony Lindgren Date: Wed Mar 2 17:07:14 2011 -0800 Merge branch 'devel-cleanup' into omap-for-linus Conflicts: arch/arm/mach-omap2/timer-gp.c commit 0a0d128d023a49eb8afa0e988e6773416318a0b5 Author: Ilkka Koskinen Date: Wed Mar 2 13:24:06 2011 +0000 mfd: twl4030_codec: Remove unused and duplicate audio_mclk fields audio_mclk can be queried from mfd driver. Therefore, it is not needed in twl4030_codec_audio_data or in twl4030_codec_vibra_data anymore. Signed-off-by: Ilkka Koskinen Acked-by: Peter Ujfalusi Acked-by: Mark Brown Acked-by: Samuel Ortiz Signed-off-by: Tony Lindgren commit 6a58baf8f222f60cded29770ff9a0f6f6c100b64 Author: Ilkka Koskinen Date: Wed Mar 2 13:24:05 2011 +0000 omap: Remove unnecessary twl4030_codec_audio settings from board files twl4030_codec_audio and twl4030_codec_vibra_data has unused field. In order to remove it, corresponding settings needs to be removed from board files. Signed-off-by: Ilkka Koskinen Acked-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Tony Lindgren commit e4738e29bef8ed9bdd8a0606d0561557b4547649 Author: Huzaifa Sidhpurwala Date: Wed Mar 2 11:59:26 2011 +0530 USB: Remove unused timeout from io_edgeport.c timeout variable is not used anywhere in int write_cmd_usb, remove it Signed-off-by: Huzaifa Sidhpurwala Signed-off-by: Greg Kroah-Hartman commit 2cd5bb29a42f305c5749571c8cd693fbe69cc28d Author: Huzaifa Sidhpurwala Date: Wed Mar 2 11:53:00 2011 +0530 USB: Remove unused is_iso from fsl_udc_core.c is_iso variable is not used anywhere, remove it Signed-off-by: Huzaifa Sidhpurwala Signed-off-by: Greg Kroah-Hartman commit 5af9a6eb376bf7a9da738a56c01206e6d7e4a1b1 Author: Huzaifa Sidhpurwala Date: Wed Mar 2 11:17:49 2011 +0530 USB: Remove delay_t unused variable from sierra_ms.c driver initialisation code trivial patch to remove unused delay_t varible Signed-off-by: Huzaifa Sidhpurwala Signed-off-by: Greg Kroah-Hartman commit 45d1b7ae205e39e95ec65747f8871661aaa105e4 Author: Stephen Hemminger Date: Tue Mar 1 22:40:57 2011 -0800 usb-gadget: fix warning in ethernet Driver was taking max() of a size_t and u32 which causes complaint about comparison of different types. Stumbled on this accidently in my config, never used. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 962f3ffa927f2e777a4193843c45ffa6e52ff4b6 Author: Akinobu Mita Date: Wed Mar 2 20:35:28 2011 +0900 wusb: fix find_first_zero_bit() return value check In wusb_cluster_id_get(), if no zero bits exist in wusb_cluster_id_table, find_first_zero_bit() returns CLUSTER_IDS. But it is impossible to detect that the bitmap is full because there is an off-by-one error in the return value check. It will cause unexpected memory access by setting bit out of wusb_cluster_id_table bitmap, and caller will get wrong cluster id. Signed-off-by: Akinobu Mita Cc: linux-usb@vger.kernel.org Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit b7a834cc7d08276bf080077b3499d88f73e303ba Author: Ilkka Koskinen Date: Fri Feb 25 08:46:23 2011 +0000 omap: rx51: Add support for vibra Add support for vibra Signed-off-by: Ilkka Koskinen Signed-off-by: Tony Lindgren commit ec179ea5361cdd34bf4e6d6bdfe02d6f4d6901b2 Author: Guy Eilam Date: Fri Feb 25 06:52:35 2011 +0000 omap: panda: Add TI-ST driver support Added the KIM (Kernel initialization module for the Shared Transport driver) device entry in the board file Only the Blutooth enable GPIO is set for now Signed-off-by: Guy Eilam Signed-off-by: Tony Lindgren commit 9cceab99d7038b69093fd0142f644224c040a6bb Author: Arend van Spriel Date: Wed Mar 2 21:18:49 2011 +0100 staging: brcm80211: remove osl source files from driver The whole need for the OSL concept has been removed from the driver. This is the final commit removing the source file and include file from the driver repository. All include statements of osl.h have been removed from the other source files. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 3c9d4c3749a712fa370289b54f40b157c336c8f3 Author: Arend van Spriel Date: Wed Mar 2 21:18:48 2011 +0100 staging: brcm80211: remove struct osl_info from driver sources The struct osl_info was being used only in attach functions but previous changes make the entire usage of this structure obsolete. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 537ebbbef024c662aa0a350cfc6d5ff45211244c Author: Arend van Spriel Date: Wed Mar 2 21:18:47 2011 +0100 staging: brcm80211: remove struct osl_info from function prototypes A couple of functions with struct osl_info do not use this parameter so it is removed from the function prototypes. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit a30825a3c121a4bb4dd84a9522c875fb27172d9d Author: Arend van Spriel Date: Wed Mar 2 21:18:46 2011 +0100 staging: brcm80211: remove counting of allocated sk_buff packets The function pkt_buf_get_skb and pkt_buf_free_skb were using struct osl_info field pktalloced to maintain counter of buffers in use in the driver. It was decided to remove this facility. The prototypes of these functions have been modified and the calling code adapted. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 3c4d93d42df252cb35f8f2cdec1671b14c685ca4 Author: Arend van Spriel Date: Wed Mar 2 21:18:45 2011 +0100 staging: brcm80211: remove of type definition osldma_t The usage of variable of this type is not required so its use has been removed from the driver. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 278d927d660b1652cf9a1425b0ce20a385ea9cff Author: Arend van Spriel Date: Wed Mar 2 21:18:44 2011 +0100 staging: brcm80211: cleanup declaration in osl.h Several declarations and macro definitions in osl.h are still needed and therefore moved to bcmutils.h or hnddma.h. The osl_assert function is moved to bcmutils.c accordingly. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 4fe9042fe05a828293f693405f14b3f6a7898866 Author: Arend van Spriel Date: Wed Mar 2 21:18:43 2011 +0100 staging: brcm80211: remove unused attributes from struct osl_info Getting rid of the whole osl concept soon this removes most fields in struct osl_info. Turned out hnddma.c was still using it so this was fixed and now it gets pointer to bus device from si_info which it only needs in the attach function for this purpose so reference to it does not need to be kept. Two unused functions referencing the removed fields in linux_osl.c also were removed. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 8da4a3a03430b9be293f6a427197261de330956a Author: Arend van Spriel Date: Wed Mar 2 21:18:42 2011 +0100 staging: brcm80211: removed struct osl_info usage from fullmac driver Several occurrences in fullmac using struct osl_info could be removed. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 377c8981b48ba42987ed783753c5226f3346f521 Author: Arend van Spriel Date: Wed Mar 2 21:18:41 2011 +0100 staging: brcm80211: remove function prototypes from wl_export.h The include file wl_export.h contained several function prototypes (and one macro defintion) that were not used or implemented within the driver. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 9d7326f97ee5abf0e20548a2d3ed94d5a4fddd0c Author: Arend van Spriel Date: Wed Mar 2 21:18:40 2011 +0100 staging: brcm80211: move frameid initialization in wlc_d11hdrs_mac80211 Minor esthetical change to do initialization immediately at declaration. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 228a00f8dcd34fdead86c8b4d31552e69ab9b9e4 Author: Arend van Spriel Date: Wed Mar 2 21:18:39 2011 +0100 staging: brcm80211: remove osl_info usage in wlc_main and wl_mac80211 Getting rid of osl concept taking small steps. This commit removes it from wlc_main.c and wl_mac80211.c. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 5508d82488694e3d427345d624687a3fa9fb9a88 Author: Arend van Spriel Date: Wed Mar 2 21:18:38 2011 +0100 staging: brcm80211: remove struct osl_info usage from phy sources Getting rid of osl concept taking small steps. This commit removes it from source files in brcm80211/brcmsmac/phy directory. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 810acd19a4cd1e29d910f8a7eea8bcc168de00cd Author: Arend van Spriel Date: Wed Mar 2 21:18:37 2011 +0100 staging: brcm80211: remove struct osl_info usage from wlc_bmac Getting rid of osl concept taking small steps. This commit removes it from wlc_bmac.c. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 4fdfbe8506fa236f3c4cc915b24e70f84a6f768a Author: Durgadoss R Date: Thu Jan 20 02:40:56 2011 +0530 Thermal_Framework-Fix_crash_during_hwmon_unregister This patch fixes the following bug: The thermal framework creates a temp*_crit interface, only when the get_crit_temp pointer is defined. But during the _unregister_ path, without checking for the function definition, it is trying to remove the temp*_crit interface. Signed-off-by: Durgadoss R Signed-off-by: Len Brown commit f463effebefb26f1dffb92d10725e938f4497bef Author: Tony Lindgren Date: Thu Feb 24 12:56:42 2011 +0000 ldp: Fix regulator mapping for ads7846 TS controller On the OMAP3430LDP board, the ads7846 touchscreen controller is powered by VAUX1 regulator (supplying 3.0v). Fix this mapping in the board file, and hence prevent the ads7846 driver init to fail with the below error.. ads7846 spi1.0: unable to get regulator: -19 Signed-off-by: Rajendra Nayak Signed-off-by: Tony Lindgren commit 589c7a39ae2f2b74fd13ae344ca1dcca61da6bca Author: Bob Moore Date: Mon Feb 14 16:15:21 2011 +0800 ACPICA: Update version to 20110211. Version 20110211. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit ef09c4f578147464524041cbe3205bb25f900598 Author: Bob Moore Date: Mon Feb 14 16:13:25 2011 +0800 ACPICA: Add mechanism to defer _REG methods for some installed handlers The memory/io/pci/dataTable regions must always be available. For any user installed handlers for these spaces, defer execution of _REG methods until acpi_enable_subsystem. This prevents any chicken/egg problems and ensures that no methods are executed until all of these regions are ready and available. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 47863b9cbec29f137b3a7718ec851be879b41137 Author: Bob Moore Date: Mon Feb 14 16:11:43 2011 +0800 ACPICA: Add support for FunctionalFixedHW in acpi_ut_get_region_name Was missing this region type. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 9ad19ac456a5f097f7cbbfef820b95297d6a934f Author: Bob Moore Date: Mon Feb 14 16:09:40 2011 +0800 ACPICA: Split large dsopcode and dsload.c files. Split dsopcode.c into dsargs.c and dscontrol.c. Split dsload.c into dsload2.c. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit d59a3c6b35995615fa9e4f21d63fdf21328c5b6b Author: Bob Moore Date: Mon Feb 14 16:02:36 2011 +0800 ACPICA: Fix unresolved name issue for no-debug and no-error-msg cases The _acpi_module_name was left undefined in these cases, but it is actually needed as a parameter to some interfaces. Define _acpi_module_name as a null string in these cases. Acpica BZ 888. http://www.acpica.org/bugzilla/show_bug.cgi?id=888 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit a257e07527890a7f95982b9c330efd8d2de3707a Author: Bob Moore Date: Mon Feb 14 16:00:21 2011 +0800 ACPICA: Split large utglobal into utdecode.c. utglobal.c contained a lot of code not related to global variables. These utility decode functions are moved to utdecode.c Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 1b74dfb2f735454031584dc8162f8f27aa5265bf Author: Bob Moore Date: Mon Feb 14 15:52:56 2011 +0800 ACPICA: Clarify a couple of error messages Clarify region error messages with ID= prefix for space id. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 64b3db22c04586997ab4be46dd5a5b99f8a2d390 Author: Bob Moore Date: Mon Feb 14 15:50:42 2011 +0800 ACPICA: Remove use of unreliable FADT revision field The revision number in the FADT has been found to be completely unreliable and cannot be trusted. Only the table length can be used to infer the actual version. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 6dfad339645247c9deb553e4d68e21211ddc61bd Author: Lin Ming Date: Mon Feb 14 15:29:34 2011 +0800 ACPICA: GPE detect optimization - ignore unused GPE registers This optimization will simply ignore GPE registers that contain no enabled GPEs - there is no need to read the register. ACPICA bugzilla 884. http://www.acpica.org/bugzilla/show_bug.cgi?id=884 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 790ab7e92bec24aee3939b300d36b99ab2e3f3ca Author: Ming Lei Date: Thu Mar 3 06:41:46 2011 +0800 arm: omap: fix section mismatch warning WARNING: arch/arm/plat-omap/built-in.o(.data+0x6d4): Section mismatch in reference from the variable omap_driver to the function .init.text:omap_cpu_init() The variable omap_driver references the function __init omap_cpu_init() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Ming Lei Signed-off-by: Tony Lindgren commit da527770007fce8e4541947d47918248286da875 Author: Vivek Goyal Date: Wed Mar 2 19:05:33 2011 -0500 block: Move blk_throtl_exit() call to blk_cleanup_queue() Move blk_throtl_exit() in blk_cleanup_queue() as blk_throtl_exit() is written in such a way that it needs queue lock. In blk_release_queue() there is no gurantee that ->queue_lock is still around. Initially blk_throtl_exit() was in blk_cleanup_queue() but Ingo reported one problem. https://lkml.org/lkml/2010/10/23/86 And a quick fix moved blk_throtl_exit() to blk_release_queue(). commit 7ad58c028652753814054f4e3ac58f925e7343f4 Author: Jens Axboe Date: Sat Oct 23 20:40:26 2010 +0200 block: fix use-after-free bug in blk throttle code This patch reverts above change and does not try to shutdown the throtl work in blk_sync_queue(). By avoiding call to throtl_shutdown_timer_wq() from blk_sync_queue(), we should also avoid the problem reported by Ingo. blk_sync_queue() seems to be used only by md driver and it seems to be using it to make sure q->unplug_fn is not called as md registers its own unplug functions and it is about to free up the data structures used by unplug_fn(). Block throttle does not call back into unplug_fn() or into md. So there is no need to cancel blk throttle work. In fact I think cancelling block throttle work is bad because it might happen that some bios are throttled and scheduled to be dispatched later with the help of pending work and if work is cancelled, these bios might never be dispatched. Block layer also uses blk_sync_queue() during blk_cleanup_queue() and blk_release_queue() time. That should be safe as we are also calling blk_throtl_exit() which should make sure all the throttling related data structures are cleaned up. Signed-off-by: Vivek Goyal Signed-off-by: Jens Axboe commit cd25f54961273c2e4cbd47441e04832468382a5e Author: Vivek Goyal Date: Wed Mar 2 19:04:50 2011 -0500 loop: No need to initialize ->queue_lock explicitly before calling blk_cleanup_queue() Now we initialize ->queue_lock at queue allocation time so driver does not have to worry about initializing it before calling blk_cleanup_queue(). Signed-off-by: Jens Axboe commit c94a96ac93b4f5b8d1ff8430b1afa1a25610cf53 Author: Vivek Goyal Date: Wed Mar 2 19:04:42 2011 -0500 block: Initialize ->queue_lock to internal lock at queue allocation time There does not seem to be a clear convention whether q->queue_lock is initialized or not when blk_cleanup_queue() is called. In the past it was not necessary but now blk_throtl_exit() takes up queue lock by default and needs queue lock to be available. In fact elevator_exit() code also has similar requirement just that it is less stringent in the sense that elevator_exit() is called only if elevator is initialized. Two problems have been noticed because of ambiguity about spin lock status. - If a driver calls blk_alloc_queue() and then soon calls blk_cleanup_queue() almost immediately, (because some other driver structure allocation failed or some other error happened) then blk_throtl_exit() will run into issues as queue lock is not initialized. Loop driver ran into this issue recently and I noticed error paths in md driver too. Similar error paths should exist in other drivers too. - If some driver provided external spin lock and zapped the lock before blk_cleanup_queue(), then it can lead to issues. So this patch initializes the default queue lock at queue allocation time. block throttling code is one of the users of queue lock and it is initialized at the queue allocation time, so it makes sense to initialize ->queue_lock also to internal lock. A driver can overide that lock later. This will take care of the issue where a driver does not have to worry about initializing the queue lock to default before calling blk_cleanup_queue() Signed-off-by: Vivek Goyal Signed-off-by: Jens Axboe commit eae61f3c829439f8f9121b5cd48a14be04df451f Author: Tetsuo Handa Date: Wed Mar 2 16:54:24 2011 +0900 TOMOYO: Fix memory leak upon file open. In tomoyo_check_open_permission() since 2.6.36, TOMOYO was by error recalculating already calculated pathname when checking allow_rewrite permission. As a result, memory will leak whenever a file is opened for writing without O_APPEND flag. Also, performance will degrade because TOMOYO is calculating pathname regardless of profile configuration. This patch fixes the leak and performance degrade. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 5bfa787fb2c29cce0722500f90df29e049ff07fc Author: David S. Miller Date: Wed Mar 2 14:56:30 2011 -0800 ipv4: ip_route_output_key() is better as an inline. This avoid a stack frame at zero cost. Signed-off-by: David S. Miller commit b23dd4fe42b455af5c6e20966b7d6959fa8352ea Author: David S. Miller Date: Wed Mar 2 14:31:35 2011 -0800 ipv4: Make output route lookup return rtable directly. Instead of on the stack. Signed-off-by: David S. Miller commit b4a6b3436531f6c5256e6d60d388c3c28ff1a0e9 Author: Jeff Mahoney Date: Thu Feb 24 15:33:24 2011 -0500 [IA64] tioca: Fix assignment from incompatible pointer warnings The prototype for sn_pci_provider->{dma_map,dma_map_consistent} expects an unsigned long instead of a u64. Signed-off-by: Jeff Mahoney Signed-off-by: Tony Luck commit c1d036c4d1cb00b7e8473a2ad0a78f13e13a8183 Author: Jeff Mahoney Date: Thu Feb 24 17:23:09 2011 -0500 [IA64] mca.c: Fix cast from integer to pointer warning ia64_mca_cpu_init has a void *data local variable that is assigned the value from either __get_free_pages() or mca_bootmem(). The problem is that __get_free_pages returns an unsigned long and mca_bootmem, via alloc_bootmem(), returns a void *. format_mca_init_stack takes the void *, and it's also used with __pa(), but that casts it to long anyway. This results in the following build warning: arch/ia64/kernel/mca.c:1898: warning: assignment makes pointer from integer without a cast Cast the return of __get_free_pages to a void * to avoid the warning. Signed-off-by: Jeff Mahoney Signed-off-by: Tony Luck commit ad7b67e5118738e49a14751944528eb26fd8d718 Author: Justin P. Mattock Date: Sun Feb 27 20:46:46 2011 -0800 [IA64] setup.c Typo fix "Architechtuallly" s/Architechtuallly/Architecturally/ Signed-off-by: Justin P. Mattock Signed-off-by: Tony Luck commit a8d380f30a7d8cc507fd5cc84b2dc5ee2b2144d7 Author: Dima Zavin Date: Wed Mar 2 13:17:08 2011 -0800 msm: mdp: Add support for RGBX 8888 image format. Signed-off-by: Dima Zavin Signed-off-by: Carl Vanderlip Signed-off-by: David Brown commit b0a679326ce90e65779178906df5b8b6180163d6 Author: Dima Zavin Date: Wed Mar 2 13:16:36 2011 -0800 video: msmfb: Put the partial update magic value into the fix_screen struct. This can then be tested by userspace to see if the capability is supported. Userspace cannot rely on that value being left in var_screen, since userspace itself can change it. Signed-off-by: Dima Zavin Signed-off-by: Carl Vanderlip Signed-off-by: David Brown commit faa18530b55d116ce5570b8e5be4350a5452ce69 Author: Tony Luck Date: Wed Mar 2 13:35:22 2011 -0800 [IA64] Add CONFIG_MISC_DEVICES=y to configs that need it. Uwe Kleine-König wrote: > While working on an defconfig (arm/mx27) I noticed that just updating > it results in removing CONFIG_EEPROM_AT24=y. The reason is that > since commit > > v2.6.36-5965-g5f2365d (misc devices: do not enable by default) > > MISC_DEVICES isn't enabled anymore by default. So all defconfigs that > have CONFIG_SOME_SYMBOL=y (or =m) (with SOME_SYMBOL depending on > MISC_DEVICES) but not CONFIG_MISC_DEVICES=y suffer from the same > problem. Reported-by: Uwe Kleine-König Signed-off-by: Tony Luck commit 788257d6101d986ac8f2741aaa35974af47f574c Author: Arnd Bergmann Date: Mon Jan 24 10:14:12 2011 +0100 ufs: remove the BKL This introduces a new per-superblock mutex in UFS to replace the big kernel lock. I have been careful to avoid nested calls to lock_ufs and to get the lock order right with respect to other mutexes, in particular lock_super. I did not make any attempt to prove that the big kernel lock is not needed in a particular place in the code, which is very possible. The mutex has a significant performance impact, so it is only used on SMP or PREEMPT configurations. As Nick Piggin noticed, any allocation inside of the lock may end up deadlocking when we get to ufs_getfrag_block in the reclaim task, so we now use GFP_NOFS. Signed-off-by: Arnd Bergmann Tested-by: Nick Bowler Cc: Evgeniy Dushistov Cc: Nick Piggin commit 452edd598f60522c11f7f88fdbab27eb36509d1a Author: David S. Miller Date: Wed Mar 2 13:27:41 2011 -0800 xfrm: Return dst directly from xfrm_lookup() Instead of on the stack. Signed-off-by: David S. Miller commit 9a311b96c3065f362e3348cb5d7af1a57ca6bff9 Author: Arnd Bergmann Date: Sat Jan 22 20:26:12 2011 +0100 hpfs: remove the BKL This removes the BKL in hpfs in a rather awful way, by making the code only work on uniprocessor systems without kernel preemption, as suggested by Andi Kleen. The HPFS code probably has close to zero remaining users on current kernels, all archeological uses of the file system can probably be done with the significant restrictions. The hpfs_lock/hpfs_unlock functions are left in the code, sincen Mikulas has indicated that he is still interested in fixing it in a better way. Signed-off-by: Arnd Bergmann Acked-by: Andi Kleen Cc: Mikulas Patocka Cc: linux-fsdevel@vger.kernel.org commit e343d3ea73e97b339ecb1d39f1cdd306da24a175 Author: Arend van Spriel Date: Wed Mar 2 17:01:37 2011 +0100 staging: brcm80211: replace simple_strtoul with strict_strtoul By checkpatch recommendation using strict_strtoul now. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 7ae92624969bdee951b64f638898ac9f96646558 Author: Arend van Spriel Date: Wed Mar 2 09:08:43 2011 +0100 staging: brcm80211: changed module wlc_mac80211 to wlc_main The source and include file for the wlc_mac80211 module has been renamed to wlc_main and subsequently the include statement in other source files. This module provides the main interface towards wl_mac80211 module. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 83aa3c7bf3f04a04e92637de979c6de19160aa7f Author: Jonathan Neuschäfer Date: Tue Mar 1 23:58:54 2011 +0100 staging: echo: fix a typo ("overflow") Signed-off-by: Jonathan Neuschäfer Signed-off-by: Greg Kroah-Hartman commit 9720b4bc76a83807c68e00c62bfba575251bb73e Author: Arnd Bergmann Date: Wed Mar 2 00:13:05 2011 +0100 staging/usbip: convert to kthread usbip has its own infrastructure for managing kernel threads, similar to kthread. By changing it to use the standard functions, we can simplify the code and get rid of one of the last BKL users at the same time. Includes changes suggested by Max Vozeler. Signed-off-by: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Takahiro Hirofuchi Cc: Max Vozeler Signed-off-by: Greg Kroah-Hartman commit 8c81161615feb8c666c675ec7a660dc9b011683f Author: Philip Worrall Date: Wed Mar 2 14:34:45 2011 +0000 Staging: vt6656: Clean up switching to power saving mode. When switching to power saving mode we only need to notify the receiver when in infrastructure mode. Signed-off-by: Philip Worrall Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit b898cf21ad8cbe7506127b3fa68bcae33273b171 Author: Philip Worrall Date: Wed Mar 2 17:36:35 2011 +0000 Staging: vt6656: Ensure power.c uses proper tabbing. Simplify setting of power state in power.c when sending power state notifications to the access point. Signed-off-by: Philip Worrall Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit c5b0b5fcdbde44cba6f5069d58aeffae4eec2572 Author: Philip Worrall Date: Wed Mar 2 14:34:43 2011 +0000 Staging: vt6656: Clean up spaces around parenthesized expressions Clean up a number of places where unneeded spaces are used around expressions. Signed-off-by: Philip Worrall Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit e25b75ec83ec1d76690a9f26d457d2af945119d2 Author: Philip Worrall Date: Wed Mar 2 14:34:42 2011 +0000 Staging: vt6656: Clean up return from sending power state notifications Clean up power.c so that unnecessary final return statements are not used when sending power state notifications to the access point. Signed-off-by: Philip Worrall Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 036dba14d56fd3d43bab452625ec967c3f886fa4 Author: Philip Worrall Date: Wed Mar 2 14:34:41 2011 +0000 Staging: vt6656: Clean up unneccessary braces in power.c Clean up some unnecessary braces for conditional statements where a single statement will do. Signed-off-by: Philip Worrall Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 7404eab294f3275233ceaa592e029bf41601ab78 Author: Philip Worrall Date: Wed Mar 2 14:34:40 2011 +0000 Staging: vt6656: Use C89 comments in power.c Reformat the comments in power.c to use the C89 commenting style instead of the C99 commenting style. Signed-off-by: Philip Worrall Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit f9cfbe943c05df341930befb272902230c4087fc Author: Philip Worrall Date: Wed Mar 2 14:34:39 2011 +0000 Staging: vt6656: Ensure power.c uses proper tabbing. Cleanup power.c to use proper tabbing as per coding standards. Signed-off-by: Philip Worrall Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 3872b284087081ee5cb0e4630954c2f7a2153cf5 Merge: 07df529 8a80c79 Author: David S. Miller Date: Wed Mar 2 11:30:24 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit a625e305edd8e3ac08888a9b52981205b68cdb0e Author: Peter Huewe Date: Tue Jan 25 22:34:24 2011 +0100 video/via: drop deprecated (and unused) i2c_adapter.id This patch removes an assignment to the deprecated i2c_adapter.id field. Since the field isn't used anywhere else in the driver it is save to remove it. Signed-off-by: Peter Huewe Acked-by: Jean Delvare Signed-off-by: Florian Tobias Schandinat commit 5cd10e7946d28cfc42442fee2e6c757e244d756e Author: Thomas Gleixner Date: Wed Mar 2 16:58:30 2011 +0100 hrtimer: Update base[CLOCK_BOOTTIME].offset correctly We calculate the current time of each clock base by adding an offset to clock_monotonic. The offset for the clock bases is set in retrigger_next_event() which is called when we switch a cpu to highres mode or when the clock was set. Add the missing update for clock boottime. Signed-off-by: Thomas Gleixner Cc: John Stultz commit 53f22956effe1c9e7961b8c6e4362ecca5e460b7 Author: Liu Yuan Date: Wed Mar 2 11:00:15 2011 -0500 block/genhd: Change some numerals into macros Rename the numerals in the diskstats_show() into the macros. Cc: Jens Axboe Signed-off-by: Liu Yuan Signed-off-by: Jens Axboe commit eb8c1e2c830fc25c93bc94e215ed387fe142a98d Author: Tejun Heo Date: Wed Mar 2 11:32:47 2011 +0100 x86-64, NUMA: Better explain numa_distance handling Handling of out-of-bounds distances and allocation failure can use better documentation. Add it. Signed-off-by: Tejun Heo Cc: Yinghai Lu Acked-by: David Rientjes commit ce0033307f1b45e23e0c149f56ea4855eb4687ce Author: Yinghai Lu Date: Wed Mar 2 11:22:14 2011 +0100 x86-64, NUMA: Fix distance table handling NUMA distance table handling has the following problems. * numa_reset_distance() uses numa_distance * sizeof(numa_distance[0]) as the table size when it should be using the square of numa_distance. * The same size miscalculation when allocation space for phys_dist in numa_emulation(). * In numa_emulation(), phys_dist must be reserved; otherwise, the new emulated distance table may overlap it. Fix them and, while at it, take numa_distance_cnt resetting in numa_reset_distance() out of the if block to simplify the code a bit. David Rientjes reported incorrect handling of distance table during emulation. -tj: Edited out numa_alloc_distance() related changes which weren't necessary and rewrote patch description. -v2: Ingo was unhappy with 80-column limit induced linebreaks. Let lines run over 80-column. Signed-off-by: Yinghai Lu Reported-by: David Rientjes Signed-off-by: Tejun Heo Cc: Ingo Molnar Acked-by: David Rientjes commit 0a10247914a5cad3caf7ef8a255c54c4d3ed2062 Author: Frederic Weisbecker Date: Sat Feb 26 04:51:54 2011 +0100 perf: Set filters before mmaping events We currently set the filters after we mmap the events, this is a race that let undesired events record themselves in the buffer before we had the time to set the filters. So set the filters before they can be recorded. That also librarizes the filters setting so that filtering can be done more easily from other tools than perf record later. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt commit b06b3d49699a52e8f9ca056c4f96e81b1987d78e Author: Lin Ming Date: Wed Mar 2 21:27:04 2011 +0800 perf, x86: Add Intel SandyBridge CPU support This patch adds basic SandyBridge support, including hardware cache events and PEBS events support. It has been tested on SandyBridge CPUs with perf stat and also with PEBS based profiling - both work fine. The patch does not affect other models. v2 -> v3: - fix PEBS event 0xd0 with right umask combinations - move snb pebs constraint assignment to intel_pmu_init v1 -> v2: - add more raw and PEBS events constraints - use offcore events for LLC-* cache events - remove the call to Nehalem workaround enable_all function Signed-off-by: Lin Ming Acked-by: Peter Zijlstra Cc: Stephane Eranian Cc: Andi Kleen LKML-Reference: <1299072424.2175.24.camel@localhost> Signed-off-by: Ingo Molnar commit dd65c736d1b5312c80c88a64bf521db4959eded5 Author: Stuart Hayes Date: Wed Mar 2 13:42:05 2011 +0100 dcdbas: force SMI to happen when expected The dcdbas driver can do an I/O write to cause a SMI to occur. The SMI handler looks at certain registers and memory locations, so the SMI needs to happen immediately. On some systems I/O writes are posted, though, causing the SMI to happen well after the "outb" occurred, which causes random failures. Following the "outb" with an "inb" forces the write to go through even if it is posted. Signed-off-by: Stuart Hayes Acked-by: Doug Warzecha Signed-off-by: Jiri Kosina commit a7a75c8f70d6f6a2f16c9f627f938bbee2d32718 Author: Zhenyu Wang Date: Wed Mar 2 13:52:37 2011 +0800 drm/i915: Don't save/restore hardware status page address register It's cleaned before saving and re-initialized after restoring. So don't need to save/restore it. And also new chip has new address for hardware status page register, don't write to old address. Signed-off-by: Zhenyu Wang Signed-off-by: Chris Wilson commit c69e3758ff56d03e161187355791ec992c574276 Author: Thomas Gleixner Date: Wed Mar 2 11:49:21 2011 +0100 genirq: Fixup fasteoi handler for oneshot mode The fasteoi handler must mask the interrupt line in oneshot mode otherwise we end up with an irq storm. Signed-off-by: Thomas Gleixner commit 4cbf74ccf8362e99b2bdf1e66112a480c79ecacf Author: Chris Wilson Date: Fri Feb 25 22:26:23 2011 +0000 drm/i915: don't store the reg value for HWS_PGA It is trivially computable from the real physical address so no need to store both. Signed-off-by: Chris Wilson commit 467b41c688c79d1b5e076fbdf082f9cd5d6a000c Author: Per Jessen Date: Tue Feb 8 13:54:32 2011 +0100 ahci: recognize Marvell 88se9125 PCIe SATA 6.0 Gb/s controller Recognize Marvell 88SE9125 PCIe SATA 6.0 Gb/s controller. Signed-off-by: Per Jessen Signed-off-by: Jeff Garzik commit 1a0f6b7ecdcd810f8991ea26c95d93ff965e8f41 Author: Sergei Shtylyov Date: Fri Feb 4 22:08:22 2011 +0300 libata: remove ATA_FLAG_LPM Commit 6b7ae9545ad9875a289f4191c0216b473e313cb9 (libata: reimplement link power management) removed the check of ATA_FLAG_LPM but neglected to remove the flag itself. Do it now... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 9cbe056f6c467e7395d5aec39aceec47812eb98e Author: Sergei Shtylyov Date: Fri Feb 4 22:05:48 2011 +0300 libata: remove ATA_FLAG_NO_LEGACY All checks of ATA_FLAG_NO_LEGACY have been removed by the commits c791c30670ea61f19eec390124128bf278e854fe ([libata] minor PCI IDE probe fixes and cleanups) and f0d36efdc624beb3d9e29b9ab9e9537bf0f25d5b (libata: update libata core layer to use devres), so I think it's time to finally get rid of this flag... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 3696df309971b3427cb9cb039138a1732a865a0b Author: Sergei Shtylyov Date: Fri Feb 4 22:04:17 2011 +0300 libata: remove ATA_FLAG_MMIO Commit 0d5ff566779f894ca9937231a181eb31e4adff0e (libata: convert to iomap) removed all checks of ATA_FLAG_MMIO but neglected to remove the flag itself. Do it now, at last... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit c10f97b9d8df818e51e6073be1b96454630595c1 Author: Sergei Shtylyov Date: Fri Feb 4 22:03:34 2011 +0300 libata: remove ATA_FLAG_{SRST|SATA_RESET} These flags are marked as obsolete and the checks for them have been removed by commit 294440887b32c58d220fb54b73b7a58079b78f20 (libata-sff: kill unused ata_bus_reset()), so I think it's time to finally get rid of them... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 0f2e0330a85d351b0300583da1e335690c86bdd7 Author: Sergei Shtylyov Date: Fri Jan 21 20:32:01 2011 +0300 ipr/sas_ata: use mode mask macros from Commit 14bdef982caeda19afe34010482867c18217c641 ([libata] convert drivers to use ata.h mode mask defines) didn't convert these two libata driver outside drivers/ata/... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 14080fa65516d15bc284c77a5dde31621a61e2bc Author: Sergei Shtylyov Date: Fri Jan 28 22:02:09 2011 +0300 sata_dwc_460ex: add debugging options The driver makes use of the two options (CONFIG_SATA_DWC_[V]DEBUG) to enable the debug output but they both are absent in drivers/ata/Kconfig... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 84b47e3b16f8a5bb416cd55774d679ebbdb19072 Author: Sergei Shtylyov Date: Fri Jan 28 22:01:01 2011 +0300 sata_dwc_460ex: fix misuse of ata_get_cmd_descript() The driver erroneously uses ata_get_cmd_descript() not only for printing out the ATA commands but also the protocol and DMA direction enums. Add functions for properly printing those out... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit d285e8bfe9d1a196e26b798cc04f8c5ebc60c856 Author: Sergei Shtylyov Date: Fri Jan 28 21:58:54 2011 +0300 sata_dwc_460ex: fix return value of dma_dwc_xfer_setup() The caller expects this function to return the DMA channel number on success, while it returns 0... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit c211962dc12d609effbf00a2c5c6fc38cc1dbc54 Author: Sergei Shtylyov Date: Fri Jan 28 21:55:55 2011 +0300 sata_dwc_460ex: fix compilation errors/warnings Fix the following compilation errors/warnings: drivers/ata/sata_dwc_460ex.c:43:1: warning: "DRV_NAME" redefined In file included from drivers/ata/sata_dwc_460ex.c:38: drivers/ata/libata.h:31:1: warning: this is the location of the previous definition drivers/ata/sata_dwc_460ex.c:44:1: warning: "DRV_VERSION" redefined drivers/ata/libata.h:32:1: warning: this is the location of the previous definition drivers/ata/sata_dwc_460ex.c: In function `sata_dwc_exec_command_by_tag': drivers/ata/sata_dwc_460ex.c:1356: warning: passing argument 1 of `ata_get_cmd_descript' makes integer from pointer without a cast drivers/ata/sata_dwc_460ex.c: In function `sata_dwc_qc_issue': drivers/ata/sata_dwc_460ex.c:1476: warning: `err' is used uninitialized in this function drivers/ata/sata_dwc_460ex.c:1465: note: `err' was declared here drivers/ata/sata_dwc_460ex.c: In function `sata_dwc_qc_issue': drivers/ata/sata_dwc_460ex.c:1493: warning: passing argument 1 of `ata_get_cmd_descript' makes integer from pointer without a cast drivers/ata/sata_dwc_460ex.c: In function `sata_dwc_qc_prep': drivers/ata/sata_dwc_460ex.c:1537: error: `tag' undeclared (first use in this function) drivers/ata/sata_dwc_460ex.c:1537: error: (Each undeclared identifier is reported only once drivers/ata/sata_dwc_460ex.c:1537: error: for each function it appears in.) NB: error only happens if DEBUG_NCQ macro is defined... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit b83a4c397952a0c05b5468c0403a32e87bb35fef Author: Sergei Shtylyov Date: Tue Jan 25 19:27:35 2011 +0300 sata_dwc_460ex: use ATA_PIO4 Somehow the driver was committed with a bare number for the PIO mask, instead of ATA_PIO4... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 4fca377f7488095ab04035e2bfe5c59873c22382 Author: Jeff Garzik Date: Tue Feb 15 01:13:24 2011 -0500 [libata] trivial: trim trailing whitespace for drivers/ata/*.[ch] commit 00dd4998a60599d98b4d6635820a1fbeafa5b021 Author: James Bottomley Date: Sun Jan 23 09:44:12 2011 -0600 libsas: convert to libata new error handler The conversion is quite complex given that the libata new error handler has to be hooked into the current libsas timeout and error handling. The way this is done is to process all the failed commands via libsas first, but if they have no underlying sas task (and they're on a sata device) assume they are destined for the libata error handler and send them accordingly. Finally, activate the port recovery of the libata error handler for each port known to the host. This is somewhat suboptimal, since that port may not need recovering, but given the current architecture of the libata error handler, it's the only way; and the spurious activation is harmless. Signed-off-by: James Bottomley Signed-off-by: Jeff Garzik commit 0e0b494ca8c54a7297d0cc549405091019b3b77e Author: James Bottomley Date: Sun Jan 23 09:42:50 2011 -0600 libata: separate error handler into usable components Right at the moment, the libata error handler is incredibly monolithic. This makes it impossible to use from composite drivers like libsas and ipr which have to handle error themselves in the first instance. The essence of the change is to split the monolithic error handler into two components: one which handles a queue of ata commands for processing and the other which handles the back end of readying a port. This allows the upper error handler fine grained control in calling libsas functions (and making sure they only get called for ATA commands whose lower errors have been fixed up). Signed-off-by: James Bottomley Signed-off-by: Jeff Garzik commit c34aeebc06e8bdde93e8c8f40d9903b1aaab63c6 Author: James Bottomley Date: Sun Jan 23 08:31:14 2011 -0600 libata: fix eh locking The SCSI host eh_cmd_q should be protected by the host lock (not the port lock). This probably doesn't matter that much at the moment, since we try to serialise the add and eh pieces, but it might matter in future for more convenient error handling. Plus this switches libata to the standard eh pattern where you lock, remove from the cmd queue to a local list and unlock and then operate on the local list. Signed-off-by: James Bottomley Signed-off-by: Jeff Garzik commit a29b5dad46ee4168c8fc18e47dabbde49790527b Author: James Bottomley Date: Sun Jan 23 08:30:00 2011 -0600 libata: fix locking for sas paths For historical reasons, libsas uses the scsi host lock as the ata port lock, and libata always uses the ata host. For the old eh, this was largely irrelevant since the two locks were never mixed inside the code. However, the new eh has a case where it nests acquisition of the host lock inside the port lock (this does look rather deadlock prone). Obviously this would be an instant deadlock if the port lock were the host lock, so switch the libsas paths to use the ata host lock as well. Signed-off-by: James Bottomley Signed-off-by: Jeff Garzik commit 238c9cf9ea88bbbb9fd0f60c2cc9511c10b4585c Author: James Bottomley Date: Sun Jan 23 08:28:33 2011 -0600 libata: plumb sas port scan into standard libata paths The function ata_sas_port_init() has always really done its own thing. However, as a precursor to moving to the libata new eh, it has to be properly using the standard libata scan paths. This means separating the current libata scan paths into pieces which can be shared with libsas and pieces which cant (really just the async call and the host scan). Signed-off-by: James Bottomley Signed-off-by: Jeff Garzik commit eb0e85e36b971ec31610eda7e3ff5c11c1c44785 Author: Tejun Heo Date: Thu Feb 24 19:30:37 2011 +0100 libata: fix hotplug for drivers which don't implement LPM ata_eh_analyze_serror() suppresses hotplug notifications if LPM is being used because LPM generates spurious hotplug events. It compared whether link->lpm_policy was different from ATA_LPM_MAX_POWER to determine whether LPM is enabled; however, this is incorrect as for drivers which don't implement LPM, lpm_policy is always ATA_LPM_UNKNOWN. This disabled hotplug detection for all drivers which don't implement LPM. Fix it by comparing whether lpm_policy is greater than ATA_LPM_MAX_POWER. Signed-off-by: Tejun Heo Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit e938c287ea8d977e079f07464ac69923412663ce Author: Jan Beulich Date: Tue Mar 1 14:28:02 2011 +0000 x86: Fix a bogus unwind annotation in lib/semaphore_32.S 'simple' would have required specifying current frame address and return address location manually, but that's obviously not the case (and not necessary) here. Signed-off-by: Jan Beulich LKML-Reference: <4D6D1082020000780003454C@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 07df5294a753dfac2cc9f75e6159fc25fdc22149 Author: Herbert Xu Date: Tue Mar 1 23:00:58 2011 -0800 inet: Replace left-over references to inet->cork The patch to replace inet->cork with cork left out two spots in __ip_append_data that can result in bogus packet construction. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 7f6daa635c28ed686835a4080269e3fdc5a01012 Author: Stephen Hemminger Date: Tue Mar 1 22:51:52 2011 -0800 pfkey: fix warning If CONFIG_NET_KEY_MIGRATE is not defined the arguments of pfkey_migrate stub do not match causing warning. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b42835dbe83d725198c7ab0bbe726d6dfd92a634 Author: David S. Miller Date: Tue Mar 1 22:06:22 2011 -0800 ipv6: Make icmp route lookup code a bit clearer. The route lookup code in icmpv6_send() is slightly tricky as a result of having to handle all of the requirements of RFC 4301 host relookups. Pull the route resolution into a seperate function, so that the error handling and route reference counting is hopefully easier to see and contained wholly within this new routine. Signed-off-by: David S. Miller commit 6dd227002972be910c6191f38f8641e01796557f Author: Scott Wood Date: Thu Jan 27 10:30:44 2011 +0000 powerpc: Fix memory limits when starting at a non-zero address memblock_enforce_memory_limit() takes the desired maximum quantity of memory to end up with, not an address above which memory will not be used. Signed-off-by: Scott Wood Signed-off-by: Benjamin Herrenschmidt commit c7704d352d45de47333f2d9f10aead820b49044c Author: Benjamin Herrenschmidt Date: Sun Feb 6 18:26:25 2011 +0000 powerpc/pseries: Reduce HVCS driver insanity The HVCS driver, for those who don't know, is a driver for the "server" side of the IBM virtual terminal mechanism allowing Linux partitions to act as terminal servers under IBM PowerVM hypervisor. It's almost never used on the field at the moment. However, it's part of our configs, and in its current incarnation, will allocate the tty driver & major (with 64 minors) and create a kernel thread whether it's used or not, ie, whether the hypervisor did put a virtual terminal server device node in the partition or not (or whether running on a pseries machine or not even). This in turns causes modern distro's udev's to start trying to open all those 64 minors at boot, which, since they aren't linked to anything, causes the driver to spew errors in the kernel log for each of them. Not nice. This moves all that initialization to a function which is now only called the first time a terminal server virtual IO device is actually probed (that is almost never). There's still a _LOT_ of cleanup that can be done in this driver, some simple (almost all printk's statements in there shall either just be removed or in some case turned into better written & more informative messages, including using the dev_* variants etc...). This is left as an exercise for whoever actually cares about that driver. One could also try to be smart and dispose of all the tty related resources when the last instance of the VIO server device is removed (Hotplug anybody ?). Signed-off-by: Benjamin Herrenschmidt commit 9ff0c61d08ac4defa5ad6c65935a67643b8f4ce3 Author: Paul E. McKenney Date: Thu Feb 10 11:57:27 2011 +0000 powerpc: Mask smp_processor_id() false positive The rtas_event_scan() function uses smp_processor_id() to select a starting point in cpu_online_mask, and does so under the protection of get_online_cpus(). This might not select the current processor in any case, so switch to raw_smp_processor_id(). Signed-off-by: Paul E. McKenney Signed-off-by: Benjamin Herrenschmidt commit 31116f0b7e8965ff3c2fd09ab240b7746d5556b3 Author: Justin Mattock Date: Thu Feb 24 20:10:18 2011 +0000 powerpc/eeh: Remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Benjamin Herrenschmidt commit e1f4dea454c8e643644114757080680e1959d410 Author: Grant Likely Date: Mon Feb 28 09:59:31 2011 +0000 powerpc/macintosh: Fix __devexit annotation in rack-meter.c The following warning was seen building rack-meter.c WARNING: drivers/built-in.o(.text+0xac784): Section mismatch in reference from the function rackmeter_shutdown() to the function .devexit.text:rackmeter_stop_cpu_sniffer() The function rackmeter_shutdown() references a function in an exit section. Often the function rackmeter_stop_cpu_sniffer() has valid usage outside the exit section and the fix is to remove the __devexit annotation of rackmeter_stop_cpu_sniffer. This patch resolves the warning by removing the __devexit annotation from rackmeter_stop_cpu_sniffer(). Signed-off-by: Grant Likely Cc: linuxppc-dev@lists.ozlabs.org Cc: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt commit fe3cc0d99de6a9bf99b6c279a8afb5833888c1f7 Author: Anton Blanchard Date: Mon Feb 28 20:00:47 2011 +0000 powerpc: Add pgprot_writecombine A number of drivers are using pgprot_writecombine() to enable write combining on userspace mappings. Implement it on powerpc. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit a9d8946b4af9e003c645ffb46489fdeb154e7ed9 Author: Thomas Gleixner Date: Fri Jan 21 06:12:30 2011 +0000 powerpc: Use new irq allocator Use the new functions and free the descriptor when the virq is destroyed. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 089fb442f3018a3ed094f8ac7a7cc2d3bd03b114 Author: Thomas Gleixner Date: Fri Jan 21 06:12:28 2011 +0000 powerpc: Use ARCH_IRQ_INIT_FLAGS Define the ARCH_IRQ_INIT_FLAGS instead of fixing it up in a loop. Signed-off-by: Thomas Gleixner Signed-off-by: Benjamin Herrenschmidt commit 7e26065d8b11babc948262b92cd989fcc7062653 Author: Prarit Bhargava Date: Thu Jan 13 04:09:01 2011 +0000 powerpc/pseries: Cleanup use of notifier_from_errno() Minor cleanup of notifier_from_errno() in powerpc. notifier_from_errno() now contains the if(ret)/else conditional. There is no need to do it in the powerpc code. Signed-off-by: Prarit Bhargava Signed-off-by: Benjamin Herrenschmidt commit ae39573a19e35122bd431a4f5c889823209168c7 Author: Nicolas Kaiser Date: Fri Oct 22 02:58:53 2010 +0000 powerpc/mv64x60: Suspected typo in assignment Untested, but looks like an obvious typo to me. [BenH: No feedback, but it's obviously wrong] Signed-off-by: Nicolas Kaiser Signed-off-by: Benjamin Herrenschmidt commit 10e38391c0e242e53e30094f6c00553418ab2f2e Author: Dave Chinner Date: Wed Mar 2 14:20:59 2011 +1100 xfs: introduce new logging API. Most of the logging infrastructure in XFS is unneccessary and designed around the infrastructure supplied by Irix rather than Linux. To rationalise the logging interfaces, start by introducing simple printk wrappers similar to the dev_printk() infrastructure. Later patches will convert code to use this new interface. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit eeb2036b8a148629b762ae6d85cff0be8106f081 Author: Alex Elder Date: Tue Mar 1 17:50:00 2011 +0000 xfs: zero proper structure size for geometry calls Commit 493f3358cb289ccf716c5a14fa5bb52ab75943e5 added this call to xfs_fs_geometry() in order to avoid passing kernel stack data back to user space: + memset(geo, 0, sizeof(*geo)); Unfortunately, one of the callers of that function passes the address of a smaller data type, cast to fit the type that xfs_fs_geometry() requires. As a result, this can happen: Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: f87aca93 Pid: 262, comm: xfs_fsr Not tainted 2.6.38-rc6-493f3358cb2+ #1 Call Trace: [] ? panic+0x50/0x150 [] ? __stack_chk_fail+0x10/0x18 [] ? xfs_ioc_fsgeometry_v1+0x56/0x5d [xfs] Fix this by fixing that one caller to pass the right type and then copy out the subset it is interested in. Note: This patch is an alternative to one originally proposed by Eric Sandeen. Reported-by: Jeffrey Hundstad Signed-off-by: Alex Elder Reviewed-by: Eric Sandeen Tested-by: Jeffrey Hundstad commit a580b8c5429a624d120cd603e1498bf676e2b4da Author: Shawn Guo Date: Sun Feb 27 00:47:42 2011 +0800 dmaengine: mxs-dma: add dma support for i.MX23/28 This patch adds dma support for Freescale MXS-based SoC i.MX23/28, including apbh-dma and apbx-dma. * apbh-dma and apbx-dma are supported in the driver as two mxs-dma instances. * apbh-dma is different between mx23 and mx28, hardware version register is used to differentiate. * mxs-dma supports pio function besides data transfer. The driver uses dma_data_direction DMA_NONE to identify the pio mode, and steals sgl and sg_len to get pio words and numbers from clients. * mxs dmaengine has some very specific features, like sense function and the special NAND support (nand_lock, nand_wait4ready). These are too specific to implemented in generic dmaengine driver. * The driver refers to imx-sdma and only a single descriptor is statically assigned to each channel. Signed-off-by: Shawn Guo Signed-off-by: Vinod Koul commit b8534e0f2b09e47790c261af0aee86fc88c6eb3c Author: Szymon Janc Date: Tue Mar 1 16:55:34 2011 +0100 Bluetooth: Fix some small code style issues in mgmt.c Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 3cf2a4f6ca4e088ba79d05d6e7f4635c535e6ae4 Author: Szymon Janc Date: Tue Mar 1 16:55:33 2011 +0100 Bluetooth: Use variable name instead of type in sizeof() As written in the CodingStyle doc. Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 8ce6284ea350a5249d09c958bdd088ec0eb4f57f Author: Szymon Janc Date: Tue Mar 1 16:55:32 2011 +0100 Bluetooth: Remove unused code from get_connections Command pointer was a leftover after moving controller index to mgmt_hdr. Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 34eb525c1fda689507118a1f2c77fef51832ec8a Author: Szymon Janc Date: Mon Feb 28 14:10:08 2011 +0100 Bluetooth: Log all parameters in cmd_status for easier debugging Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 8020c16a6c9fc8d6a5217be8d005f2fc558f6ab5 Author: Szymon Janc Date: Mon Feb 28 14:09:50 2011 +0100 Bluetooth: Fix possible NULL pointer dereference in cmd_complete It is now possible to create command complete event without specific reply data by passing NULL as reply with len 0. Check pointer before calling memcpy to avoid undefined behaviour. Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 173442f2787c88e1ed1bb62aaeb6fd9127720559 Author: Tomoya MORINAGA Date: Tue Mar 1 14:16:23 2011 +0900 i2c-eg20t: support new device OKI SEMICONDUCTOR ML7213 IOH Support new device OKI SEMICONDUCTOR ML7213 IOH. The ML7213 which is for IVI(In-Vehicle Infotainment) is a companion chip for the Atom E6xx series and compatible with the Intel EG20T PCH. Signed-off-by: Tomoya MORINAGA Signed-off-by: Ben Dooks commit f6d460cf0ed16d35aec48f823685e7a0e0283d84 Author: David S. Miller Date: Tue Mar 1 15:49:55 2011 -0800 ipv4: Make icmp route lookup code a bit clearer. The route lookup code in icmp_send() is slightly tricky as a result of having to handle all of the requirements of RFC 4301 host relookups. Pull the route resolution into a seperate function, so that the error handling and route reference counting is hopefully easier to see and contained wholly within this new routine. Signed-off-by: David S. Miller commit a05dcdb98011a53d150d699ef8243754e2c9a61c Author: Paul Walmsley Date: Fri Feb 25 18:22:08 2011 -0700 MMC: omap_hsmmc: enable interface clock before calling mmc_host_enable() The code path entered via mmc_host_enable() can include register accesses to the HSMMC IP block. For this to work, both the device interface clock and functional clock need to be enabled before mmc_host_enable() is called. However, omap_hsmmc_probe() calls mmc_host_enable() before enabling the device interface clock. Fix by calling mmc_host_enable() after the device interface clock is enabled. Signed-off-by: Paul Walmsley Cc: Madhusudhan Chikkature Rajashekar Cc: Adrian Hunter Cc: Kishore Kadiyala Cc: Tero Kristo Acked-by: Madhusudhan Chikkature Rajashekar commit da0653fe01cd4c6ed402a94752b78be62cb39282 Author: Rajendra Nayak Date: Fri Feb 25 15:40:21 2011 -0700 OMAP2+: omap_device/clock: Do not expect an entry in clkdev for opt_clks The _add_optional_clock_alias function expects an entry already existing in the clkdev table in the form of which might not be the case always. Instead, just check if an entry already exists in clkdev in the form, else go ahead and add one. Remove any assumption of an entry already existing in clkdev table in any form. Since this means, adding a new entry in clkdev if it does not already exist, and not really adding an 'alias', also rename the function name (s/_add_optional_clock_alias/_add_optional_clock_clkdev) to reflect this. Signed-off-by: Rajendra Nayak Reported-by: Sumit Semwal Cc: Sumit Semwal Cc: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Cc: Partha Basak Signed-off-by: Paul Walmsley commit 3ed4566ed2146ff8ac1cbaf2babdf04e50b66648 Author: Santosh Shilimkar Date: Fri Feb 25 15:21:17 2011 -0700 omap4: powerdomain: Use intended PWRSTS_* flags instead of values IVAHD and ABE power domain logic state is populated using directly value instead of the capability flags. Fix the same. Signed-off-by: Santosh Shilimkar [paul@pwsan.com: updated to apply at a different point on the tree] Signed-off-by: Paul Walmsley commit 1a9f5e89d67855385ed42b7b71167e2d3a39507a Author: Benoit Cousson Date: Tue Feb 8 14:30:31 2011 -0700 omap4: clockdomain: Fix the CPUx domain name The register naming convention for clock domain control inside power domain instance is: OMAPXXXX____CDOFFS Both CPU0 and CPU1 use MPU as clock domain name instead of CPU0 and CPU1. Change the name to stick to the convention. The autogen scripts are updated accordingly. Signed-off-by: Benoit Cousson Signed-off-by: Santosh Shilimkar Cc: Paul Walmsley Cc: Rajendra Nayak Signed-off-by: Paul Walmsley commit 4a5f7bda8fe9d0ed08ed4c5beb5dc3fa62f09d05 Author: Mark Brown Date: Tue Mar 1 20:10:46 2011 +0000 ASoC: Add platform data for WM9081 IRQ pin configuration The WM9081 IRQ output can be either active high or active low and can support either CMOS or open drain modes. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 49542656ade68b4d4952feec6a4d508fd32be6f1 Author: Mark Brown Date: Thu Feb 24 20:25:45 2011 +0000 ASoC: Remove module probe announcements from CODEC drivers Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 0a93421b6adf8ba127b3eafc4c16e3a14017e2ae Author: Javier Martin Date: Tue Mar 1 15:02:06 2011 +0100 ASoC: Fix burstsize and DSP_B format problems in imx-ssi. When choosing IMX_DMA flag, burtsizes are set to its default value (0) which leads to driver malfunction. Change them to 4. DSP_B interface needs additional flag to match DSP_B formats as described in several codecs as wm8741 and aic3205. Signed-off-by: Javier Martin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b462c6e69a26dd534d6372ed65a6fc7c01073883 Author: Dimitris Papastamos Date: Tue Mar 1 12:54:39 2011 +0000 ASoC: WM8994: Ensure MICBIAS is provided with a clock The patch 'ASoC: WM8994: Improve Playback Robustness' did not handle this case properly. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c496ccd5dbd8bd25a8817bc2a901adec153a41e1 Merge: e1412e6 04d2868 Author: Mark Brown Date: Tue Mar 1 23:29:04 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 8d3c3ddfa85837e24fad6fa39318617cbb59e843 Merge: e8b2c3c 6927faf Author: Chris Wilson Date: Tue Mar 1 23:20:20 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next commit 44e69767cb7c3bc46e5370c39532c205d4347d80 Author: Ian Campbell Date: Tue Mar 1 20:05:49 2011 +0000 xen: ia64 build broken due to "xen: switch to new schedop hypercall by default." The git commit: > commit a8b7458363b9174f3c2196ca6085630b4b30b7a1 > Author: Ian Campbell > Date: Thu Feb 17 11:04:20 2011 +0000 > > xen: switch to new schedop hypercall by default. > > Rename old interface to sched_op_compat and rename sched_op_new to > simply sched_op. > breaks the IA64 build. This patch fixes it. Signed-off-by: Tony Luck Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 5edc341313a188d94cde7ef87ac31647cea8601a Author: Arnd Bergmann Date: Tue Jan 25 22:08:05 2011 +0100 drivers: remove extraneous includes of smp_lock.h These were missed the last time I cleaned this up globally, because of code moving around or new code getting merged. Signed-off-by: Arnd Bergmann commit f51b452bed4ae5c20e1f8a790e4ed8663d909a40 Author: Arnd Bergmann Date: Tue Jan 25 21:54:50 2011 +0100 tracing: don't trace the BKL No reason to trace it when the last user is gone. Signed-off-by: Arnd Bergmann Acked-by: Frederic Weisbecker commit 4688a066ecf60086ea82f68edb3b036b567d2c08 Author: Arnd Bergmann Date: Sat Jan 22 20:05:05 2011 +0100 adfs: remove the big kernel lock According to Russell King, adfs was written to not require the big kernel lock, and all inode updates are done under adfs_dir_lock. All other metadata in adfs is read-only and does not require locking. The use of the BKL is the result of various pushdowns from the VFS operations. Signed-off-by: Arnd Bergmann Acked-by: Russell King Cc: Stuart Swales commit 2774c131b1d19920b4587db1cfbd6f0750ad1f15 Author: David S. Miller Date: Tue Mar 1 14:59:04 2011 -0800 xfrm: Handle blackhole route creation via afinfo. That way we don't have to potentially do this in every xfrm_lookup() caller. Signed-off-by: David S. Miller commit 69ead7afdf6028184f713a77376ee26f8aaafdcd Author: David S. Miller Date: Tue Mar 1 14:45:33 2011 -0800 ipv6: Normalize arguments to ip6_dst_blackhole(). Return a dst pointer which is potentitally error encoded. Don't pass original dst pointer by reference, pass a struct net instead of a socket, and elide the flow argument since it is unnecessary. Signed-off-by: David S. Miller commit 80c0bc9e37adfc892af82cb6aa8cace79f8a96cb Author: David S. Miller Date: Tue Mar 1 14:36:37 2011 -0800 xfrm: Kill XFRM_LOOKUP_WAIT flag. This can be determined from the flow flags instead. Signed-off-by: David S. Miller commit a1414715f0ac905fb4b3a158ff6548d37bbe6165 Author: David S. Miller Date: Tue Mar 1 14:32:04 2011 -0800 ipv6: Change final dst lookup arg name to "can_sleep" Since it indicates whether we are invoked from a sleepable context or not. Signed-off-by: David S. Miller commit 273447b352e69c327efdecfd6e1d6fe3edbdcd14 Author: David S. Miller Date: Tue Mar 1 14:27:04 2011 -0800 ipv4: Kill can_sleep arg to ip_route_output_flow() This boolean state is now available in the flow flags. Signed-off-by: David S. Miller commit 5df65e5567a497a28067019b8ff08f98fb026629 Author: David S. Miller Date: Tue Mar 1 14:22:19 2011 -0800 net: Add FLOWI_FLAG_CAN_SLEEP. And set is in contexts where the route resolution can sleep. Signed-off-by: David S. Miller commit 420d44daa7aa1cc847e9e527f0a27a9ce61768ca Author: David S. Miller Date: Tue Mar 1 14:19:23 2011 -0800 ipv4: Make final arg to ip_route_output_flow to be boolean "can_sleep" Since that is what the current vague "flags" argument means. Signed-off-by: David S. Miller commit abdf7e7239da270e68262728f125ea94b9b7d42d Author: David S. Miller Date: Tue Mar 1 14:15:24 2011 -0800 ipv4: Can final ip_route_connect() arg to boolean "can_sleep". Since that's what the current vague "flags" thing means. Signed-off-by: David S. Miller commit 6170f51b19efd0e8c9758fe5f4cc3d751b5e5d8e Author: Stanislav Fomichev Date: Tue Mar 1 23:15:26 2011 +0300 brcm80211: remove unused TLV defines Signed-off-by: Stanislav Fomichev Signed-off-by: Greg Kroah-Hartman commit 2fbd6b37bf35073113d1adb71cdf801330fab01e Author: Stanislav Fomichev Date: Tue Mar 1 23:15:25 2011 +0300 brcm80211: use proper ieee80211 routines removed the following defines as a side effect: - FC_SUBTYPE_ANY_QOS - FC_KIND_MASK - FC_PROBE_REQ - FC_PROBE_RESP - FC_BEACON - FC_PS_POLL - FC_RTS - FC_CTS also fixed possible bug when the CPU byte ordered fc was passed into ieee80211_is_data and ieee80211_is_mgmt Signed-off-by: Stanislav Fomichev Signed-off-by: Greg Kroah-Hartman commit 00dce03134689a257120ae2aa18ba7d1a736bef7 Author: Chris Metcalf Date: Mon Feb 28 15:51:25 2011 -0500 arch/tile: export some additional module symbols This adds a grab bag of symbols that have been missing for various modules. Signed-off-by: Chris Metcalf commit 63b7ca6b04427aea9075d6f5f5f15b82e115bce4 Author: Chris Metcalf Date: Mon Feb 28 15:48:39 2011 -0500 arch/tile: enhance existing finv_buffer_remote() routine It now takes an additional argument so it can be used to flush-and-invalidate pages that are cached using hash-for-home as well those that are cached with coherence point on a single cpu. This allows it to be used more widely for changing the coherence point of arbitrary pages when necessary. Signed-off-by: Chris Metcalf commit 3cebbafd28e6f91677f3becffcdf9150b74a4e0c Author: Chris Metcalf Date: Mon Feb 28 15:30:16 2011 -0500 arch/tile: fix two bugs in the backtracer code The first is that we were using an incorrect hand-rolled variant of __kernel_text_address() which didn't handle module PCs. We now just use the standard API. The second was that we weren't accounting for the three-level page table when we were trying to pre-verify the addresses on the 64-bit TILE-Gx processor; we now do that correctly. Signed-off-by: Chris Metcalf commit 6c4d11268819d9c920c7befd8e8e9aad456bb067 Author: Chris Metcalf Date: Mon Feb 28 15:28:00 2011 -0500 arch/tile: use extended assembly to inline __mb_incoherent() This avoids having to maintain an additional separate assembly file, and of course the inline is slightly more efficient as well. Signed-off-by: Chris Metcalf commit 0b989cac90144565b8780ddde36e6a927f8ca7ba Author: Chris Metcalf Date: Mon Feb 28 15:22:40 2011 -0500 arch/tile: use a cleaner technique to enable interrupt for cpu_idle() Previously we used iret to atomically return to kernel PL with interrupts enabled. However, it turns out that we are architecturally guaranteed that we can just set and clear the "interrupt critical section" and only interrupt on the following instruction, so we now do that instead, since it's cleaner. Signed-off-by: Chris Metcalf commit a5c149c8a00b247749d0f18c13b130069dcc36e3 Author: Chris Metcalf Date: Mon Feb 28 15:19:10 2011 -0500 arch/tile: sync up with and changes These headers are used by Linux but are maintained upstream. This change incorporates a few minor fixes to these headers, including a new sim_print() function, cleaner support for the sim_syscall() API, and a sim_query_cpu_speed() method. Signed-off-by: Chris Metcalf commit ed54d38f0852b2e685393ddae2405d59ef44bed4 Author: Chris Metcalf Date: Mon Feb 28 15:14:19 2011 -0500 arch/tile: fix reversed test of strict_strtol() return value This fixes the "initfree" boot argument. Signed-off-by: Chris Metcalf commit 401586e9164d225d24bb9d3ddfeb03ef2e931ee3 Author: Chris Metcalf Date: Mon Feb 28 15:01:53 2011 -0500 arch/tile: avoid a simulator warning during bootup As the added comment says, we can sometimes see a coherence warning from our simulator if the "swapper_pgprot" variable on the boot cpu has not been evicted from cache by the time the other cpus come up. Force it to be evicted so we never see the warning. Signed-off-by: Chris Metcalf commit 9ff27fdbd5d1ffbe2e0a277b4b7bfd0eb8a4bb1c Author: Chris Metcalf Date: Mon Feb 28 13:35:16 2011 -0500 arch/tile: export to userspace This should have been as part of the initial hardwall submission to LKML but was overlooked. The header provides the ioctl definitions for manipulating the hardwall fd, so needs to be available to userspace. Signed-off-by: Chris Metcalf commit bbeee4b2815dd318e9ec9d092d7f79061cc8ba36 Author: Chris Metcalf Date: Mon Feb 28 13:32:14 2011 -0500 arch/tile: warn and retry if an IPI is not accepted by the target cpu Previously we assumed this was impossible, but in fact it can happen. Handle it gracefully by retrying after issuing a warning. Signed-off-by: Chris Metcalf commit b2ce2bdaf942172914a9a39b26065ff7aacdf962 Author: Chris Metcalf Date: Mon Feb 28 13:24:37 2011 -0500 arch/tile: stop disabling INTCTRL_1 interrupts during hypervisor downcalls The problem was that this could lead to IPIs being disabled during the softirq processing after a hypervisor downcall (e.g. for I/O), since both IPI and device interrupts use the INCTRL_1 downcall mechanism. When this happened at the wrong time, it could lead to deadlock. Luckily, we were already maintaining the per-interrupt state we need, and using it in the proper way in the hypervisor, so all we had to do was to change Linux to stop blocking downcall interrupts for the entire length of the downcall. (Now they're blocked while we're executing the downcall routine itself, but not while we're executing any subsequent softirq routines.) The hypervisor is doing a very small amount of work it no longer needs to do (masking INTCTRL_1 on entry to the client interrupt routine), but doing so means that older versions of Tile Linux will continue to work with a current hypervisor, so that seems reasonable. Signed-off-by: Chris Metcalf commit 13371731487896a6ef158b1cd74297f40a3da4bb Author: Chris Metcalf Date: Mon Feb 28 13:21:52 2011 -0500 arch/tile: fix __ndelay etc to work better The current implementations of __ndelay and __udelay call a hypervisor service to delay, but the hypervisor service isn't actually implemented very well, and the consensus is that Linux should handle figuring this out natively and not use a hypervisor service. By converting nanoseconds to cycles, and then spinning until the cycle counter reaches the desired cycle, we get several benefits: first, we are sensitive to the actual clock speed; second, we use less power by issuing a slow SPR read once every six cycles while we delay; and third, we properly handle the case of an interrupt by exiting at the target time rather than after some number of cycles. Signed-off-by: Chris Metcalf commit 04f7a3f12e10032ee3d44df1a509dbf5b2001fce Author: Chris Metcalf Date: Mon Feb 28 13:08:32 2011 -0500 arch/tile: bug fix: exec'ed task thought it was still single-stepping To handle single-step, tile mmap's a page of memory in the process space for each thread and uses it to construct a version of the instruction that we want to single step. If the process exec's, though, we lose that mapping, and the kernel needs to be aware that it will need to recreate it if the exec'ed process than tries to single-step as well. Also correct some int32_t to s32 for better kernel style. Signed-off-by: Chris Metcalf commit 68d0c6d34d586a893292d4fb633a3bf8c547b222 Author: David S. Miller Date: Tue Mar 1 13:19:07 2011 -0800 ipv6: Consolidate route lookup sequences. Route lookups follow a general pattern in the ipv6 code wherein we first find the non-IPSEC route, potentially override the flow destination address due to ipv6 options settings, and then finally make an IPSEC search using either xfrm_lookup() or __xfrm_lookup(). __xfrm_lookup() is used when we want to generate a blackhole route if the key manager needs to resolve the IPSEC rules (in this case -EREMOTE is returned and the original 'dst' is left unchanged). Otherwise plain xfrm_lookup() is used and when asynchronous IPSEC resolution is necessary, we simply fail the lookup completely. All of these cases are encapsulated into two routines, ip6_dst_lookup_flow and ip6_sk_dst_lookup_flow. The latter of which handles unconnected UDP datagram sockets. Signed-off-by: David S. Miller commit 2cb82400719e085a3c226cf7cce8950208f09a06 Author: Chris Metcalf Date: Sun Feb 27 18:52:24 2011 -0500 arch/tile: catch up with section naming convention in 2.6.35 The convention changed to, e.g., ".data..page_aligned". This commit fixes the places in the tile architecture that were still using the old convention. One tile-specific section (.init.page) was dropped in favor of just using an "aligned" attribute. Sam Ravnborg pointed out __PAGE_ALIGNED_BSS, etc. Signed-off-by: Chris Metcalf commit d769f4ce8738d1b56080d16716f645910d02eebf Author: Arend van Spriel Date: Tue Mar 1 10:56:56 2011 +0100 staging: brcm80211: change prototype for wlc_antsel_attach wlc_antsel_attach was called with four parameters but actually three parameters were already provided in the first parameter. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 26bcc1810b7c982ee3a220425c485c2a301abec1 Author: Arend van Spriel Date: Tue Mar 1 10:56:55 2011 +0100 staging: brcm80211: remove usage of struct osl_info from util sources Most of the util source files do not need the osl_info anymore due to previous patches so usage of it has been removed. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit ff31c54c9d15261ca4780cd0ab5183589438143f Author: Arend van Spriel Date: Tue Mar 1 10:56:54 2011 +0100 staging: brcm80211: remove usage of struct osl_info for register access Register access to the device uses a flag in struct osl_info to determine whether to use memory mapped access or not. This check was not needed as it boils down to memory mapped for brcmsmac driver and not for brcmfmac driver. Only use of struct osl_info is reduced to keeping track of the number of allocated sk_buffs within the driver(s). Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 0005ae73cfe44ee42d0be12a12cc82bf982f518e Author: Kishore Kadiyala Date: Mon Feb 28 20:48:05 2011 +0530 OMAP: hsmmc: Rename the device and driver Modifying the device & driver name from "mmci-omap-hs" to "omap_hsmmc". Signed-off-by: Kishore Kadiyala Acked-by: Benoit Cousson Signed-off-by: Tony Lindgren commit 4621d5f8cb435b1ba74efe6e0a7125febb40186b Author: Kishore Kadiyala Date: Mon Feb 28 20:48:04 2011 +0530 OMAP: adapt hsmmc to hwmod framework OMAP2420 platform consists of mmc block as in omap1 and not the hsmmc block as present in omap2430, omap3, omap4 platforms. Removing all base address macro defines except keeping one for OMAP2420 and adapting only hsmmc device registration and driver to hwmod framework. Changes involves: 1) Remove controller reset in devices.c which is taken care of by hwmod framework. 2) Using omap-device layer to register device and utilizing data from hwmod data file for base address, dma channel number, Irq_number, device attribute. 3) Update the driver to use dev_attr to find whether controller supports dual volt cards Signed-off-by: Paul Walmsley Signed-off-by: Kishore Kadiyala Reviewed-by: Balaji T K Cc: Benoit Cousson CC: Kevin Hilman Cc: Tony Lindgren Signed-off-by: Tony Lindgren commit d8d0a61c658e252de3077f6076f13423642caf67 Author: Kishore Kadiyala Date: Mon Feb 28 20:48:03 2011 +0530 OMAP: hsmmc: Move mux configuration to hsmmc.c Moving the definition of mux setting API from devices.c to hsmmc.c and renaming it from "omap2_mmc_mux" to "omap_hsmmc_mux". Also calling "omap_hsmmc_mux" from omap2_hsmmc_init. Signed-off-by: Kishore Kadiyala Cc: Chris Ball commit 6ab8946f672497a55625d2106250d2923125fdfb Author: Kishore Kadiyala Date: Tue Mar 1 13:12:56 2011 -0800 OMAP: hwmod data: Add dev_attr and use in the host driver Add a device attribute to hwmod data of omap2430, omap3, omap4. Currently the device attribute holds information regarding dual volt MMC card support by the controller which will be later passed to the host driver via platform data. Signed-off-by: Kevin Hilman Signed-off-by: Kishore Kadiyala Acked-by: Benoit Cousson Signed-off-by: Tony Lindgren commit 17203bdaf2fd0cda6ac941a7b3fb8416c57303c7 Author: Anand Gadiyar Date: Tue Mar 1 13:12:56 2011 -0800 OMAP4: hwmod data: enable HSMMC Enabling hsmmc hwmod for OMAP4 Signed-off-by: Anand Gadiyar Signed-off-by: Kishore Kadiyala Acked-by: Benoit Cousson Signed-off-by: Tony Lindgren commit b163605e3f2051e0cbd378d46a91cab2563b7ebf Author: Paul Walmsley Date: Tue Mar 1 13:12:56 2011 -0800 OMAP3: hwmod data: Add HSMMC Update the omap3 hwmod data with the HSMMC info. Signed-off-by: Paul Walmsley Signed-off-by: Kevin Hilman Signed-off-by: Rajendra Nayak Signed-off-by: Kishore Kadiyala Cc: Benoit Cousson Signed-off-by: Tony Lindgren commit bce06f375644f8b28fbc1d261699fdfe459733ad Author: Paul Walmsley Date: Tue Mar 1 13:12:55 2011 -0800 OMAP2430: hwmod data: Add HSMMC Update the omap2430 hwmod data with the HSMMC info. Signed-off-by: Paul Walmsley Signed-off-by: Kevin Hilman Signed-off-by: Rajendra Nayak Cc: Benoit Cousson Signed-off-by: Tony Lindgren commit e08016d0f4fcfe038a402071ada3073c6ca8d62d Author: Anand Gadiyar Date: Tue Mar 1 13:12:55 2011 -0800 omap: mmc: split out init for 2420 The MMC controller on the OMAP2420 is different from those on the OMAP2430, OMAP3 and OMAP4 families - all of the latter are identical. The one on the OMAP2420 is closer to that on OMAP1 chips. Currently, the n8x0 is the only OMAP2420 platform supported in mainline which registers the MMC controller. Upcoming changes to register the controllers using hwmod data are potentially invasive. To reduce the risk, separate out the 2420 controller registration from the common init function and update its only user. Also seperating out mux settings for OMAP2420. Signed-off-by: Anand Gadiyar Signed-off-by: Kishore Kadiyala Cc: Tony Lindgren Cc: Madhusudhan Chikkature Cc: Chris Ball Signed-off-by: Tony Lindgren commit 751b3840d216f1ecd3b91ff5251bf7703b690cd8 Author: Axel Lin Date: Tue Mar 1 13:12:47 2011 +0800 pcmcia: synclink_cs: fix prototype for mgslpc_ioctl() The ioctl file pointer was removed in commit 6caa76 "tty: now phase out the ioctl file pointer for good". Thus fix the prototype for mgslpc_ioctl() and eliminate below warning: CC [M] drivers/char/pcmcia/synclink_cs.o drivers/char/pcmcia/synclink_cs.c:2787: warning: initialization from incompatible pointer type Signed-off-by: Axel Lin Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 60b0bf0f11a02a6c288c7a923b2521aa7cfdc6c3 Author: Yoshihiro Shimoda Date: Tue Mar 1 16:58:37 2011 +0900 usb: EHCI, OHCI: Add configuration for the SH USB controller The SH EHCI/OHCI driver hardcoded the CPU type in {ehci,ohci}-hcd.c. So if we will add the new CPU, we had to add to the hcd driver each time. The patch adds the CONFIG_USB_{EHCI,OHCI}_SH configuration. So if we want to use the SH EHCI/OHCI, we only enable the configuration. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit ad93562bdeecdded7d02eaaaf1aa5705ab57b1b7 Author: Andiry Xu Date: Tue Mar 1 14:57:05 2011 +0800 USB host: Move AMD PLL quirk to pci-quirks.c This patch moves the AMD PLL quirk code in OHCI/EHCI driver to pci-quirks.c, and exports the functions to be used by xHCI driver later. AMD PLL quirk disable the optional PM feature inside specific SB700/SB800/Hudson-2/3 platforms under the following conditions: 1. If an isochronous device is connected to OHCI/EHCI/xHCI port and is active; 2. Optional PM feature that powers down the internal Bus PLL when the link is in low power state is enabled. Without AMD PLL quirk, USB isochronous stream may stutter or have breaks occasionally, which greatly impair the performance of audio/video streams. Currently AMD PLL quirk is implemented in OHCI and EHCI driver, and will be added to xHCI driver too. They are doing similar things actually, so move the quirk code to pci-quirks.c, which has several advantages: 1. Remove duplicate defines and functions in OHCI/EHCI (and xHCI) driver and make them cleaner; 2. AMD chipset information will be probed only once and then stored. Currently they're probed during every OHCI/EHCI initialization, move the detect code to pci-quirks.c saves the repeat detect cost; 3. Build up synchronization among OHCI/EHCI/xHCI driver. In current code, every host controller enable/disable PLL only according to its own status, and may enable PLL while there is still isoc transfer on other HCs. Move the quirk to pci-quirks.c prevents this issue. Signed-off-by: Andiry Xu Cc: David Brownell Cc: Alex He Signed-off-by: Greg Kroah-Hartman commit 903ab86d195cca295379699299c5fc10beba31c7 Author: Herbert Xu Date: Tue Mar 1 02:36:48 2011 +0000 udp: Add lockless transmit path The UDP transmit path has been running under the socket lock for a long time because of the corking feature. This means that transmitting to the same socket in multiple threads does not scale at all. However, as most users don't actually use corking, the locking can be removed in the common case. This patch creates a lockless fast path where corking is not used. Please note that this does create a slight inaccuracy in the enforcement of socket send buffer limits. In particular, we may exceed the socket limit by up to (number of CPUs) * (packet size) because of the way the limit is computed. As the primary purpose of socket buffers is to indicate congestion, this should not be a great problem for now. Signed-off-by: Herbert Xu Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit f6b9664f8b711cf4fd53e70aa0d21f72d5bf806c Author: Herbert Xu Date: Tue Mar 1 02:36:48 2011 +0000 udp: Switch to ip_finish_skb This patch converts UDP to use the new ip_finish_skb API. This would then allows us to more easily use ip_make_skb which allows UDP to run without a socket lock. Signed-off-by: Herbert Xu Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 1c32c5ad6fac8cee1a77449f5abf211e911ff830 Author: Herbert Xu Date: Tue Mar 1 02:36:47 2011 +0000 inet: Add ip_make_skb and ip_finish_skb This patch adds the helper ip_make_skb which is like ip_append_data and ip_push_pending_frames all rolled into one, except that it does not send the skb produced. The sending part is carried out by ip_send_skb, which the transport protocol can call after it has tweaked the skb. It is meant to be called in cases where corking is not used should have a one-to-one correspondence to sendmsg. This patch also adds the helper ip_finish_skb which is meant to be replace ip_push_pending_frames when corking is required. Previously the protocol stack would peek at the socket write queue and add its header to the first packet. With ip_finish_skb, the protocol stack can directly operate on the final skb instead, just like the non-corking case with ip_make_skb. Signed-off-by: Herbert Xu Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 1470ddf7f8cecf776921e5ccee72e3d2b3d60cbc Author: Herbert Xu Date: Tue Mar 1 02:36:47 2011 +0000 inet: Remove explicit write references to sk/inet in ip_append_data In order to allow simultaneous calls to ip_append_data on the same socket, it must not modify any shared state in sk or inet (other than those that are designed to allow that such as atomic counters). This patch abstracts out write references to sk and inet_sk in ip_append_data and its friends so that we may use the underlying code in parallel. Signed-off-by: Herbert Xu Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 5a2ef92023506d4e9cd13617b5a46b4d0f1b6747 Author: Herbert Xu Date: Tue Mar 1 02:36:47 2011 +0000 inet: Remove unused sk_sndmsg_* from UFO UFO doesn't really use the sk_sndmsg_* parameters so touching them is pointless. It can't use them anyway since the whole point of UFO is to use the original pages without copying. Signed-off-by: Herbert Xu Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 9836f4080fd5b680cc2d9656355c1a7c681b1ffd Merge: e364a34 6d84b98 Author: David S. Miller Date: Tue Mar 1 12:24:04 2011 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 commit 0bbfeb8320421989d3e12bd95fae86b9ac0712aa Author: Justin TerAvest Date: Tue Mar 1 15:05:08 2011 -0500 cfq-iosched: Always provide group isolation. Effectively, make group_isolation=1 the default and remove the tunable. The setting group_isolation=0 was because by default we idle on sync-noidle tree and on fast devices, this can be very harmful for throughput. However, this problem can also be addressed by tuning slice_idle and possibly group_idle on faster storage devices. This change simplifies the CFQ code by removing the feature entirely. Signed-off-by: Justin TerAvest Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit 6fae9c25134baffbeeb20031479e7ff6f6d8eec0 Merge: c186794 f5412be Author: Jens Axboe Date: Tue Mar 1 15:04:39 2011 -0500 Merge commit 'v2.6.38-rc6' into for-2.6.39/core Conflicts: block/cfq-iosched.c Signed-off-by: Jens Axboe commit dcbc9169ed3ce7cd12328fec8b9eb9f7b91ce130 Author: Axel Lin Date: Tue Mar 1 17:24:34 2011 +0800 z2_battery: Add MODULE_DEVICE_TABLE The device table is required to load modules based on modaliases. After adding the MODULE_DEVICE_TABLE, below entry will be added to modules.alias: alias i2c:aer915 z2_battery Signed-off-by: Axel Lin Signed-off-by: Anton Vorontsov commit 84ab16f54bbde67c8c2aabc36b034c91044935cb Author: Axel Lin Date: Tue Mar 1 17:23:34 2011 +0800 ds2782_battery: Add MODULE_DEVICE_TABLE The device table is required to load modules based on modaliases. After adding the MODULE_DEVICE_TABLE, below entries will be added to modules.alias: alias i2c:ds2786 ds2782_battery alias i2c:ds2782 ds2782_battery Signed-off-by: Axel Lin Signed-off-by: Anton Vorontsov commit f3da0dee31689130a06f12f06575c7a5b62421ad Author: Axel Lin Date: Tue Mar 1 17:22:33 2011 +0800 bq20z75: Add MODULE_DEVICE_TABLE The device table is required to load modules based on modaliases. After adding the MODULE_DEVICE_TABLE, below entry will be added to modules.alias: alias i2c:bq20z75 bq20z75 Signed-off-by: Axel Lin Signed-off-by: Anton Vorontsov commit 35c9d267665230cf44445be616d491d3763a5cd3 Author: Rhyland Klein Date: Mon Feb 28 16:55:31 2011 -0800 power_supply: Update power_supply_is_watt_property Update the power_supply_is_watt_property function to include POWER_NOW. Signed-off-by: Rhyland Klein Signed-off-by: Anton Vorontsov commit ff28fcef1bedcfbdf49500fee1573dc2f3eedb22 Author: Rhyland Klein Date: Mon Feb 28 16:55:29 2011 -0800 bq20z75: Add i2c retry mechanism With the support of platform data, now adding support for option i2c retries on read/write failures. Ths is specified through the optional platform data. Signed-off-by: Rhyland Klein Signed-off-by: Anton Vorontsov commit bb879101606dd7235d8f4ecd0f707b63281d0838 Author: Rhyland Klein Date: Mon Feb 28 16:55:28 2011 -0800 bq20z75: Add optional battery detect gpio Adding support for an optional gpio for battery detection. This is passed in through the i2c platform data. It also accepts another field, battery_detect_present to signify the gpio state which means the battery is present, either 0 (low) or 1 (high). Signed-off-by: Rhyland Klein Signed-off-by: Anton Vorontsov commit e8b2c3c47a53348aebbbeb5322e32937df958793 Author: Chris Wilson Date: Tue Mar 1 19:22:52 2011 +0000 drm/i915: Re-enable GPU semaphores for SandyBridge mobile This seems to be running stably on my test laptop, so hopefully the reported hangs where just symptoms of other bugs. Signed-off-by: Chris Wilson commit e46395a4b3d32d161d8b6d8e4a002972b1faae3e Author: Johannes Berg Date: Tue Mar 1 17:18:26 2011 +0100 mac80211: make rate control Kconfig warning depend on mac80211 ... Otherwise it is displayed when mac80211 isn't even turned on, which is completely pointless. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 27b4eb26cd06df0192781b0615719b324e30d1cd Author: RafaÅ‚ MiÅ‚ecki Date: Tue Mar 1 13:28:36 2011 +0100 b43: N-PHY: rev3+: add static tables This finally makes TX on OFDM rates possible on my dev with PHY rev 4. We still have lower performance than wl, but at least speeds around 15M become possible. Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit 375ff4c7780e88bc4e0de4145099a7ed9aa57995 Author: Chaoming Li Date: Mon Feb 28 16:40:28 2011 -0600 rtlwifi: Fix error registering rate-control When a second module such as rtl8192ce or rtl8192cu links to rtlwifi, the attempt to register a rate-control mechanism fails with the warning shown below. The fix is to select the RC mechanism when rtlwifi is initialized. WARNING: at net/mac80211/rate.c:42 ieee80211_rate_control_register+0xc9/0x100 [mac80211]() Hardware name: HP Pavilion dv2700 Notebook PC Modules linked in: arc4 ecb rtl8192ce rtl8192cu(+) rtl8192c_common rtlwifi snd_hda_codec_conexant amd74xx(+) ide_core sg mac80211 snd_hda_intel snd_hda_codec i2c_nforce2 snd_pcm snd_timer cfg80211 snd k8temp hwmon serio_raw joydev i2c_core soundcore snd_page_alloc rfkill forcedeth video ac battery button ext3 jbd mbcache sd_mod ohci_hcd ahci libahci libata scsi_mod ehci_hcd usbcore fan processor thermal Pid: 2227, comm: modprobe Not tainted 2.6.38-rc6-wl+ #468 Call Trace: [] ? warn_slowpath_common+0x7a/0xb0 [] ? warn_slowpath_null+0x15/0x20 [] ? ieee80211_rate_control_register+0xc9/0x100 [mac80211] [] ? rtl_rate_control_register+0x10/0x20 [rtlwifi] [] ? rtl_init_core+0x189/0x620 [rtlwifi] [] ? __raw_spin_lock_init+0x38/0x70 [] ? rtl_usb_probe+0x709/0x82e [rtlwifi] [] ? usb_match_one_id+0x3d/0xc0 [usbcore] [] ? usb_probe_interface+0xb9/0x160 [usbcore] [] ? driver_probe_device+0x89/0x1a0 [] ? __driver_attach+0xa3/0xb0 [] ? __driver_attach+0x0/0xb0 [] ? bus_for_each_dev+0x5e/0x90 [] ? driver_attach+0x19/0x20 [] ? bus_add_driver+0x158/0x290 [] ? driver_register+0x71/0x140 [] ? __raw_spin_lock_init+0x38/0x70 [] ? usb_register_driver+0xdc/0x190 [usbcore] [] ? rtl8192cu_init+0x0/0x20 [rtl8192cu] [] ? rtl8192cu_init+0x1e/0x20 [rtl8192cu] [] ? do_one_initcall+0x3f/0x180 [] ? sys_init_module+0xbb/0x200 [] ? system_call_fastpath+0x16/0x1b ---[ end trace 726271c07a47439e ]--- rtlwifi:rtl_init_core():<0-0> rtl: Unable to register rtl_rc,use default RC !! ieee80211 phy0: Selected rate control algorithm 'minstrel_ht' Signed-off-by: Chaoming Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 3af6334c9e4fbf41ef0ebd3b4d5762f26b675c40 Author: Felix Fietkau Date: Sun Feb 27 22:08:01 2011 +0100 mac80211: add support for showing the last rx bitrate Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c8dcfd8a046c1f49af0c15726761af17b957962d Author: Felix Fietkau Date: Sun Feb 27 22:08:00 2011 +0100 cfg80211: add a field for the bitrate of the last rx data packet from a station Also fix a typo in the STATION_INFO_TX_BITRATE description Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e7a2a4f5e61ccfae03185384e06b852dbb1e3630 Author: Sujith Manoharan Date: Sun Feb 27 09:20:40 2011 +0530 ath9k_htc: Handle BSSID/AID for multiple interfaces The AID and BSSID should be set in the HW only for the first station interface or adhoc interface. Also, cancel the ANI timer in stop() for multi-STA scenario. And finally configure the HW beacon timers only for the first station interface. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 8692d00e996ed2a6560702623e5cb646da0f9767 Author: Chris Wilson Date: Sat Feb 5 10:08:21 2011 +0000 drm/i915: Replace vblank PM QoS with "Interrupt-Based AGPBUSY#" I stumbled over this magic bit in the gen3 INSTPM: Bit11 Interrupt-Based AGPBUSY# Enable: ‘0’ = Pending GMCH interrupts will not cause AGPBUSY# assertion. ‘1’ = Pending GMCH interrupts will cause AGPBUSY# assertion and hence can cause the CPU to exit C3. There is no suppression of cacheable writes. Note that in either case in C3 the interrupts are not lost. They will be forwarded to the ICH when the GMCH is out of C3. Signed-off-by: Chris Wilson Tested-by: Daniel Vetter Cc: stable@kernel.org commit 60c8bdf64a80ebb0132172ea97bd54d7c7d36611 Author: Chris Wilson Date: Sat Feb 5 10:15:37 2011 +0000 Revert "drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU" Using PM latency request turns out to be very fragile and only works for some systems, depending upon the ACPI implementation. However, I've stumbled across a promising bit in INSTPM: "Interrupt-Based AGPBUSY#". This reverts commit b0b544cd37c060e261afb2cf486296983fcb56da. Signed-off-by: Chris Wilson commit 716b50a31fb237c480e67ad66dc23feb35d40772 Author: Hayes Wang Date: Tue Feb 22 17:26:18 2011 +0800 r8169: adjust rtl8169_set_speed_xmii function. - adjust code of rtl8169_set_speed_xmii function - remove parts of code which are done in rtl_pll_power_up function (8168 only) Signed-off-by: Hayes Wang Acked-by: Francois Romieu commit 9f15444fefdb33509132ff5c9be60cb315c44cb2 Author: Tobias Klauser Date: Fri Feb 18 09:10:01 2011 +0100 tty: serial: altera_jtaguart: Add device tree support Advertise the possibility to use this driver with device tree if CONFIG_OF is set. Signed-off-by: Tobias Klauser Signed-off-by: Grant Likely commit 7c9325d79a3c3d51c98812161d47876d6830c062 Author: Tobias Klauser Date: Fri Feb 18 11:35:32 2011 +0100 tty: serial: altera_uart: Add devicetree support With the recent switch of the (currently still out-of-tree) Nios2 Linux port to devicetree we want to be able to retrieve the resources and properties from dts. The old method to retrieve resources and properties from platform data is still supported. Signed-off-by: Tobias Klauser Acked-by: Greg Kroah-Hartman Signed-off-by: Grant Likely commit d714d1979d7b4df7e2c127407f4014ce71f73cd0 Author: Grant Likely Date: Tue Feb 22 20:22:44 2011 -0700 dt: eliminate of_platform_driver shim code Commit eca393016, "of: Merge of_platform_bus_type with platform_bus_type" added a shim to allow of_platform_drivers to get registers onto the platform bus so that there was time to migrate the existing drivers to the platform_bus_type. This patch removes the shim since there are no more users of the old interface. Signed-off-by: Grant Likely commit f635bd11c8d332d917fb9a4cad3071b2357d5b2a Author: Henrik Rydberg Date: Thu Feb 24 19:30:59 2011 +0100 HID: Do not create input devices for feature reports When the multi input quirk is set, there is a new input device created for every feature report. Since the idea is to present features per hid device, not per input device, revert back to the original report loop and change the feature_mapping() callback to not take the input device as argument. Signed-off-by: Henrik Rydberg Tested-by: Benjamin Tissoires Signed-off-by: Jiri Kosina commit 271d81b84171d84723357ae6d172ec16b0d8139c Author: Chris Wilson Date: Tue Mar 1 15:24:41 2011 +0000 drm/i915: Allow relocation deltas outside of target bo Userspace has a legitimate requirement to use a delta that points to outside of the target bo, and so we need to enable this. (As this is an abi break, albeit a relaxation of the current restrictions, mark the change with a new flag.) Signed-off-by: Chris Wilson commit 5d9faa16a73f3317177ec42d5b5d826947458eb9 Author: Chris Wilson Date: Tue Mar 1 15:28:47 2011 +0000 drm/i915: Silence an innocuous compiler warning for an unused variable drivers/gpu/drm/i915/i915_irq.c: In function ‘ironlake_irq_postinstall’: drivers/gpu/drm/i915/i915_irq.c:1618: warning: unused variable ‘pipe’ Signed-off-by: Chris Wilson commit 53689ac1b677532be666a779e24b0ac9bd266354 Author: Keshava Munegowda Date: Tue Mar 1 20:08:22 2011 +0530 arm: omap: usb: clock entries for omap3 and omap4 The devices of clocks are set to usbhs, so that only usbhs common driver can invoke these clocks. The dummy per port clocks are added to omap3 clock data base. This helps to invoke common clock get APIs for omap3 and omap4. Signed-off-by: Keshava Munegowda Signed-off-by: Felipe Balbi commit 19403165c272cc4ed00c97973e7271714b009708 Author: Keshava Munegowda Date: Tue Mar 1 20:08:21 2011 +0530 usb: host: omap: ehci and ohci simplification The ehci and ohci drivers are simplified; Since UHH and TLL initialization, clock handling are done by common usbhs core driver, these functionalities are removed from ehci and ohci drivers. Signed-off-by: Keshava Munegowda Signed-off-by: Felipe Balbi commit 3b68ae73d8afa925807ebaae7eb14e2afd43f5b5 Author: Keshava Munegowda Date: Tue Mar 1 20:08:20 2011 +0530 arm: omap: usb: cleanup ehci and ohci resources and devices The prototype and defination of functions usb_ehci_init and usb_ohci_init are removed. The ehci and ohci devices are removed since usbhs device contains both ehci and ohci details. Signed-off-by: Keshava Munegowda Signed-off-by: Felipe Balbi commit 9e64bb1e9f0613093b3e34ac5402fcfef0dcc35a Author: Keshava Munegowda Date: Tue Mar 1 20:08:19 2011 +0530 arm: omap: usb: Invoke usbhs core device initialization The usbhs intialization is invoked by all omap3 and omap4 variant board files. Signed-off-by: Keshava Munegowda Signed-off-by: Felipe Balbi commit 2236396d4d23828a0875a4d447103d0ab48aed0b Author: Keshava Munegowda Date: Tue Mar 1 20:08:18 2011 +0530 arm: omap: usb: usbhs core device initialization A new usbhs platform device is defined; this device will be the parent device of ehci and ohci platform devices. the usbhs_init function is defined which does the usbhs device initialization and I/O mux of ehci and ohci. Signed-off-by: Keshava Munegowda Signed-off-by: Felipe Balbi commit 17cdd29d6e1ab4164c792d78c6f096fbafb94e3f Author: Keshava Munegowda Date: Tue Mar 1 20:08:17 2011 +0530 usb: host: omap: common usb host core driver enabling and disabling the common clocks for ehci and ohci is implemented. usbhs is a common parent platform driver for EHCI and OHCI driver. This driver receives the clock enable and disable requests from ehci and ohci drivers.The UHH and TLL initialization is also performed. Signed-off-by: Keshava Munegowda Signed-off-by: Felipe Balbi commit 181b250cf53233a7a7c6d7e1e9df402506712e93 Author: Keshava Munegowda Date: Tue Mar 1 20:08:16 2011 +0530 arm: omap: usb: create common enums and structures for ehci and ohci Create the ehci and ohci specific platform data structures. The port enum values are made common for both ehci and ohci. Signed-off-by: Keshava Munegowda Signed-off-by: Felipe Balbi commit a8480ea0bedbf049423a4caa9b09d371614c07dc Author: Felipe Balbi Date: Tue Mar 1 20:08:15 2011 +0530 arm: omap2: usb: rename usb-ehci.c to usb-host.c We already have both EHCI and OHCI there, so let's rename to be sure everybody will understand the entire USB HOST functionality is setup on this file. Signed-off-by: Felipe Balbi commit 09f0607d8be62469a9b33034c8d3def9a5c7cbb7 Author: Felipe Balbi Date: Tue Mar 1 20:08:14 2011 +0530 usb: host: omap: switch to platform_get_resource_byname now that we have names on all memory bases, we can switch to use platform_get_resource_byname() which will make it simpler when we move to a setup where OHCI and EHCI on OMAP play well together. Signed-off-by: Felipe Balbi commit a9031e5f0b82225ea676d729d68beb6c69799a67 Author: Felipe Balbi Date: Tue Mar 1 20:08:13 2011 +0530 arm: omap: usb: host: add names to resources add names to EHCI and OHCI resources. That will help us identify the resource correctly when moving to a setup where OHCI and EHCI play well together. Signed-off-by: Felipe Balbi commit 87ecc73b3d74ca70100e7100313c005fa471f177 Author: Anand Gadiyar Date: Wed Feb 16 15:43:14 2011 +0530 usb: ehci: omap: add support for TLL mode on OMAP4 The EHCI controller in OMAP4 supports a transceiver-less link mode (TLL mode), similar to the one in OMAP3. On the OMAP4 however, there are an additional set of clocks that need to be turned on to get this working. Request and configure these for each port if that port is connected in TLL mode. Signed-off-by: Anand Gadiyar Cc: Greg Kroah-Hartman Signed-off-by: Felipe Balbi commit 19f52522c426b50e934d5fbd0bf759058f03cc60 Author: Justin P. Mattock Date: Thu Feb 24 22:09:35 2011 -0800 arch/arm/Kconfig: remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Acked-by: Tony Lindgren Signed-off-by: Jiri Kosina commit 9b4f06fae48765650f3ac9c876bc629d804bd763 Author: Tobias Klauser Date: Mon Feb 28 10:32:22 2011 +0100 asm-generic/user.h: Fix spelling in comment Fix two misspellings. Signed-off-by: Tobias Klauser Signed-off-by: Jiri Kosina commit 62f288cfe1c6257afe6ddfdff153c3803e8cdd72 Author: Paul Bolle Date: Sat Feb 19 22:34:00 2011 +0100 drm: fix printk typo 'sracth' Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina commit ae0e47f02aaedbfdd5e4bec73f79b714d758223d Author: Justin P. Mattock Date: Tue Mar 1 15:06:02 2011 +0100 Remove one to many n's in a word Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 5807806a92450fd57f8063868efae9d4af74db02 Author: Arnaldo Carvalho de Melo Date: Tue Mar 1 10:43:03 2011 -0300 perf top tui: Wait till the first sample to refresh the screen. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 374cfe56892701f062586d6a6de6cb71777a4184 Author: Arnaldo Carvalho de Melo Date: Tue Mar 1 10:27:27 2011 -0300 perf top: Fix reporting of invalid --vmlinux Using ui__warning, that will, in --tui, show a window with the message, waiting for the user to press Ok. Also run exit_browser() to let newt do its final cleaning of the screen. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a1ceb741cf86ef433006379742db81c00b450bae Author: Arnaldo Carvalho de Melo Date: Tue Mar 1 10:24:43 2011 -0300 perf tui: Make ui__warning modal By taking the ui__lock so that no other screen updates take place while waiting for the user. That was happening when handling an invalid --vmlinux parameter in 'perf top --tui', with the screen refresh routine repainting the screen and removing the warning window. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 3166fc8fb6a2f52273d545e970297524e02c3e39 Author: Arnaldo Carvalho de Melo Date: Tue Mar 1 10:21:44 2011 -0300 perf top browser: Handle empty active symbols list Fixing a SEGV. An empty list could happen when not being able to resolve symbols, for instance when --vmlinux invalid-file is used. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 2301dfa7be2cb3e6bdd07cc1cb349b5853c4d5ee Author: Sascha Hauer Date: Tue Jan 25 11:58:15 2011 +0100 ARM: mxs: Add pwm clocks and device registration Signed-off-by: Sascha Hauer Signed-off-by: Uwe Kleine-König commit 78159566b7ec120a1020cfc9469ac526bdd05387 Author: Uwe Kleine-König Date: Wed Jan 19 11:37:10 2011 +0100 ARM: mxc: add a dma mask to fec devices This is not strictly necessary but the right thing to do. Signed-off-by: Uwe Kleine-König commit f4b5d2b0d1df863eab004e42b4492fce6ccc52b2 Author: Lothar Waßmann Date: Wed Dec 15 22:20:13 2010 +0100 ARM: mxs: add a dma mask to fec devices This is not strictly necessary but the right thing to do. Signed-off-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit c762b293d4a12fb726cec62cfe3e64f66cf3103f Author: Uwe Kleine-König Date: Fri Feb 18 21:59:25 2011 +0100 ARM: mxc: free dma_mask in error path This fixes a small memory leak that was only hit in very unlikely error paths Signed-off-by: Uwe Kleine-König commit 84082d665dc62e632e21213fda8b22c0b8c25b81 Author: Lothar Waßmann Date: Wed Dec 15 22:11:31 2010 +0100 ARM: mxs: free dma_mask in error path This fixes a small memory leak that was only hit in very unlikely error paths. Signed-off-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit 8c3f2d7a2df5b3ad020571cacb1824f8df4768fd Author: Eric Bénard Date: Fri Feb 25 14:38:29 2011 +0100 cpuimx51sd: mcp2515 supports up to 10MHz SPI clock Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 33d3487f557ea6787b1a8166b1ed123bb2136619 Author: Eric Bénard Date: Fri Feb 25 15:04:14 2011 +0100 cpuimx51sd: fix tsc2007 - wrong MUX was set before for IRQ - get_pendown_state is no more needed Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit b137214692effb1bc2221de8ccb11c09fb9df6f2 Author: Eric Bénard Date: Fri Feb 25 14:38:27 2011 +0100 cpuimx51sd: add cpufreq support Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 2c4066cca46e2e82b63127a3dba5e5f68a612749 Author: Eric Bénard Date: Fri Feb 25 13:48:15 2011 +0100 eukrea-tlv320: add MBIMXSD51 support Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit d4abe93386890061f109f2f2a46761ac5129bed6 Author: Wolfram Sang Date: Wed Feb 23 14:51:58 2011 +0100 arm: mach-mx3: use IMX_GPIO_NR instead of hard-coded values The latter are error-prone because the bank number is one less than one would read in the documentation. Signed-off-by: Wolfram Sang Acked-by: Eric Benard Cc: Sascha Hauer Signed-off-by: Sascha Hauer commit bfc39061d3dbf812e6a78f9529a548e5f0050c64 Author: Jan Beulich Date: Tue Mar 1 11:14:55 2011 +0000 um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S arch/um/Kconfig.x86 has X86_32 but not X86_64 - that's resulting in asm/dwarf2.h producing the 32-bit (pushl_cfi & Co) macros instead of the 64-bit ones. Signed-off-by: Jan Beulich Cc: Jeff Dike LKML-Reference: <4D6CE3400200007800034498@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit c88ba39c1ea6a1591b6842199069ff50748d2073 Author: Huzaifa Sidhpurwala Date: Tue Mar 1 15:54:22 2011 +0530 usb: musb: tusb: Fix possible null pointer dereference in tusb6010_omap.c tusb_dma was being dereferenced when it was nul Signed-off-by: Huzaifa Sidhpurwala Signed-off-by: Felipe Balbi commit 70045c57f31f998a7206baa81167c7bc9f452cef Author: Hema HK Date: Mon Feb 28 15:05:29 2011 +0530 usb: musb: OMAP3xxx: Fix device detection in otg & host mode In OMAP3xxx with OTG mode or host only mode, When the device is inserted after the gadget driver loading the enumeration was not through. This is because the mentor controller will start sensing the ID PIN only after setting the session bit. So after ID-GND, need to set the session bit for mentor to get it configured as A device. This is a fix to set the session bit again in ID_GND notification handler. Tested with OMAP3630Zoom3 platform. Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit fb91cde49c327ff957c55d91805bc6abda59b311 Author: Hema HK Date: Mon Feb 28 14:19:35 2011 +0530 usb: musb: OMAP4430: Power down the PHY during board init Powerdown the internal PHY during board init for OMAP44xx. So that when musb is disabled core transition to retention/off is not blocked. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 8c59ef38119102ccd2a8db6f19a8864a7c8d4e73 Author: Hema HK Date: Mon Feb 28 14:19:36 2011 +0530 usb: otg: OMAP4430: Save/restore the context Add the context save/restore for the control module register used for OMAP4430 musb with UTMI embedded PHY interface. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 37db3af11f02c2ccdf44a788694da16062a0333c Author: Hema HK Date: Mon Feb 28 14:19:32 2011 +0530 usb: otg: TWL4030: Update the last_event variable. Update the last_event variable of otg_transceiver. This will be used in the musb platform glue driver for runtime idling the device. Signed-off-by: Hema HK Cc: Felipe Balbi Signed-off-by: Felipe Balbi commit 7acc6197b76edd0b932a7cbcc6cfad0a8a87f026 Author: Hema HK Date: Mon Feb 28 14:19:34 2011 +0530 usb: musb: Idle path retention and offmode support for OMAP3 This patch supports the retention and offmode support in the idle path for musb driver using runtime pm APIs. This is restricted to support offmode and retention only when device not connected.When device/cable connected with gadget driver loaded,configured to no idle/standby which will not allow the core transition to retention or off. There is no context save/restore done by hardware for musb in OMAP3 and OMAP4,driver has to take care of saving and restoring the context during offmode. Musb has a requirement of configuring sysconfig register to force idle/standby mode and set the ENFORCE bit in module STANDBY register for retention and offmode support. Runtime pm and hwmod frameworks will take care of configuring to force idle/standby when pm_runtime_put_sync is called and back to no idle/standby when pm_runeime_get_sync is called. Compile, boot tested and also tested the retention in the idle path on OMAP3630Zoom3. And tested the global suspend/resume with offmode enabled. Usb basic functionality tested on OMAP4430SDP. There is some problem with idle path offmode in mainline, I could not test with offmode. But I have tested this patch with resetting the controller in the idle path when wakeup from retention just to make sure that the context is lost, and restore path is working fine. Removed .suspend/.resume fnction pointers and functions because there is no need of having these functions as all required work is done at runtime in the driver. There is no need to call the runtime pm api with glue driver device as glue layer device is the parent of musb core device, when runtime apis are called for the child, parent device runtime functionality will be invoked. Design overview: pm_runtime_get_sync: When called with musb core device takes care of enabling the clock, calling runtime callback function of omap2430 glue layer, runtime call back of musb driver and configure the musb sysconfig to no idle/standby pm_runtime_put: Takes care of calling runtime callback function of omap2430 glue layer, runtime call back of musb driver, Configure the musb sysconfig to force idle/standby and disable the clock. During musb driver load: Call pm_runtime_get_sync. End of musb driver load: Call pm_runtime_put During gadget driver load: Call pm_runtime_get_sync, End of gadget driver load: Call pm_runtime_put if there is no device or cable is connected. During unload of the gadget driver:Call pm_runtime_get_sync if cable/device is not connected. End of the gadget driver unload : pm_runtime_put During unload of musb driver : Call pm_runtime_get_sync End of unload: Call pm_runtime_put On connect of usb cable/device -> transceiver notification(VBUS and ID-GND): pm_runtime_get_sync only if the gadget driver loaded. On disconnect of the cable/device -> Disconnect Notification: pm_runtime_put if the gadget driver is loaded. Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit da68ccec210c45eb99e461ad31b499b4e7043c41 Author: Hema HK Date: Mon Feb 28 14:19:33 2011 +0530 usb: musb: Remove platform context save/restore API For OMAP3 and OMAP4 for offmode and retention support, musb sysconfig is configured to force idle and standby with ENABLE_FORCE bit of OTG_FORCESTNDBY set. And on wakeup configure to no ilde/standby with resetting the ENABLE_FORCE bit. There is not need to save and restore of this register anymore so removed omap2430_save_context/omap2430_restore_context functions. and also removed otg_forcestandby member of musb_context_registers structure Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit 4cbbf084436caddeb815534df4ebaa018c970196 Author: Felipe Balbi Date: Mon Feb 28 10:44:50 2011 +0200 usb: musb: gadget: fix list_head usage commit ad1adb89a0d9410345d573b6995a1fa9f9b7c74a (usb: musb: gadget: do not poke with gadget's list_head) fixed a bug in musb where it was corrupting the list_head which is supposed to be used by gadget drivers. While doing that, I forgot to fix the usage in musb_gadget_dequeue() method. Fix that. Reported-by: Pavol Kurina Signed-off-by: Felipe Balbi commit 486af1896f3a4a388410215c5a2014b9d09a79f5 Author: Dave Airlie Date: Tue Mar 1 14:32:27 2011 +1000 drm/radeon: add new getparam for number of backends. This allows userspace to work out how many DBs there are for conditional rendering to work. Signed-off-by: Dave Airlie commit 91132d6bb6481da7c8280905a5db424885c458d0 Author: Dave Airlie Date: Tue Mar 1 13:40:06 2011 +1000 drm/radeon: fix up dereferencing of busy objects. This could free things twice, just deref the GEM object and hope its enough. Signed-off-by: Dave Airlie commit a61f2bc47256a32c56f49f1e9b9f4468387e0299 Author: Dave Airlie Date: Tue Mar 1 12:10:43 2011 +1000 drm/radeon: bump version to 2.9 This lets r600g enable texture formats and some more extensions. Signed-off-by: Dave Airlie commit 2a19cac8f9abf66c3b7b3b6e741b967570773215 Author: Dave Airlie Date: Mon Feb 28 16:11:48 2011 +1000 drm/r600: parse the set predication command. (v2) This is required for NV_conditional_render and EXT_transform_feedback. v2: add evergreen support. Signed-off-by: Dave Airlie commit b7e14fea4413440b9054b7fb1628bb9c545c509c Author: Xiaochen Wang Date: Mon Feb 28 16:13:07 2011 +0800 Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches This patch fixes a spelling mistake in Documentation/zh_CN/SubmittingPatches. Signed-off-by: Xiaochen Wang Signed-off-by: Harry Wei Signed-off-by: Greg Kroah-Hartman commit d105e74eff7f8197b4d8e104e347ffbc5c3989b8 Author: Davidlohr Bueso Date: Sun Feb 27 04:58:48 2011 -0300 USB: ffs-test: fix header path When compiling this program the functionfs.h header cannot be found, producing: ffs-test.c:40: fatal error: linux/usb/functionfs.h: No such file or directory This patch also fixes the following warning: ffs-test.c:453: warning: format ‘%4d’ expects type ‘int’, but argument 3 has type ‘size_t’ Signed-off-by: Davidlohr Bueso Signed-off-by: Greg Kroah-Hartman commit 6960f40a954619857e7095a6179eef896f297077 Author: Jiri Slaby Date: Mon Feb 28 10:34:06 2011 +0100 USB: serial/kobil_sct, fix potential tty NULL dereference Make sure that we check the return value of tty_port_tty_get. Sometimes it may return NULL and we later dereference that. The only place here is in kobil_read_int_callback, so fix it. Signed-off-by: Jiri Slaby Cc: Alan Cox Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman commit f7d7aedfcd4e20e7dfc7356d30cc22dc0b0f493e Author: Jiri Slaby Date: Mon Feb 28 10:34:05 2011 +0100 USB: serial/keyspan_pda, fix potential tty NULL dereferences Make sure that we check the return value of tty_port_tty_get. Sometimes it may return NULL and we later dereference that. There are several places to check. For easier handling, tty_port_tty_get is moved directly to the palce where needed in keyspan_pda_rx_interrupt. Signed-off-by: Jiri Slaby Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 7adc14b14b43b6ca9f2f00ac7a4780577dbe883b Author: Arvid Brodin Date: Sat Feb 26 22:08:47 2011 +0100 usb/isp1760: Handle toggle bit in queue heads only Remove redundant "toggle" member from struct isp1760_qtd, and store toggle status in struct isp1760_qh only. Signed-off-by: Arvid Brodin Signed-off-by: Greg Kroah-Hartman commit 65f1b5255ce0e657e4d8de92098837d36831320a Author: Arvid Brodin Date: Sat Feb 26 22:07:35 2011 +0100 usb/isp1760: Replace period calculation for INT packets with something readable Replace the period calculation for INT packets with something readable. Seems to fix a rare bug with quickly repeated insertion/removal of several USB devices simultaneously (hub control INT packets). Signed-off-by: Arvid Brodin Signed-off-by: Greg Kroah-Hartman commit 6bda21bc0941c11f07cbf436ff6ca85e7e6e47f0 Author: Arvid Brodin Date: Sat Feb 26 22:06:37 2011 +0100 usb/isp1760: Consolidate printouts and remove unused code Consolidate printouts to use dev_XXX functions instead of an assortment of printks and driver specific macros. Remove some unused code snippets and struct members. Remove some unused function parameters and #defines. Change the "queue_entry" variable name which has different but related meanings in different places and use "slot" only. Signed-off-by: Arvid Brodin Signed-off-by: Greg Kroah-Hartman commit bbaa387674b65a2f784631cc4c87c77ec9d3374e Author: Arvid Brodin Date: Sat Feb 26 22:05:26 2011 +0100 usb/isp1760: Remove redundant "data_buffer" member from struct inter_packet_info Signed-off-by: Arvid Brodin Signed-off-by: Greg Kroah-Hartman commit a041d8e4375ee6d78409a721221878dcad5eff8a Author: Arvid Brodin Date: Sat Feb 26 22:04:40 2011 +0100 usb/isp1760: Clean up payload address handling Encapsulate payload addresses within qtds. Signed-off-by: Arvid Brodin Signed-off-by: Greg Kroah-Hartman commit fd436aee97d157ff6441e7aaff2a2dc802765b5b Author: Arvid Brodin Date: Sat Feb 26 22:03:49 2011 +0100 usb/isp1760: Remove redundant variables and defines Removes the redundant hw_next list pointer from struct isp1760_qtd, removes some unused #defines, removes redundant "urb" member from struct inter_packet_info. Signed-off-by: Arvid Brodin Signed-off-by: Greg Kroah-Hartman commit bedc0c31ac3db828e6ade7a8c5cb708688f0a7e1 Author: Arvid Brodin Date: Sat Feb 26 22:02:57 2011 +0100 usb/isp1760: Move to native-endian ptds This helps users with platform-bus-connected isp176xs, big-endian cpu, and missing byteswapping on the data bus. It does so by collecting all SW byteswaps in one place and also fixes a bug with non-32-bit io transfers on this hardware, where payload has to be byteswapped instead of ptds. Signed-off-by: Arvid Brodin Signed-off-by: Greg Kroah-Hartman commit 6d42fcdb685e3b7af45c77181537db4bc1a715f9 Author: Justin P. Mattock Date: Sat Feb 26 20:33:56 2011 -0800 usb: core: hub.c Remove one to many n's in a word. The Patch below removes one to many "n's" in a word.. Signed-off-by: Justin P. Mattock CC: Alan Stern CC: linux-usb@vger.kernel.org Signed-off-by: Greg Kroah-Hartman commit 06125beb41af06fd197a7d216d57aa32b83f6cbd Author: Justin P. Mattock Date: Sat Feb 26 20:33:57 2011 -0800 usb: host: uhci-hcd.c Remove one to many n's in a word. The Patch below removes one to many "n's" in a word.. Signed-off-by: Justin P. Mattock CC: Alan Stern CC: linux-usb@vger.kernel.org Signed-off-by: Greg Kroah-Hartman commit cecf826df8648c843ea8db63b1f82c154a74db36 Author: Jeff Mahoney Date: Thu Feb 24 14:49:00 2011 -0500 staging: winbond: needs for msleep and friends linux/delay.h is pulled in somehow on x86 but not on ia64 or powerpc. This fixes a build failure on those arches since they use [mu]delay. Signed-off-by: Jeff Mahoney Cc: stable Signed-off-by: Greg Kroah-Hartman commit c0365f04f65e2055caefbf0971d4f23969af47ee Author: Javier Martinez Canillas Date: Sun Feb 27 21:54:14 2011 +0100 staging: brcm80211: Add buf_size parameter to ampdu_action handler function struct ieee80211_ops.ampdu_action function pointer definition now includes a u8 buf_size parameter. Update wl_ops_ampdu_action handler function according to this new signature. Signed-off-by: Javier Martinez Canillas Signed-off-by: Greg Kroah-Hartman commit f4728c386ce4f57affe6096b8d216bdd899958d6 Author: Stanislav Fomichev Date: Sun Feb 27 23:28:21 2011 +0300 brcm80211: replace broadcom specific defines AMPDU_RX_FACTOR_64K -> IEEE80211_HT_MAX_AMPDU_64K AMPDU_RX_FACTOR_32K -> IEEE80211_HT_MAX_AMPDU_32K DOT11_MAX_KEY_SIZE -> WLAN_MAX_KEY_LEN HT_CAP_MIMO_PS_MASK -> IEEE80211_HT_CAP_SM_PS HT_CAP_MAX_AMSDU -> IEEE80211_HT_CAP_MAX_AMSDU HT_CAP_RX_STBC_MASK -> IEEE80211_HT_CAP_RX_STBC HT_CAP_RX_STBC_SHIFT -> IEEE80211_HT_CAP_RX_STBC_SHIFT HT_PARAMS_RX_FACTOR_MASK -> IEEE80211_HT_AMPDU_PARM_FACTOR Signed-off-by: Stanislav Fomichev Acked-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit fd4bd42ead80c26877e54072a546290dfcb1576c Author: Stanislav Fomichev Date: Sun Feb 27 23:28:19 2011 +0300 staging: brcm80211: replace broadcom specific auth related defines - DOT11_OPEN_SYSTEM -> WLAN_AUTH_OPEN - DOT11_SHARED_KEY -> WLAN_AUTH_SHARED_KEY - remove unused DOT11_MGMT_HDR_LEN Signed-off-by: Stanislav Fomichev Acked-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 2f7cf8d1ef94a450c5d147cb0c5e1fdf1542a96d Author: Roel Van Nyen Date: Sun Feb 27 23:20:24 2011 +0100 staging: keucr: Change the custom counting functions to hweight8 and hweight16 Change the custom counting functions to hweight8 and hweight16 Signed-off-by: Roel Van Nyen Signed-off-by: Greg Kroah-Hartman commit 0e83f46d3869a5255a04b875bb885bd141a609ef Author: Dan Carpenter Date: Sat Feb 26 15:48:12 2011 +0300 staging: gma500: fix some swapped gotos These gotos were swapped. In the original code, the first would result in a NULL dereference and the second would result in a memory leak. Signed-off-by: Dan Carpenter Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1f2b472cc92d6178c5b24c12687783a0dedb9202 Author: Justin P. Mattock Date: Sat Feb 26 20:33:59 2011 -0800 drivers:staging:rt2860 Remove one to many n's in a word. The Patch below removes one to many "n's" in a word.. Signed-off-by: Justin P. Mattock CC: Greg Kroah-Hartman CC: Andy Shevchenko CC: Jesper Juhl CC: devel@driverdev.osuosl.org Signed-off-by: Greg Kroah-Hartman commit 012983a2e8aa36b8f2d62aaee6a540b331e6dcb4 Author: Justin P. Mattock Date: Sat Feb 26 20:34:00 2011 -0800 drivers:staging:dspbridge:node.h Remove one to many n's in a word. The Patch below removes one to many "n's" in a word.. Signed-off-by: Justin P. Mattock CC: Greg Kroah-Hartman CC: Rene Sapiens CC: devel@driverdev.osuosl.org Signed-off-by: Greg Kroah-Hartman commit a0fe6029bce5ca2f1e7bcc8e248be1b3d2a2f6f4 Author: Justin P. Mattock Date: Sat Feb 26 20:34:02 2011 -0800 drivers:staging:bcm:CmHost.c Remove one to many n's in a word. The Patch below removes one to many "n's" in a word.. Signed-off-by: Justin P. Mattock CC: Greg Kroah-Hartman CC: Stephen Hemminger CC: devel@driverdev.osuosl.org Signed-off-by: Greg Kroah-Hartman commit 979cdcc90b5d4934e66cc7d7119cae949776d8bc Author: Justin P. Mattock Date: Sat Feb 26 20:34:01 2011 -0800 drivers:staging:westbridge:astoria Remove one to many n's in a word. The Patch below removes one to many "n's" in a word.. Signed-off-by: Justin P. Mattock CC: Greg Kroah-Hartman CC: David Cross CC: devel@driverdev.osuosl.org Signed-off-by: Greg Kroah-Hartman commit 0ffa3db9946ba2534d612d70cf40fa51fd5b63a4 Author: Justin P. Mattock Date: Thu Feb 24 22:14:42 2011 -0800 staging: vt6655: device_main.c remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 3cbeb42e1e224338bfd4ad5f173b925a31cfb1e2 Author: Justin P. Mattock Date: Thu Feb 24 22:14:23 2011 -0800 staging: rtl8712: rtl871x_pwrctrl.c remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 39eaedb68e54408c5476304a71ede713f31df37c Author: Justin P. Mattock Date: Thu Feb 24 22:14:05 2011 -0800 staging: comedi: pcl818.c remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 8c7f9ae856348d75fe79c179fa5c66e1f9717a20 Author: Justin P. Mattock Date: Thu Feb 24 22:13:46 2011 -0800 staging: comedi: pcl816.c remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 682a45382be47957860ac0a1eec7470a556bb30b Author: Justin P. Mattock Date: Thu Feb 24 22:13:27 2011 -0800 staging: vt6656: main_usb.c remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit aca6ad073ea820776bf5bdb87cf82eace35042c8 Author: Eyal Reizer Date: Sun Feb 27 10:45:18 2011 +0000 omap: omap3evm: add support for the WL12xx WLAN module to the omap3evm This patch is again current omap-for-linus branch Adds platform initialization for working with the WLAN module attached to the omap3evm. The patch includes MMC2 initialization, SDIO and control pins muxing and platform device registration. Signed-off-by: Eyal Reizer Signed-off-by: Tony Lindgren commit 06d278c51a072a655d7da23e3acc53f676967375 Author: Arend van Spriel Date: Fri Feb 25 16:39:24 2011 +0100 staging: brcm80211: remove usage of struct osl_info to access device For accessing the PCI or SDIO device in the driver the device is stored in a separate structure osl_info. To get rid of the osl concept the use of this device pointer attribute is removed from the drivers. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 7c0e45d7fb4ca3f9505b316598f4c2d748f3e8d0 Author: Arend van Spriel Date: Fri Feb 25 16:39:23 2011 +0100 staging: brcm80211: remove NULL pointer checks before calling kfree kfree function can handle NULL pointer as passed parameter so there is no need for the calling function to check for this before calling kfree. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 6cab915077bc3b54316ddf1e9c047df56eff556e Author: Arend van Spriel Date: Fri Feb 25 16:39:22 2011 +0100 staging: brcm80211: remove struct osl_info parameter from wlc_alloc The functions within wlc_alloc had parameter of struct osl_info type but it was never used. As part of osl concept removal this parameter has been removed from the function prototypes. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit d6075c9c0ca52cc560f6a5be27c361aaa15603c6 Author: Arend van Spriel Date: Fri Feb 25 16:39:21 2011 +0100 staging: brcm80211: remove osl handle from pkttotlen function The function pkttotlen was part of osl function and as such was called with struct osl_info parameter although not used within the function. As part of remove the whole osl concept from the drivers this parameter has been removed from the function prototype. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 61044c4cef8b0380e8ec4b06eff24884e4c7d9b9 Author: Arend van Spriel Date: Fri Feb 25 16:39:20 2011 +0100 staging: brcm80211: remove checks for ANTSEL related compiler definitions The source module antsel is always included in the current driver so any checks for it being compiled in are redundant and have been removed. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 16d691b60ea94be876cc12a62faa839803184a5e Author: Arend van Spriel Date: Fri Feb 25 16:39:19 2011 +0100 staging: brcm80211: remove include file d11ucode_ext.h Include file required by wl_ucode.h only so merged content of d11ucode_ext.h into that include file to reduce number of include files in the driver. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 8a0939f500aac72e3bc47147c66c2575160a43ca Author: Arend van Spriel Date: Fri Feb 25 16:39:18 2011 +0100 staging: brcm80211: remove include file sbhndpio.h All source files including sbhndpio.h were needing it only because they needed d11.h and it had a dependency. The content of sbhndpio.h has been merged in d11.h. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 70dfb584a70adae99ae597a3deb418a8311a0998 Author: Arend van Spriel Date: Fri Feb 25 16:39:17 2011 +0100 staging: brcm80211: remove include file proto/802.1d.h Aim to reduce the number of source and include files. This include file is not used anymore and can be removed. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 44bb83af01dcbfd3982af0f4ef4dec916ab04168 Author: Arend van Spriel Date: Fri Feb 25 16:39:16 2011 +0100 staging: brcm80211: remove typedef for struct wl_timer Typedefinitions for structures are considered affecting the code readability. This removes use of wl_timer_t which is typedef for struct wl_timer. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 12bacc1bce320e43b4a6fd1195980a355823127d Author: Arend van Spriel Date: Fri Feb 25 16:39:15 2011 +0100 staging: brcm80211: remove typedefs that were flagged by checkpatch The previous patch resulted in checkpatch to complain about 'new' typedefs that were relocated to another include file. This commits removes those typedef structures. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 45575664fb22c50a686719f1f1e07b13cd04ef1c Author: Arend van Spriel Date: Fri Feb 25 16:39:14 2011 +0100 staging: brcm80211: remove nested include statements In order to analyze include file usage nested includes have been removed from the driver sources. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 62b54dca17ef40116491b0ca27ca35fbe9daedc6 Author: Arend van Spriel Date: Fri Feb 25 16:39:13 2011 +0100 staging: brcm80211: cleanup function prototypes in header files Several header files were specifying function prototypes although no other module was relying on them. They have been moved to the related source file and made static or removed if the functions were non-existent in the driver. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit b693380f616d3a31c267d7b6da700ffa27fc308d Author: Arend van Spriel Date: Fri Feb 25 16:39:12 2011 +0100 staging: brcm80211: remove unused module from softmac driver The softmac driver contained an event queue mechanism which was properly initialized and queried but no event are ever posted to it. Therefor the module has been removed. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 371d72a1776bae3289cc984e656ef91172f2e925 Author: Brett Rudley Date: Fri Feb 25 16:39:11 2011 +0100 staging: brcm80211: relocate skb_get/free routines Getting rid of os abstraction layer (ie. osl) is ongoing. Some routines which are still required have been moved to bcmutils module. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 235742ae4da1c8398a3968b2d5110256fc33d536 Author: Brett Rudley Date: Fri Feb 25 16:39:10 2011 +0100 staging: brcm80211: Remove abstraction of pci_(alloc/free)_consistent The abstraction for allocating and freeing dma descriptor memory has been removed and replaced by usage of pci_alloc_consistent and pci_free_consistent. Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 9010c46c3722d37befaf3d6e0d5024293efa3074 Author: Brett Rudley Date: Fri Feb 25 16:39:09 2011 +0100 staging: brcm80211: Remove abstractions for pci_(un)map_single The driver had abstracted DMA mapping functions. As abstraction is not required for the linux driver, these have been removed and replaced by native linux functions. Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 2d586ea6de0ffe3e119ed0f1d4cb0adeb6874cbc Author: Stefan Weil Date: Thu Feb 24 22:11:48 2011 +0100 staging: brcm80211: Fix memory leak after kmalloc failure This error was spotted by cppcheck: drivers/staging/brcm80211/phy/wlc_phy_lcn.c:4053: error: Memory leak: ptr Cc: Brett Rudley Cc: Henry Ptasinski Cc: linux-wireless@vger.kernel.org Cc: devel@driverdev.osuosl.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Stefan Weil Signed-off-by: Greg Kroah-Hartman commit 8d9e9d09b78bd131f488bbd2746852a05bcf557f Author: Roland Vossen Date: Thu Feb 24 12:04:34 2011 +0100 staging: brcm80211: removed compile warning A warning was generated if CONFIG_BRCMDBG=n. Fixed this by introducing an function. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit aa19d8e9901ea9056e4e1e5c25af9b154d4e069b Author: Alan Cox Date: Thu Feb 24 16:24:50 2011 +0000 staging: gma500: Add 2D acceleration This is taken from Richard Purdie's previous attempt to rip the heart out of the PVR driver and stake it. Accelerate copies and fills. [Revised patch which disables the methods until we can finish debugging them] Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1d90da9545b30015c0a9056909fc4b7991fa54e3 Merge: d6b5d01 38698be Author: Tony Lindgren Date: Mon Feb 28 17:58:09 2011 -0800 Merge branch 'hwmod_clockevent_2.6.39' of git://git.pwsan.com/linux-2.6 into omap-for-linus commit b75ae07963f99f89319b17935af20513d57df577 Author: Pavan Savoy Date: Thu Feb 24 08:06:53 2011 -0600 staging: delete ti-st from staging The 2 drivers originally staged, the core ti-st driver and the btwilink bluetooth driver have now moved to relevant directories, so deleting the ti-st/ from staging. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit d6b5d01b3f7c10edb50b9092d8dcac9cab680ea3 Author: Paul Walmsley Date: Fri Feb 25 17:38:25 2011 -0700 OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus On non-OMAP2 and non-OMAP3 kernel configs, turn omap2_sdrc_init() into a no-op. Otherwise, compilation breaks on an OMAP4-only config with the current omap-for-linus branch: arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_devices': ../mach-omap2/io.c:421: undefined reference to `omap2_sdrc_init' Thanks to Sergei Shtylyov for suggesting the use of a empty static inline function rather than a macro. Signed-off-by: Paul Walmsley Cc: Tony Lindgren Cc: Sergei Shtylyov [tony@atomide.com: updated not to use __init for inline omap2_sdrc_init] Signed-off-by: Tony Lindgren commit 14f983264a74a5734541e094d97a0e681b2f3bb2 Author: Jonathan Cameron Date: Mon Feb 28 12:33:42 2011 +0000 staging:iio:gyro: adis16060 cleanup, move to abi and bug fixes. Moved to standard sysfs naming and got rid of direct register writing from userspace. The rx and tx buffers are never used together so just have one and avoid the need to malloc it by using putting it in the state structure and using the ____cacheline_aligned trick. A number of obvious bugs also fixed and correction of register address defines in header which has now been squashed into the driver. I don't have one of these so can't test. This is done off datasheet. Note that the driver had parts that definitely wouldn't work before this patch. Now it 'might' assuming I haven't messed up too badly. I've left fixing the fact that you can only have one of these on a given machine for another day. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 8e67875141b263ada64b7c74f0e593b6686ea8ed Author: Jonathan Cameron Date: Sat Feb 26 17:30:18 2011 +0000 staging:iio:gyro: adis16130 cleanup, move to abi and bug fixes. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit a301d425e6cc8b1f7d7449c0e5d72e9463652d90 Author: Jonathan Cameron Date: Sat Feb 26 17:27:18 2011 +0000 staging:iio:gyro remove adis16251 driver as now supported by adis16260 driver Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 03d1b7d3e4debbdbca4a676c749214b39025c8dd Author: Jonathan Cameron Date: Sat Feb 26 17:27:17 2011 +0000 staging:iio:gyro: add adis16251 support to adis16260 driver These parts are very similar and the adis16260 driver supports a lot of additional functionality. Precursor to removal of adis16251 driver. Note that some supported devices were missing from Kconfig help text and are also added in this patch. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 35d2b6f9b194ef99ceb6ea565c875af7cea34fa0 Author: Jonathan Cameron Date: Fri Feb 25 16:09:07 2011 +0000 staging:iio:gyro: adis16080 cleanup, move to abi and bug fixes. Moved to standard sysfs naming and got rid of direct register writing from userspace. The rx and tx buffers are never used together so just have one and avoid the need to malloc it by using putting it in the state structure and using the ____cacheline_aligned trick. Couple of obvious bug fixes whilst I was here. I don't have one of these so can't test. This is done off datasheet. Note that as with the adis16060 driver there are parts that definitely wouldn't work before this patch. Now it 'might' assuming I haven't messed up too badly. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 853e2bd2103aaa91d1ba1c0b57ba17628d836f03 Author: Bhanu Gollapudi Date: Fri Feb 4 12:10:34 2011 -0800 [SCSI] bnx2fc: Broadcom FCoE offload driver This driver is for Broadcom Netxtreme II 57712 chip. The following patch contains the driver sources for bnx2fc driver. libfc/libfcoe changes to enable bnx2fc have already gone through the fcoe tree. bnx2fc is a SCSI low level driver that interfaces with SCSI midlayer, libfc, libfcoe, cnic modules. bnx2fc driver uses services of libfc for slow path operations such as FIP and fabric discovery. The fast path IO perations are performed after offloading the session information to the underlying FCoE firmware. Signed-off-by: Bhanu Prakash Gollapudi Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit d2f809528a3534ea295b6d855c33cbbb3369d8c9 Author: Vasu Dev Date: Fri Feb 25 15:03:28 2011 -0800 [SCSI] fcoe: fix broken fcoe interface reset Reset using "fcoeadm -r" also needs to restart FIP before doing libfc lport reset, this is needed for new switch firmware requiring FIP solicitation before doing FLOGI again during reset. So this patch does this by doing fcoe_ctlr_link_down and then fcoe_ctlr_link_up to reset the interface. The fcoe_ctlr_link_down call path also does lport reset and then fcoe_ctlr_link_up re-starts the fabric login after doing FIP solicitation first to get reset feature working again. Signed-off-by: Vasu Dev Tested-by: Ross Brattain Signed-off-by: Robert Love Signed-off-by: James Bottomley commit f2f96d20708c53c6825f842beb7bed06f5f15aca Author: Dan Carpenter Date: Fri Feb 25 15:03:23 2011 -0800 [SCSI] fcoe: precedence bug in fcoe_filter_frames() Negate has higher precedence than bitwise AND. FCPHF_CRC_UNCHECKED is 0x1 so the original code is equivalent to: if (!fr_flags(fp)) { ... Signed-off-by: Dan Carpenter Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 70be6344ea1ad9110a5b422aeab47a3fbb01ba7f Author: Bhanu Prakash Gollapudi Date: Fri Feb 25 15:03:17 2011 -0800 [SCSI] libfcoe: Remove stale fcoe-netdev entries When L2 driver is unloaded, libfcoe_destroy tries to access the fcoe transport structure matching the netdev. However, since the netdev is unregistered by that time, it fails to do so. Hence the stale mappings exists in the fcoe-netdev list. Handle NETDEV_UREGISTER device notification mechanism to remove the stale fcoe-netdev mapping. Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit f4d2b2b6ea8abd0df72a31b4724522a277af6a6c Author: Bhanu Prakash Gollapudi Date: Fri Feb 25 15:03:12 2011 -0800 [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h both fcoe and bnx2fc drivers can access the common definition of FCOE_MTU. Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 059f04d4aa60f89b7ad6ca118856f4cb59d9257f Author: Bhanu Prakash Gollapudi Date: Fri Feb 25 15:03:07 2011 -0800 [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument fc_fill_fc_hdr() expects fc_frame as an argument. Introduce __fc_fill_fc_hdr to accept fc_frame_header as an argument. Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 72fa396bf57b31e8e2a401a21a3a088c0cc6b043 Author: Vasu Dev Date: Fri Feb 25 15:03:01 2011 -0800 [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs EM anchors list initialization for only master port was not enough to keep npiv working as described here:- https://lists.open-fcoe.org/pipermail/devel/2011-January/011063.html So this patch moves fc_exch_mgr_list_clone to update npiv ports EMs once EM anchors list initialized. Also some cleanup, no need to set lport = NULL as that always get initialized later. Signed-off-by: Vasu Dev Signed-off-by: Robert Love Signed-off-by: James Bottomley commit f31624831a79b9e3f129f6c3b0a1b83903a7b61e Author: Parikh, Neerav Date: Fri Feb 25 15:02:56 2011 -0800 [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out" When abort for an exchange timed out it didn't release the reference to the exchange resulting in a memory leak. After discussion with the author of the patch (CC) that introduced this bug it was suggested to revert that patch. This reverts commit ea3e2e72eeb3e8a9440a5da965914f9b12088626. Signed-off by: Neerav Parikh Tested-by: Ross Brattain Signed-off-by: Robert Love Signed-off-by: James Bottomley commit fe5e3f1aec310779a4b830022a26842b8d587228 Author: Parikh, Neerav Date: Fri Feb 25 15:02:51 2011 -0800 [SCSI] libfc: Fixing a memory leak when destroying an interface When an fcoe interface is being destroyed; in the process the fcoe driver will try to release all the resources it had allocated for that interface including rports. But, it seems that it does not release the reference held for the name server rport in that process resulting into a memory leak. This patch fixes that memory leak. Signed-off-by: Neerav Parikh Tested-by: Ross Brattain Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 6d84b986b26bac1d4d678ff10c10a633bf53f834 Author: Ben Hutchings Date: Fri Feb 25 00:04:42 2011 +0000 sfc: Bump version to 3.1 All features originally planned for version 3.1 (and some that weren't) have been implemented. Signed-off-by: Ben Hutchings commit 5fb6b06d4eda2167eab662ad5e30058cecd67b8b Author: Ben Hutchings Date: Thu Feb 24 19:30:41 2011 +0000 sfc: Remove configurable FIFO thresholds for pause frame generation In Falcon we can configure the fill levels of the RX data FIFO which trigger the generation of pause frames (if enabled), and we have module parameters for this. Siena does not allow the levels to be configured (or, if it does, this is done by the MC firmware and is not configurable by drivers). So far as I can tell, the module parameters are not used by our internal scripts and have not been documented (with the exception of the short parameter descriptions). Therefore, remove them and always initialise Falcon with the default values. Signed-off-by: Ben Hutchings commit 119226c563be011c6396c6a2d268d1ca7e467bd3 Author: Ben Hutchings Date: Fri Feb 18 19:14:13 2011 +0000 sfc: Expose TX push and TSO counters through ethtool statistics Signed-off-by: Ben Hutchings commit 0a6f40c66ba388e6349a11bea146955716c4d492 Author: Ben Hutchings Date: Fri Feb 25 00:01:34 2011 +0000 sfc: Update copyright dates Signed-off-by: Ben Hutchings commit a461103ba2e22cbb70771588b36f40df39a50f46 Author: Ben Hutchings Date: Thu Feb 24 23:59:15 2011 +0000 sfc: Do not read STAT1.FAULT in efx_mdio_check_mmd() This field does not exist in all MMDs we want to check, and all callers allow it to be set (fault_fatal = 0). Remove the loopback condition, as STAT2.DEVPRST should be valid regardless of any fault. Signed-off-by: Ben Hutchings commit e5f0fd278084d79d6be0920043519749374b0507 Author: Ben Hutchings Date: Thu Feb 24 23:57:47 2011 +0000 sfc: Read MC firmware version when requested through ethtool We currently make no use of siena_nic_data::fw_{version,build} except to format the firmware version for ethtool_get_drvinfo(). Since we only read the version at start of day, this information is incorrect after an MC firmware update. Remove the cached version information and read it via MCDI whenever it is requested. Signed-off-by: Ben Hutchings commit a526f140b22131376b0e49577210e6af73e2b89f Author: Steve Hodgson Date: Thu Feb 24 23:45:16 2011 +0000 sfc: Reduce size of efx_rx_buffer further by removing data member Instead calculate the KVA of receive data. It's not like it's a hard sum. [bwh: Fixed to work with GRO.] Signed-off-by: Ben Hutchings commit 8ba5366adacef220b6ce16dca777600433a22a42 Author: Steve Hodgson Date: Thu Feb 24 23:36:01 2011 +0000 sfc: Reduce size of efx_rx_buffer by unionising skb and page [bwh: Forward-ported to net-next-2.6.] Signed-off-by: Ben Hutchings commit 50e1fbdc1c9965b6ddbc5c9900377ff18bbf9ae8 Author: Tomas Winkler Date: Mon Feb 28 19:27:10 2011 +0200 staging/easycap: add first level indentation to easycap_ioctl.c Add the first level indentation to easycap_testcard.c with astyle -t8. About 100 of 80 columns warnings were left out for further fix Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit abb46c8cc0826ab67cea69949e3f7757fc92783a Author: Tomas Winkler Date: Mon Feb 28 19:27:09 2011 +0200 staging/easycap: add first level indentation to easycap_testcard.c Add the first level indentation to easycap_testcard.c with astyle -t8. No chackpatch warnings were created Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 980aebddb6459130f6f90af07152a0833c596088 Author: Tomas Winkler Date: Mon Feb 28 19:27:08 2011 +0200 staging/easycap: add first level indentation to easycap_sound_oss.c Add first level indentation to easycap_sound_oss.c with astyle -t8 62 lines over 80 characters were left out for further fix Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit a75af07718d2f2552f7b9e9c7e3799485b8b9329 Author: Tomas Winkler Date: Mon Feb 28 19:27:07 2011 +0200 staging/easycap: add first level indentation to easycap_sound.c Add the first level indentation to easycap_sound.c with astyle -t8. 41 lines over 80 characters were left out for further fix Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit c750665850dfed34d3ff0f73ddf367cc7b729b77 Author: Tomas Winkler Date: Mon Feb 28 19:27:06 2011 +0200 staging/easycap: add first level indentation to easycap_main Add first level indentation to easayca_main.c This created around 300 lines over 80 characters. Around 100 of straight forward once were fixed in this patch. The another 200 require more code movement and need to be fixed later Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 6653eb317facd4f020ca0a0378867d6f33f9a921 Author: Aaro Koskinen Date: Mon Feb 28 20:59:25 2011 +0200 staging: xgifb: delete unused module parameter "noaccel" The parameter is not used by the driver. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 26046bc16acb3141bd7634458f3f2ed0e56846b3 Author: Aaro Koskinen Date: Mon Feb 28 20:59:24 2011 +0200 staging: xgifb: delete XGI_accel.[ch] The files contain nothing actually needed by the driver. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 5b863c34ecd4240e32339f277796654f5ae1feac Author: Aaro Koskinen Date: Mon Feb 28 20:59:23 2011 +0200 staging: xgifb: eliminate "accel" field from video_info The value is always false, so the field can be eliminated. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 1b402967bc0ba7a8b0dd075e6c69c137f227a1eb Author: Aaro Koskinen Date: Mon Feb 28 20:59:22 2011 +0200 staging: xgifb: eliminate fbcon_XGI_fillrect() fbcon_XGI_fillrect() implementation is trivial and can be replaced with cfb_fillrect(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 85c3c562aa52d863e286049973cd508deb9f869a Author: Aaro Koskinen Date: Mon Feb 28 20:59:21 2011 +0200 staging: xgifb: eliminate fbcon_XGI_copyarea() fbcon_XGI_copyarea() implementation is trivial and can be replaced with cfb_copyarea(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 2e3e2a5e4fef586ae9b1cfef42823c0aef1797f4 Author: Michael Williamson Date: Tue Feb 8 07:59:55 2011 -0500 davinci: spi: move event queue parameter to platform data For DMA operation, the davinci spi driver needs an event queue number. Currently, this number is passed as a IORESOURCE_DMA. This is not correct, as the event queue is not a DMA channel. Pass the event queue via the platform data structure instead. On dm355 and dm365, move the eventq assignment for spi0 out of resources array and into platform data. Signed-off-by: Michael Williamson Acked-by: Sekhar Nori Acked-by: Grant Likely Signed-off-by: Kevin Hilman commit a42f18c96da2220eaad603a7586d43cdd12d9f9f Author: Michael Williamson Date: Tue Jan 18 12:21:46 2011 -0500 davinci: da850: remove unused uart pinmux arrays. The da850 uart pinmux arrays are not used. Remove them. Signed-off-by: Michael Williamson Tested-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 5a0d80ea806f89c078dd4b244479080cfe73d2ae Author: Michael Williamson Date: Tue Jan 18 12:21:45 2011 -0500 davinci: da850: move da850_evm specific mmcsd pinmux array to board file. The da850_mmcsd0_pins pinmux array contains pins that are specific to the da850 evm board (the write protect and card detect GPIO pins). Move the array to the board file. Signed-off-by: Michael Williamson Tested-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit c840fc745f6ec8a3b7062d72de193ab9c397d725 Author: Michael Williamson Date: Tue Jan 18 12:21:44 2011 -0500 davinci: da850: move da850_evm specific mcasp pins to board file. The da850_mcasp_pins pinmux array is specific to the da850_evm, and is not generic. Move the array to the board file, make it static initdata, and rename it accordingly. Signed-off-by: Michael Williamson Tested-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 0b642b6a86771f4f82abe6608fc61e050ea03f33 Author: Michael Williamson Date: Tue Jan 18 12:21:43 2011 -0500 davinci: da850: remove unused emif pinmux array The da850_emif25_pins pinmux array is not used. Remove it. Signed-off-by: Michael Williamson Tested-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 8ae7545aae15b55afe24ecebb234484883646410 Author: Michael Williamson Date: Tue Jan 18 12:21:42 2011 -0500 davinci: da850: remove unused pinmux array The da850_cpgmac_pins pinmux array is not used. Remove it. Signed-off-by: Michael Williamson Tested-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman commit 6619490a7f8c3e38406bfc03c755367fec21372d Author: Michael Williamson Date: Tue Jan 4 07:50:23 2011 -0500 davinci: Support various speedgrades for MityDSP-L138 and MityARM-1808 SoMs For the MityDSP-L138/MityARM-1808 SoMs, the speed grade can be determined from the part number string read from the factory configuration block on the on-board I2C PROM. Configure the maximum CPU speed based on this information. This patch was tested using a MityDSP-L138 and MityARM-1808 at various speedgrades. Also, for code coverage, a bogus configuration was tested as well as a configuration having an unknown part number. Signed-off-by: Michael Williamson Tested-by: Michael Williamson Reviewed-by: Sekhar Nori Signed-off-by: Kevin Hilman commit cbb691fb89ae01fde4ccce3b7351a0fa9fe1a47b Author: Sudhakar Rajashekhara Date: Mon Jan 3 08:03:27 2011 -0500 davinci: Add additional JTAG code for AM-1808 and OMAP-L138 Rev 2.0 SoCs From: Sudhakar Rajashekhara The JTAG variant code for Rev-2.0 silicon of the OMAP-L138 has changed. In addition, the variant code for the AM-1808 SoC appears to match the Rev-2.0 code for the OMAP-L138. Add an additional entry to support these chips. This patch is originally from a patch on the arago project, here: http://arago-project.org/git/projects/?p=linux-omapl1.git;a=commit;h=6157618435e313a444cdf059702bd34036a6e2b7 Further information related to the need for this patch can be located at http://e2e.ti.com/support/embedded/f/354/p/67290/248486.aspx http://linux.davincidsp.com/pipermail/davinci-linux-open-source/2010-November/021224.html This patch was tested using an AM-1808 SoC on a MityARM-1808 SoM card. It was also tested using a Rev 1.0 silicon OMAP-L138 on a MityDSP-L138F card. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Michael Williamson Tested-by: Michael Williamson Reported-by: Nicolas Luna Reviewed-by: Sekhar Nori Signed-off-by: Kevin Hilman commit f5714abba6668d2790fd2ac708aabd9506d3baf4 Author: Victor Rodriguez Date: Mon Dec 27 16:43:13 2010 -0600 davinci: USB1.1 support for Omapl138-Hawkboard This patch adds USB1.1 support for the Hawkboard-L138 system Signed-off-by: Victor Rodriguez Tested-by: Rene Gonzalez Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 5efe330ac19ff63c257db1ab120234cca01a8079 Author: Victor Rodriguez Date: Mon Dec 27 16:43:12 2010 -0600 davinci: USB clocks for Omapl138-Hawkboard This patch adds USB1.1 and USB2.0 clocks for the Hawkboard-L138 system Signed-off-by: Victor Rodriguez Tested-by: Rene Gonzalez Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit ef782d8d4e80b25a56d8cb93d648dd125e6ea95e Author: Victor Rodriguez Date: Mon Dec 27 16:43:11 2010 -0600 davinci: MMC/SD support for Omapl138-Hawkboard This patch adds MMC/SD support for the Hawkboard-L138 system Signed-off-by: Victor Rodriguez Tested-by: Rene Gonzalez Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit fe358d6a049dcd7cd52b0eb6ae5c8bddf223d41b Author: Victor Rodriguez Date: Mon Dec 27 16:43:10 2010 -0600 davinci: MMC/SD and USB-OHCI configuration for Omapl138-Hawkboard This patch defines Pin Mux configuration to enable MMC/SD and USB-OHCI on the Hawkboard-L138 system Signed-off-by: Victor Rodriguez Tested-by: Rene Gonzalez Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 5f72f380093afd378259e4a50f9fa2380457b70b Author: Victor Rodriguez Date: Mon Dec 27 16:43:09 2010 -0600 davinci: EDMA support for Omapl138-Hawkboard This patch adds EDMA support for the Hawkboard-L138 system Signed-off-by: Victor Rodriguez Tested-by: Rene Gonzalez Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit bb59b7fdc1aacde27a1d6254f1e647a794fa7735 Author: Victor Rodriguez Date: Mon Dec 27 16:43:08 2010 -0600 davinci: EMAC support for Omapl138-Hawkboard This patch adds EMAC support for the Hawkboard-L138 system Signed-off-by: Victor Rodriguez Tested-by: Rene Gonzalez Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 3ba789c0917dae4cd66fb5c1b7a9a6d3fc8f43bc Author: Kevin Hilman Date: Tue Feb 8 13:23:09 2011 -0800 MAINTAINERS: update TI DaVinci machine support entry Update my email address, and add Sekhar Nori as co-maintainer of TI DaVinci family of SoCs. Cc: Sekhar Nori Signed-off-by: Kevin Hilman commit a2396dfc63d4b133d0b820db978065367529f6ac Author: Michael Hennerich Date: Thu Feb 24 22:19:50 2011 +0100 IIO: ADC: AD799x: Update timestamp handling Add timestamp attributes. Revise timestamp handling accordingly. Preset timestamp generation. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit dcfb0863eec8ff0a3b2cee13e4f0e5bb5f0c3122 Author: Michael Hennerich Date: Thu Feb 24 22:19:49 2011 +0100 IIO: ADC: AD7606: Update timestamp handling Add timestamp attributes. Revise timestamp handling accordingly. Preset timestamp generation. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit e08d02658cac30a826565d2faebb74586f60d601 Author: Michael Hennerich Date: Thu Feb 24 22:19:48 2011 +0100 IIO: ADC: AD7887: Update timestamp handling Add timestamp attributes. Revise timestamp handling accordingly. Preset timestamp generation. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 86f702ab1d5f3a181937bf462c176d0c95f95a24 Author: Michael Hennerich Date: Thu Feb 24 22:19:47 2011 +0100 IIO: ADC: AD7476: Update timestamp handling Add timestamp attributes. Revise timestamp handling accordingly. Preset timestamp generation. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit fc7f95a94606fd81d8a3910c1477ea7340b52b9f Author: Michael Hennerich Date: Thu Feb 24 16:34:54 2011 +0100 IIO: Documentation: iio_utils: fix mask generation Variable sizeint is used uninitialized. Remove sizeint completely and use bits_used instead. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 7ccd4506fa49600a3c59cf64608b2c9e669b6c97 Author: Michael Hennerich Date: Thu Feb 24 16:34:53 2011 +0100 IIO: Documentation: iio_utils: Prevent buffer overflow The first part of build_channel_array()identifies the number of enabled channels. Further down this count is used to allocate the ci_array. The next section parses the scan_elements directory again, and fills ci_array regardless if the channel is enabled or not. So if less than available channels are enabled ci_array memory is overflowed. This fix makes sure that we allocate enough memory. But the whole approach looks a bit cumbersome to me. Why not allocate memory for MAX_CHANNLES, less say 64 (I never seen a part with more than that channels). And skip the first part entirely. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 2bf99c70cee1d9347145ec0d96ba39764e2193bc Author: Michael Hennerich Date: Thu Feb 24 16:34:52 2011 +0100 IIO: Documentation: iio_utils: style consistency fix No functional changes Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit cb771cbdbdb153b68275cd5b9eca593c4e5026e8 Author: Michael Hennerich Date: Thu Feb 24 16:34:51 2011 +0100 IIO: Documentation: iio_utils: Avoid double free() filename is used and freed later Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 065896e904eac598bafd5e607b944da34c4aaf09 Author: Michael Hennerich Date: Thu Feb 24 16:34:50 2011 +0100 IIO: Documentation: generic_buffer example: Avoid NULL pointer dereference In case optarg n is not given return/exit Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 7c31b984c4d119d0e32a1696fd4ca6b506a73d10 Author: Michael Hennerich Date: Thu Feb 24 12:32:45 2011 +0100 IIO: ADC: New driver for the AD7298 8-channel SPI ADC This patch adds support for the AD7298: 8-Channel, 1MSPS, 12-Bit SAR ADC with Temperature Sensor via SPI bus. This patch replaces the existing ad7298.c driver completely. It was necessary since, the old driver did not comply with the IIO ABI for such devices. Changes since V1: IIO: ADC: New driver for the AD7298 8-channel SPI ADC Add documentation for new sysfs file tempX_input. Simplify bit defines. Remove outdated comments. Fix indention style. ad7298_show_temp(): Add locking. Simplify temperature calculation. Change temperature result from degrees into milli degrees Celsius. Rename file according to new sysfs ABI documentation Add timestamp attributes. Revise timestamp handling accordingly. Preset timestamp generation. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Reviewed-by: Shubhrajyoti Signed-off-by: Greg Kroah-Hartman commit 5bfcf90bfb1889885211e8a853c6b70500065fce Author: Manohar Vanga Date: Sun Feb 27 00:15:35 2011 +0100 staging: vme: remove unreachable code Remove some more unreachable code found in bridges/vme_ca91cx42.c and bridges/vme_tsi148.c Signed-off-by: Manohar Vanga Signed-off-by: Greg Kroah-Hartman commit b00464677923a7878b8c3164d7462b80f641bba6 Author: Manohar Vanga Date: Sat Feb 26 23:36:15 2011 +0100 staging: vme: remove unreachable code Remove some unreachable code (kfree calls) from vme.c Signed-off-by: Manohar Vanga Signed-off-by: Greg Kroah-Hartman commit e364a3416d81c7717dd642dc9b3ab132b7885f66 Author: Amerigo Wang Date: Sun Feb 27 23:34:28 2011 +0000 bonding: use the correct size for _simple_hash() Clearly it should be the size of ->ip_dst here. Although this is harmless, but it still reads odd. Signed-off-by: WANG Cong Signed-off-by: David S. Miller commit c976cc3aa99e813084fc4bd295c9f7b706738b48 Author: Dan Carpenter Date: Mon Feb 28 22:28:31 2011 +0300 Staging: generic_serial: fix double locking bug spin_lock_irqsave() is not nestable. The second time that it gets called it overwrites the "flags" variable and so IRQs can't be restored properly. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 38698bef545403a334cf92153874bd06dc22cc66 Author: Paul Walmsley Date: Wed Feb 23 00:14:08 2011 -0700 OMAP2+: clockevent: set up GPTIMER clockevent hwmod right before timer init Set up the GPTIMER hwmod used for the clockevent source immediately before it is used. This avoids the need to set up all of the hwmods until the boot process is further along. (In general, we want to defer as much as possible until late in the boot process.) This second version fixes a bug pointed out by Santosh Shilimkar , that would cause the kernel to use an incorrect timer hwmod name if the selected GPTIMER was not 1 or 12 - thanks Santosh. Also, Tarun Kanti DebBarma pointed out that the original patch did not apply cleanly; this has now been fixed. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Tony Lindgren Cc: Kevin Hilman Cc: Santosh Shilimkar Acked-by: Santosh Shilimkar Cc: Tarun Kanti DebBarma commit 3c26bdb42320f9f39d30c6f115476bbb66b74dc5 Author: Justin P. Mattock Date: Sat Feb 26 20:34:05 2011 -0800 jbd: Remove one to many n's in a word. The Patch below removes one to many "n's" in a word.. Signed-off-by: Justin P. Mattock CC: Andrew Morton CC: linux-ext4@vger.kernel.org Acked-by: "Theodore Ts'o" Signed-off-by: Jan Kara commit ce654b37f87980d95f339080e4c3bdb2370bdf22 Author: Amir Goldstein Date: Sat Feb 26 22:40:19 2011 +0200 ext3: skip orphan cleanup on rocompat fs Orphan cleanup is currently executed even if the file system has some number of unknown ROCOMPAT features, which deletes inodes and frees blocks, which could be very bad for some RO_COMPAT features. This patch skips the orphan cleanup if it contains readonly compatible features not known by this ext3 implementation, which would prevent the fs from being mounted (or remounted) readwrite. Signed-off-by: Amir Goldstein Signed-off-by: Jan Kara commit 03885ac3c79ab7f3f4a8e502486be2ea6c85c3e3 Author: Josh Hunt Date: Thu Feb 24 11:48:22 2011 +0100 ext2: Fix link count corruption under heavy link+rename load vfs_rename_other() does not lock renamed inode with i_mutex. Thus changing i_nlink in a non-atomic manner (which happens in ext2_rename()) can corrupt it as reported and analyzed by Josh. In fact, there is no good reason to mess with i_nlink of the moved file. We did it presumably to simulate linking into the new directory and unlinking from an old one. But the practical effect of this is disputable because fsck can possibly treat file as being properly linked into both directories without writing any error which is confusing. So we just stop increment-decrement games with i_nlink which also fixes the corruption. CC: stable@kernel.org CC: Al Viro Signed-off-by: Josh Hunt Signed-off-by: Jan Kara commit a2debdbd1ad896a410019c9cf30785cad15930fc Author: Paul Walmsley Date: Wed Feb 23 00:14:07 2011 -0700 OMAP2+: hwmod: add ability to setup individual hwmods Add omap_hwmod_setup_one(), which is intended for use early in boot to selectively setup the hwmods needed for system clocksources and clockevents, and any other hwmod that is needed in early boot. omap_hwmod_setup_all() can then be called later in the boot process. The point is to minimize the amount of code that needs to be run early. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman Cc: Santosh Shilimkar Cc: Tony Lindgren commit 48d54f3fd20b435311f295b3bca3570096a2ac83 Author: Paul Walmsley Date: Wed Feb 23 00:14:07 2011 -0700 OMAP2+: hwmod: ignore attempts to re-setup a hwmod Previously, if a hwmod had already been set up, and the code attempted to set up the hwmod again, an error would be returned. This is not really useful behavior if we wish to allow the OMAP core code to setup the hwmods needed for the Linux clocksources and clockevents before the rest of the hwmods are setup. So, instead of generating errors, just ignore the attempt to re-setup the hwmod. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman commit 569edd705cc4e81a9129b5557f1fb259e21418a9 Author: Paul Walmsley Date: Wed Feb 23 00:14:06 2011 -0700 OMAP2+: hwmod: find MPU initiator hwmod during in _register() Move the code that looks for the MPU initiator hwmod to run during the individual hwmod _register() function. (Previously, it ran after all hwmods were registered in the omap_hwmod_late_init() function.) This is done so code can late-initialize a few individual hwmods -- for example, for the system timer -- before the entire set of hwmods is initialized later in boot via omap_hwmod_late_init(). Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman commit 8da83f8e73a42fa3142843938aa1590b82acb6ec Author: Roopa Prabhu Date: Wed Feb 23 15:16:01 2011 +0000 enic: Flush driver cache of registered addr lists during port profile disassociate During a port profile disassociate all address registrations for the interface are blown away from the adapter. This patch resets the driver cache of registered address lists to zero after a port profile disassociate. Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit 85e6b8c5d8be1e901b5402bfe42ce408912ab83e Author: Ben Dooks Date: Thu Feb 24 03:17:12 2011 +0000 DM9000: Allow randomised ethernet address Allow randomised ethernet address if the device does not have a valid EEPROM or pre-set MAC address. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown Signed-off-by: David S. Miller commit 6f2e154b68b9321d958391bc0b1ffc2b90d57d71 Author: stephen hemminger Date: Wed Feb 23 07:54:27 2011 +0000 qla3xxx: add missing __iomem annotation Add necessary annotations about pointer to io memory space that is checked by sparse. Signed-off-by: Stephen Hemminger Acked-by: Ron Mercer Signed-off-by: David S. Miller commit bd32344a6baa8baac9c2b3e9c6c649cc4ed53920 Author: Stephen Boyd Date: Wed Feb 23 09:37:42 2011 -0800 msm: clock: Migrate to clkdev Migrating to clkdev has several advantages: * Less code in mach-msm/clock.c * A more robust clk_get() implementation * clk_add_alias() support * clk_get_sys() support In general, this will help board authors setup clock aliases and break the dependency on device pointers in the clock tables. Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit 2a52220c89e02423aa23e6b9fb6dc0c706465a82 Author: Stephen Boyd Date: Wed Feb 23 09:37:41 2011 -0800 msm: clock: Remove references to clk_ops_pcom Not all devices use proc_comm and determining if a clock is local vs. remote is fragile when done by comparing clk_ops pointers. Instead, implement an is_local() function for all clk_ops to determine if the clock is local. Doing this allows us to remove the last references to clk_ops_pcom from clock.c and compile it for targets with CONFIG_MSM_PROC_COMM=n. We don't need to set the clk_ops at runtime until 7x30 local clock detection comes in. Right now it's just complicating things so just set the ops pointer statically. Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit 0693a317b609a5d31d29e26c4f28ea079d5477f4 Author: Stephen Boyd Date: Fri Feb 18 19:14:09 2011 -0800 msm: headsmp.S: Fix section mismatch WARNING: vmlinux.o(.cpuinit.text+0xc80): Section mismatch in reference from the function boot_secondary() to the variable .init.text:msm_secondary_startup The function __cpuinit boot_secondary() references a variable __init msm_secondary_startup. If msm_secondary_startup is only used by boot_secondary then annotate msm_secondary_startup with a matching annotation. Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit 3162aa2f1b55849651a05052d3e5f5e640ea44fa Author: David Brown Date: Mon Feb 14 16:15:26 2011 -0800 msm: Use explicit GPLv2 licenses Replace a BSD-style license in Code Aurora Forum authored files with an explicit GPLv2. Signed-off-by: David Brown commit 4ec952b8ab636e87465ed78a1ca5fa5efe0d5e0f Author: stephen hemminger Date: Wed Feb 23 07:40:33 2011 +0000 bonding: fix sparse warning Fix use of zero where NULL expected. And wrap long line. Signed-off-by: Stephen Hemminger Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit a693e69897e7811e2790295f38a0ce3a92c4b45c Author: Anders Berggren Date: Mon Feb 28 12:32:11 2011 -0800 net: TX timestamps for IPv6 UDP packets Enabling TX timestamps (SO_TIMESTAMPING) for IPv6 UDP packets, in the same fashion as for IPv4. Necessary in order for NICs such as Intel 82580 to timestamp IPv6 packets. Signed-off-by: Anders Berggren Signed-off-by: David S. Miller commit eaaa3a7c4da2bdc48e536bb750860253150cb931 Author: Sergei Shtylyov Date: Mon Feb 28 12:29:34 2011 -0800 sis900: use pci_dev->revision This driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so it wasn't converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all drivers to use pci_device->revision). Signed-off-by: Sergei Shtylyov Signed-off-by: David S. Miller commit 696ea472e19c6d1fa843bb1abce73b9c3a414391 Author: Changli Gao Date: Tue Feb 22 01:55:18 2011 +0000 llc: avoid skb_clone() if there is only one handler Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 1c48a5c93da63132b92c4bbcd18e690c51539df6 Author: Grant Likely Date: Thu Feb 17 02:43:24 2011 -0700 dt: Eliminate of_platform_{,un}register_driver Final step to eliminate of_platform_bus_type. They're all just platform drivers now. v2: fix type in pasemi_nand.c (thanks to Stephen Rothwell) Signed-off-by: Grant Likely commit 793218dfea146946a076f4fe51e574db61034a3e Author: Grant Likely Date: Tue Feb 22 21:10:26 2011 -0700 dt/serial: Eliminate users of of_platform_{,un}register_driver Get rid of users of of_platform_driver in drivers/serial. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely Reviewed-by: Arnd Bergmann commit d35fb6417655ebf6de93e2135dc386c3c470f545 Author: Grant Likely Date: Tue Feb 22 21:08:34 2011 -0700 dt/usb: Eliminate users of of_platform_{,un}register_driver Get rid of users of of_platform_driver in drivers/usb. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely commit 28541d0f1894cd0c8f4a90c6e006c88d38ad3ac0 Author: Grant Likely Date: Tue Feb 22 21:07:43 2011 -0700 dt/video: Eliminate users of of_platform_{,un}register_driver Get rid of users of of_platform_driver in drivers/video. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely commit 74888760d40b3ac9054f9c5fa07b566c0676ba2d Author: Grant Likely Date: Tue Feb 22 21:05:51 2011 -0700 dt/net: Eliminate users of of_platform_{,un}register_driver Get rid of users of of_platform_driver in drivers/net. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely commit f07eb223a081b278be02a58394cb5fd66f1a1bbd Author: Grant Likely Date: Tue Feb 22 21:05:04 2011 -0700 dt/sound: Eliminate users of of_platform_{,un}register_driver Get rid of users of of_platform_driver in drivers/sound. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely commit 18d306d1375696b0e6b5b39e4744d7fa2ad5e170 Author: Grant Likely Date: Tue Feb 22 21:02:43 2011 -0700 dt/spi: Eliminate users of of_platform_{,un}register_driver Get rid of users of of_platform_driver in drivers/spi. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely commit e5263a517688b83861d406223a0f111a6e4116ff Author: Grant Likely Date: Tue Feb 22 20:16:13 2011 -0700 dt: uartlite: merge platform and of_platform driver bindings of_platform_driver is getting removed, and a single platform_driver can now support both devicetree and non-devicetree use cases. This patch merges the two driver registrations. Signed-off-by: Grant Likely Acked-by: Peter Korsgaard commit 55f19d56742a7b544e80b47339c17bfcfd0ff3b4 Author: Grant Likely Date: Tue Feb 22 20:13:26 2011 -0700 dt: xilinx_hwicap: merge platform and of_platform driver bindings of_platform_driver is getting removed, and a single platform_driver can now support both devicetree and non-devicetree use cases. This patch merges the two driver registrations. Signed-off-by: Grant Likely Acked-by: Stephen Neuendorffer commit a1e9c9dd3383e6a1a762464ad604b1081774dbda Author: Rob Herring Date: Wed Feb 23 15:37:59 2011 -0600 ipmi: convert OF driver to platform driver of_bus is deprecated in favor of the plain platform bus. This patch merges the ipmi OF driver with the existing platform driver. CONFIG_PPC_OF occurrances are removed or replaced with CONFIG_OF. Compile tested with and without CONFIG_OF. Tested OF probe and default probe cases. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit 985076720187af7ac0c2de4dfe912acba9b4f586 Author: Shmulik Ravid Date: Mon Feb 28 12:19:55 2011 -0800 bnx2x: use dcb_setapp to manage negotiated application tlvs With this patch the bnx2x uses the generic dcbnl application tlv list instead of implementing its own get-app handler. When the driver is alerted to a change in the DCB negotiated parameters, it calls dcb_setapp to update the dcbnl application tlvs list making it available to user mode applications and registered notifiers. Signed-off-by: Shmulik Ravid Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit ff938e43d39e926de74b32a3656c190f979ab642 Author: Sergei Shtylyov Date: Mon Feb 28 11:57:33 2011 -0800 net: use pci_dev->revision, again Several more network drivers that read the device's revision ID from the PCI configuration register were merged after the commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all drivers to use pci_device->revision), so it's time to do another pass of conversion to using the 'revision' field of 'struct pci_dev'... Signed-off-by: Sergei Shtylyov Acked-by: "John W. Linville" Signed-off-by: David S. Miller commit 67289941d80f18fd8239e350e015a4b84878412b Author: Stanislaw Gruszka Date: Mon Feb 28 14:33:17 2011 +0100 iwlwifi: move remaining iwl-agn-rx.c code into iwl-rx.c There is no need to have separate iwl-agn-rx.c file after iwlegacy split. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit ad6e82a5348e494c0023d77fa55933f23b55711c Author: Stanislaw Gruszka Date: Mon Feb 28 14:33:16 2011 +0100 iwlwifi: move check health code into iwl-rx.c Remove check_plcp_health and check_ack_health ops methods, they are unneeded after iwlegacy driver split. Merge check health code into to iwl-rx.c and make functions static. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit b7977ffaab5187ad75edaf04ac854615cea93828 Author: Stanislaw Gruszka Date: Mon Feb 28 14:33:15 2011 +0100 iwlwifi: add {ack,plpc}_check module parameters Add module ack_check, and plcp_check parameters. Ack_check is disabled by default since is proved that check ack health can cause troubles. Plcp_check is enabled by default. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 8a032c132b7ca011813df7c441b4a6fc89e5baee Author: Stanislaw Gruszka Date: Mon Feb 28 14:33:14 2011 +0100 iwlegacy: fix dma mappings and skbs leak Fix possible dma mappings and skbs introduced by commit 470058e0ad82fcfaaffd57307d8bf8c094e8e9d7 "iwlwifi: avoid Tx queue memory allocation in interface down". Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 387f3381f732d8fa1b62213ae3276f2ae712dbe2 Author: Stanislaw Gruszka Date: Mon Feb 28 14:33:13 2011 +0100 iwlwifi: fix dma mappings and skbs leak Since commit commit 470058e0ad82fcfaaffd57307d8bf8c094e8e9d7 "iwlwifi: avoid Tx queue memory allocation in interface down" we do not unmap dma and free skbs when down device and there is pending transfer. What in consequence may cause that system hung (waiting for free skb's) when performing shutdown at iptables module unload. DMA leak manifest itself following warning: WARNING: at lib/dma-debug.c:689 dma_debug_device_change+0x15a/0x1b0() Hardware name: HP xw8600 Workstation pci 0000:80:00.0: DMA-API: device driver has pending DMA allocations while released from device [count=240] Modules linked in: iwlagn(-) aes_x86_64 aes_generic fuse cpufreq_ondemand acpi_cpufreq freq_table mperf xt_physdev ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables ipv6 ext3 jbd dm_mirror dm_region_hash dm_log dm_mod uinput hp_wmi sparse_keymap sg wmi microcode serio_raw tg3 arc4 ecb shpchp mac80211 cfg80211 rfkill ext4 mbcache jbd2 sr_mod cdrom sd_mod crc_t10dif firewire_ohci firewire_core crc_itu_t mptsas mptscsih mptbase scsi_transport_sas pata_acpi ata_generic ata_piix ahci libahci floppy nouveau ttm drm_kms_helper drm i2c_algo_bit i2c_core video [last unloaded: iwlagn] Pid: 9131, comm: rmmod Tainted: G W 2.6.38-rc6-wl+ #33 Call Trace: [] ? warn_slowpath_common+0x7f/0xc0 [] ? warn_slowpath_fmt+0x46/0x50 [] ? dma_debug_device_change+0xdb/0x1b0 [] ? dma_debug_device_change+0x15a/0x1b0 [] ? notifier_call_chain+0x58/0xb0 [] ? __blocking_notifier_call_chain+0x60/0x90 [] ? blocking_notifier_call_chain+0x16/0x20 [] ? __device_release_driver+0xbc/0xe0 [] ? driver_detach+0xd8/0xe0 [] ? bus_remove_driver+0x91/0x100 [] ? driver_unregister+0x62/0xa0 [] ? pci_unregister_driver+0x44/0xa0 [] ? iwl_exit+0x15/0x1c [iwlagn] [] ? sys_delete_module+0x1a2/0x270 [] ? trace_hardirqs_on_thunk+0x3a/0x3f [] ? system_call_fastpath+0x16/0x1b I still can observe above warning after apply patch, but it is very hard to reproduce it, and have count=1. Whereas that one is easy to reproduce using debugfs force_reset while transmitting data, and have very big counts eg. 240, like quoted here. So count=1 WARNING seems to be different issue that need to be resolved separately. v1 -> v2: fix infinity loop bug I made during "for" to "while" loop transition. v2 -> v3: remove unneeded EXPORT_SYMBOL Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 15178535ad2f8fd8f7e803791f25395aa69f80ac Author: Senthil Balasubramanian Date: Mon Feb 28 15:16:47 2011 +0530 ath9k: Fix incorrect GPIO LED pin for AR9485 AR9485 doesn't use the default GPIO pin for LED and GPIO 6 is actually used for this. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 0cf55c21ec401632043db2b8acb7cd3bef64c9e6 Author: Felix Fietkau Date: Sun Feb 27 22:26:40 2011 +0100 ath9k: use generic mac80211 LED blinking code Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a5a7103fe18eb4312bd89c9f136fb850af58faf4 Author: Felix Fietkau Date: Sun Feb 27 22:19:22 2011 +0100 p54: fix a NULL pointer dereference bug If the RSSI calibration table was not found or not parsed properly, priv->rssi_db will be NULL, p54_rssi_find needs to be able to deal with that. Signed-off-by: Felix Fietkau Acked-by: Christian Lamparter Signed-off-by: John W. Linville commit c2a7dca0ce0e6ceb13f9030ff8e9731eaa14cc02 Author: Alessio Igor Bogani Date: Mon Feb 28 09:11:55 2011 +0100 rtlwifi: fix places where uninitialized data is used drivers/net/wireless/rtlwifi/rtl8192ce/trx.c: In function ‘rtl92ce_rx_query_desc’: drivers/net/wireless/rtlwifi/rtl8192ce/trx.c:255:5: warning: ‘rf_rx_num’ may be used uninitialized in this function drivers/net/wireless/rtlwifi/rtl8192ce/trx.c:257:12: warning: ‘total_rssi’ may be used uninitialized in this function drivers/net/wireless/rtlwifi/rtl8192ce/trx.c:466:6: warning: ‘weighting’ may be used uninitialized in this function This work was supported by a hardware donation from the CE Linux Forum. Signed-off-by: Alessio Igor Bogani Signed-off-by: John W. Linville commit 701c2be03aac62a54decaa685c70d2b734afde67 Author: Alessio Igor Bogani Date: Mon Feb 28 18:46:44 2011 +0100 rtlwifi: Add the missing rcu_read_lock/unlock =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- net/mac80211/sta_info.c:125 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 5 locks held by wpa_supplicant/468: #0: (rtnl_mutex){+.+.+.}, at: [] rtnl_lock+0x14/0x20 #1: (&rdev->mtx){+.+.+.}, at: [] cfg80211_mgd_wext_siwfreq+0x6b/0x170 [cfg80211] #2: (&rdev->devlist_mtx){+.+.+.}, at: [] cfg80211_mgd_wext_siwfreq+0x77/0x170 [cfg80211] #3: (&wdev->mtx){+.+.+.}, at: [] cfg80211_mgd_wext_siwfreq+0x84/0x170 [cfg80211] #4: (&rtlpriv->locks.conf_mutex){+.+.+.}, at: [] rtl_op_bss_info_changed+0x26/0xc10 [rtlwifi] stack backtrace: Pid: 468, comm: wpa_supplicant Not tainted 2.6.38-rc6+ #79 Call Trace: [] ? lockdep_rcu_dereference+0xaa/0xb0 [] ? sta_info_get_bss+0x19c/0x1b0 [mac80211] [] ? ieee80211_find_sta+0x22/0x40 [mac80211] [] ? rtl_op_bss_info_changed+0x1cc/0xc10 [rtlwifi] [] ? __mutex_unlock_slowpath+0x14c/0x160 [] ? mutex_unlock+0xd/0x10 [] ? rtl_op_config+0x120/0x310 [rtlwifi] [] ? trace_hardirqs_on+0xb/0x10 [] ? ieee80211_bss_info_change_notify+0xf9/0x1f0 [mac80211] [] ? rtl_op_bss_info_changed+0x0/0xc10 [rtlwifi] [] ? ieee80211_set_channel+0xbf/0xd0 [mac80211] [] ? cfg80211_set_freq+0x121/0x180 [cfg80211] [] ? ieee80211_set_channel+0x0/0xd0 [mac80211] [] ? cfg80211_mgd_wext_siwfreq+0x12b/0x170 [cfg80211] [] ? cfg80211_wext_siwfreq+0x9b/0x100 [cfg80211] [] ? sub_preempt_count+0x7b/0xb0 [] ? ioctl_standard_call+0x74/0x3b0 [] ? rtnl_lock+0x14/0x20 [] ? cfg80211_wext_siwfreq+0x0/0x100 [cfg80211] [] ? __dev_get_by_name+0x8d/0xb0 [] ? wext_handle_ioctl+0x16b/0x180 [] ? cfg80211_wext_siwfreq+0x0/0x100 [cfg80211] [] ? dev_ioctl+0x5ba/0x720 [] ? __lock_acquire+0x3e7/0x19b0 [] ? sock_ioctl+0x1eb/0x290 [] ? lock_release_non_nested+0x95/0x2f0 [] ? sock_ioctl+0x0/0x290 [] ? do_vfs_ioctl+0x7d/0x5c0 [] ? might_fault+0x62/0xb0 [] ? fget_light+0x226/0x390 [] ? might_fault+0xa8/0xb0 [] ? sys_ioctl+0x87/0x90 [] ? sysenter_do_call+0x12/0x38 This work was supported by a hardware donation from the CE Linux Forum. Signed-off-by: Alessio Igor Bogani Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit c3371d64d2b2fd029033976046cb4ca641485506 Author: Dan Carpenter Date: Sat Feb 26 04:56:53 2011 +0300 iwlwifi: remove duplicate initialization rate_mask is initialized again later so this can be removed. Btw, if rate_control_send_low(sta, priv_sta, txrc) returns false, that means that "sta" is non-NULL. That's why the second initialization of rate_mask is a little simpler than the first. Signed-off-by: Dan Carpenter Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit d45dcef77019012fc6769e657fc2f1a5d681bbbb Author: Gustavo F. Padovan Date: Fri Feb 25 22:41:25 2011 -0300 Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig If we want something "bool" built-in in something "tristate" it can't "depend on" the tristate config option. Report by DaveM: I give it 'y' just to make it happen, for both, and afterways no matter how many times I rerun "make oldconfig" I keep seeing things like this in my build: scripts/kconfig/conf --silentoldconfig Kconfig include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP Reported-by: David S. Miller Signed-off-by: Gustavo F. Padovan Signed-off-by: John W. Linville commit f54b92b9272cde9720b1371937928e92c5b29fb4 Merge: 10889f1 6013270 Author: John W. Linville Date: Mon Feb 28 14:05:38 2011 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 550c8092c55c22db8f843bad070fd1731292a75e Author: Paul Walmsley Date: Mon Feb 28 11:58:14 2011 -0700 OMAP2+: hwmod: rename some init functions Rename omap_hwmod_init() to omap_hwmod_register(). Rename omap_hwmod_late_init() to omap_hwmod_setup_all(). Also change all of the callers to reflect the new names. While here, update some copyrights. Suggested by Tony Lindgren . N.B. The comment in mach-omap2/serial.c may no longer be correct, given recent changes in init order. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman Cc: Tony Lindgren commit bac1a0f0bbf0b11b23fe714826f29fc9aeb35855 Author: Paul Walmsley Date: Wed Feb 23 00:14:06 2011 -0700 OMAP2+: hwmod: allow multiple calls to omap_hwmod_init() There's no longer any reason why we should prevent multiple calls to omap_hwmod_init(). It is now simply used to register an array of hwmods. This should allow a subset of hwmods (e.g., hwmods handling the system clocksource and clockevents) to be registered earlier than the remaining mass of hwmods. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman commit 10889f1330660fd73dc38aadbff7c930fbc4fe20 Author: John W. Linville Date: Fri Feb 25 15:38:09 2011 -0500 at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void CC [M] drivers/net/wireless/at76c50x-usb.o drivers/net/wireless/at76c50x-usb.c: In function ‘at76_mac80211_tx’: drivers/net/wireless/at76c50x-usb.c:1759:4: warning: ‘return’ with a value, in function returning void This is fallout from commit 7bb4568372856688bc070917265bce0b88bb7d4d ("mac80211: make tx() operation return void"). Signed-off-by: John W. Linville commit 63d8ea7f93e1fb9d1aa9509ab3e1a71199245c80 Author: David S. Miller Date: Mon Feb 28 10:48:59 2011 -0800 net: Forgot to commit net/core/dev.c part of Jiri's ->rx_handler patch. Signed-off-by: David S. Miller commit 003a3194d36dc22c29cacda4d0c6fede2753c9d0 Author: Phillip Lougher Date: Mon Feb 28 18:43:48 2011 +0000 Squashfs: wrap squashfs_mount() definition Squashfs_get_sb() to squashfs_mount() conversion (commit 152a0836) results in line over 80 characters. Signed-off-by: Phillip Lougher commit 3ad126641c05f93d2fa153bb8ff762fb4cdbb885 Author: Phillip Lougher Date: Mon Feb 28 16:42:20 2011 +0000 Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore Signed-off-by: Phillip Lougher commit 4c1d204cde1470863e78aa0e6f55246c57f15038 Author: Phillip Lougher Date: Mon Feb 28 16:32:39 2011 +0000 Squashfs: Update documentation to include compression options Signed-off-by: Phillip Lougher commit 681ffe2e4316801529fdafe379743d1d41fe2086 Author: Phillip Lougher Date: Mon Feb 28 16:21:34 2011 +0000 Squashfs: Update Kconfig help text to include xz compression Signed-off-by: Phillip Lougher commit ff750311d30acc9564ef577050794953eee59f01 Author: Phillip Lougher Date: Mon Feb 28 15:31:46 2011 +0000 Squashfs: add compression options support to xz decompressor Pass the dictionary size used to compress datablocks. Using a dictionary size less than the block size saves memory overhead, in many cases without adversely affecting compression ratio. Signed-off-by: Phillip Lougher commit b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe Author: Phillip Lougher Date: Mon Feb 28 01:45:42 2011 +0000 Squashfs: extend decompressor framework to handle compression options Extend decompressor framework to handle compression options stored in the filesystem. These options can be used by the relevant decompressor at initialisation time to over-ride defaults. The presence of compression options in the filesystem is indicated by the COMP_OPT filesystem flag. If present the data is read from the filesystem and passed to the decompressor init function. The decompressor init function signature has been extended to take this data. Also update the init function signature in the glib, lzo and xz decompressor wrappers. Signed-off-by: Phillip Lougher commit b616844310a6c8a4ab405d3436bbb6e53cfd852f Author: Theodore Ts'o Date: Mon Feb 28 13:12:38 2011 -0500 ext4: optimize ext4_bio_write_page() when no extent conversion is needed If no extent conversion is required, wake up any processes waiting for the page's writeback to be complete and free the ext4_io_end structure directly in ext4_end_bio() instead of dropping it on the linked list (which requires taking a spinlock to queue and dequeue the io_end structure), and waiting for the workqueue to do this work. This removes an extra scheduling delay before process waiting for an fsync() to complete gets woken up, and it also reduces the CPU overhead for a random write workload. Signed-off-by: "Theodore Ts'o" commit 00fa2b191b4bd74e9d22ac177e3d9e8ecd3582d3 Author: adam radford Date: Thu Feb 24 20:57:21 2011 -0800 [SCSI] megaraid_sas: Version and Changelog update Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit ebf054b00b0a6dfa81dc4472d8b19301318b7f47 Author: adam radford Date: Thu Feb 24 20:57:15 2011 -0800 [SCSI] megaraid_sas: Fix iMR OCR support to work correctly Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 42a8d2b34d107df34533ea4840daf8d62bdc90aa Author: adam radford Date: Thu Feb 24 20:57:09 2011 -0800 [SCSI] megaraid_sas: Fix max_sectors for IEEE SGL Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 1ac515ef3f2f7ab32498b0e4907933ff8b9b98c0 Author: adam radford Date: Thu Feb 24 20:57:04 2011 -0800 [SCSI] megaraid_sas: Fix fault state handling The following patch for megaraid_sas fixes fault state handling in megasas_transition_to_ready(). Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit f86c5424b02717a9eb9b1049a67ff3e7e9e92edf Author: adam radford Date: Thu Feb 24 20:57:00 2011 -0800 [SCSI] megaraid_sas: Fix tasklet_init call The following patch fixes an incorrect tasklet_init() call in megasas_init_fw() to use instancet->tasklet. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 4c598b23807a3bf0e4f7e65f7934965acc47e1b9 Author: adam radford Date: Thu Feb 24 20:56:53 2011 -0800 [SCSI] megaraid_sas: Add CFG_CLEARED AEN The following patch for megaraid_sas adds a missing check for MR_EVT_CFG_CLEARED in megasas_aen_polling(). Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit eaa3c240de25c6e52ee1329e4acadfd99d7d104b Author: adam radford Date: Thu Feb 24 20:56:49 2011 -0800 [SCSI] megaraid_sas: Fix megasas_build_dcdb_fusion to use correct LUN field Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit f512440589632c73e7c2f42d9d723994cd45958b Author: adam radford Date: Thu Feb 24 20:56:43 2011 -0800 [SCSI] megaraid_sas: Fix megasas_build_dcdb_fusion to not filter by TYPE_DISK Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 66192dfe1e74eae31a76cfc36092dabdba1324e6 Author: adam radford Date: Thu Feb 24 20:56:28 2011 -0800 [SCSI] megaraid_sas: Fix probe_one to clear MSI-X flags in kdump The following patch for megaraid_sas fixes megasas_probe_one() to clear MSI-X flags in kdump when the 'reset_devices' kernel parameter is passed in. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit e1419191d8d38098fb6ef29e94aadd15dabff3da Author: adam radford Date: Thu Feb 24 20:56:21 2011 -0800 [SCSI] megaraid_sas: Call tasklet_schedule for MSI-X The following patch for megaraid_sas calls tasklet_schedule() even if outbound_intr_status == 0 for MFI based boards in MSI-X mode. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 0a77066acc78b4048b0afc9d70b7e91c06e63356 Author: adam radford Date: Thu Feb 24 20:56:12 2011 -0800 [SCSI] megaraid_sas: Enable MSI-X before calling megasas_init_fw Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 53ef2bbd2068097ac453dff4a3d82858446be5bb Author: adam radford Date: Thu Feb 24 20:56:05 2011 -0800 [SCSI] megaraid_sas: Add missing check_and_restore_queue_depth call Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit eb1b12377376e43aae4be338ffbbc32931ca4d10 Author: adam radford Date: Thu Feb 24 20:55:56 2011 -0800 [SCSI] megaraid_sas: Fix failure gotos Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 183ce896d726fb987da589fa8e36fb7214a494cc Author: jack_wang Date: Sat Feb 19 18:20:53 2011 +0800 [SCSI] libsas: fix loopback topology bug during discovery In some test envirenment, there is loopback topology test. We should handle this during discovery. Signed-off-by: Jack Wang Signed-off-by: James Bottomley commit 3496343df5062d36354a106f19c9688a6ecf9734 Author: Mike Christie Date: Fri Feb 25 14:04:28 2011 -0600 [SCSI] lpfc: block target when port queueing limit is hit Instead of blocking the entire host when the port's queueing limit is hit, we should only block the port's target. This will allow IO to other ports to execute. Signed-off-by: Mike Christie Acked-by: James Smart Signed-off-by: James Bottomley commit f55ca84d92d0c249ce4f4b8d493657a59c359c5d Author: Mike Christie Date: Fri Feb 25 14:04:27 2011 -0600 [SCSI] lpfc: force retry in queuecommand when port is transitioning If the port takes a while to transition we could exhaust the retries when using DID_TRANSPORT_DISRUPTED. For this case we do not want to use any of the cmd's retries, because if the command was running then when it got failed the retry counter was already incremented. And if this is the first time we are seeing the command, (it got queued because it slipped through during the race) then it should not have its retries incremented. The fc class will decide the correct handling later. Signed-off-by: Mike Christie Acked-by: James Smart Signed-off-by: James Bottomley commit 039e13890b0615cb8c5c04b6afa84d676e24c761 Author: Jan Beulich Date: Mon Feb 28 15:56:00 2011 +0000 x86: Remove unused bits from lib/thunk_*.S Some of the items removed were apparently never used, others simply didn't get removed with their last user. Signed-off-by: Jan Beulich LKML-Reference: <4D6BD3A002000078000341F1@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 60cf637a13932a4750da6746efd0199e8a4c341b Author: Jan Beulich Date: Mon Feb 28 15:54:40 2011 +0000 x86: Use {push,pop}_cfi in more places Cleaning up and shortening code... Signed-off-by: Jan Beulich Cc: Alexander van Heukelum LKML-Reference: <4D6BD35002000078000341DA@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 39f2205e1abd1b6fffdaf45e1f1c3049a5f8999c Author: Jan Beulich Date: Mon Feb 28 15:31:59 2011 +0000 x86-64: Add CFI annotations to lib/rwsem_64.S These weren't part of the initial commit of this code. Signed-off-by: Jan Beulich Cc: Alexander van Heukelum LKML-Reference: <4D6BCDFF02000078000341B0@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 8a80c79a776d1b1b54895314ffaf53d0c7604c80 Author: Pablo Neira Ayuso Date: Mon Feb 28 17:59:15 2011 +0100 netfilter: nf_ct_tcp: fix out of sync scenario while in SYN_RECV This patch fixes the out of sync scenarios while in SYN_RECV state. Quoting Jozsef, what it happens if we are out of sync if the following: > > b. conntrack entry is outdated, new SYN received > > - (b1) we ignore it but save the initialization data from it > > - (b2) when the reply SYN/ACK receives and it matches the saved data, > > we pick up the new connection This is what it should happen if we are in SYN_RECV state. Initially, the SYN packet hits b1, thus we save data from it. But the SYN/ACK packet is considered a retransmission given that we're in SYN_RECV state. Therefore, we never hit b2 and we don't get in sync. To fix this, we ignore SYN/ACK if we are in SYN_RECV. If the previous packet was a SYN, then we enter the ignore case that get us in sync. This patch helps a lot to conntrackd in stress scenarios (assumming a client that generates lots of small TCP connections). During the failover, consider that the new primary has injected one outdated flow in SYN_RECV state (this is likely to happen if the conntrack event rate is high because the backup will be a bit delayed from the primary). With the current code, if the client starts a new fresh connection that matches the tuple, the SYN packet will be ignored without updating the state tracking, and the SYN+ACK in reply will blocked as it will not pass checkings III or IV (since all state tracking in the original direction is not initialized because of the SYN packet was ignored and the ignore case that get us in sync is not applied). I posted a couple of patches before this one. Changli Gao spotted a simpler way to fix this problem. This patch implements his idea. Cc: Changli Gao Cc: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 15e123e5d7e8ee9ba3717e743d8eb5fd0fe57712 Author: Thomas Renninger Date: Sun Feb 27 22:36:43 2011 +0100 intel_idle: Rename cpuidle states Userspace apps might have to cut off parts off the idle state name for display reasons. Switch NHM-C1 to C1-NHM (and others) so that a cut off name is unique and makes sense to the user. Signed-off-by: Thomas Renninger CC: lenb@kernel.org Signed-off-by: Len Brown commit e1412e636eeb84023b79e525909b366a9b28a185 Author: Stephen Warren Date: Tue Feb 22 20:16:34 2011 -0700 ASoC: Tegra: Fix error handling in DMA channel alloc tegra_dma_allocate_channel() returns NULL on errors, not an error pointer. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7c7102b7af1e5043ddb455f7fae307ed3b194074 Author: Adrian Knoth Date: Mon Feb 28 15:14:50 2011 +0100 ALSA: hdspm - Fix midi port initialization Depending on the model and the presence of a TCO module, the number of midi ports varies. Some have 1 port (MADIface), some have 2 (default), with TCO, there are 3. Don't hardcode the number of midi ports to initialize. This patch also fixes a boot lockup on MADIface. [Coding-style fixes by tiwai] Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 5027f347ffe6f719365ab13127106b52721676ff Author: Adrian Knoth Date: Mon Feb 28 15:14:49 2011 +0100 ALSA: hdspm - Abort on unknown firmware revision Don't continue if we cannot detect the real card type, otherwise, all subsequent functions, especially strcpy(), would fail, leaving the whole driver in an unusable state. Without such a protection, dmesg would look like this: Pid: 1525, comm: modprobe Not tainted 2.6.38-rc6 #1 MSI MS-7250/MS-7250 EIP: 0060:[] EFLAGS: 00010296 CPU: 1 EIP is at strcpy+0x10/0x30 EAX: f4d33e58 EBX: f5990800 ECX: f4d33e58 EDX: 00000000 ESI: 00000000 EDI: f4d33e58 EBP: f5990930 ESP: f3dd3e0c DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 f53d4204 00000000 f90bfc03 00000001 00000001 f3dd3e64 c10fedff f3dd3e7c f3d854e4 f53d4000 c10307b8 00000001 c10307b8 f5990860 c10307b8 00000001 c10332e5 f59908bc c12f4339 f59908bc f5990860 c11ef207 f4d33e00 f53d4000 [] ? snd_hdspm_probe+0x7e7/0x1166 [snd_hdspm] [] ? __sysfs_add_one+0x1f/0xf0 [] ? get_parent_ip+0x8/0x20 [] ? get_parent_ip+0x8/0x20 [] ? get_parent_ip+0x8/0x20 [] ? add_preempt_count+0xa5/0xd0 [] ? _raw_spin_lock_irqsave+0x19/0x40 [] ? pm_runtime_enable+0x17/0x80 [] ? local_pci_probe+0x42/0xb0 [] ? pci_device_probe+0x61/0x80 [] ? driver_probe_device+0x77/0x180 [] ? pci_match_device+0xa0/0xc0 [] ? __driver_attach+0x79/0x80 [] ? __driver_attach+0x0/0x80 [] ? bus_for_each_dev+0x52/0x80 [] ? driver_attach+0x16/0x20 [] ? __driver_attach+0x0/0x80 [] ? bus_add_driver+0xa1/0x220 [] ? pci_device_remove+0x0/0xf0 [] ? driver_register+0x63/0x120 [] ? __pci_register_driver+0x3d/0xb0 [] ? do_one_initcall+0x32/0x160 [] ? alsa_card_hdspm_init+0x0/0x14 [snd_hdspm] [] ? sys_init_module+0x99/0x1e0 [] ? sys_close+0x6d/0xc0 [] ? sysenter_do_call+0x12/0x26 ---[ end trace 239f0661c558378b ]--- Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 526ea867781ca26f8d7996aa769aa062e1159fd3 Author: Adrian Knoth Date: Mon Feb 28 15:14:48 2011 +0100 ALSA: hdspm - Add updated firmware revision for AES32 In contrast to the PCIe version (RME AES), the PCI version (RME AES32) has a different firmware revision. This patch adds the missing PCI revision. Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit d2d10a213294d6719d41aab5a111bce1168914a6 Author: Adrian Knoth Date: Mon Feb 28 15:14:47 2011 +0100 ALSA: hdspm - AES32: Use define instead of hardcoded channel count Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 2e820f58f7ad8eaca2f194ccdfea0de63e9c6d78 Author: Ian Campbell Date: Mon Feb 9 12:05:50 2009 -0800 xen/irq: implement bind_interdomain_evtchn_to_irqhandler for backend drivers Impact: new Xen-internal API Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit b5db7cde69f87178fb771970a2b512a452a9d680 Merge: d6ccc44 9e912f4 Author: Anton Vorontsov Date: Mon Feb 28 17:37:13 2011 +0300 Merge branch 'bq27x00-for-upstream' of git://git.metafoo.de/linux-2.6 commit 61a142b7e4b5c4cce1b4ea52a829984959120089 Author: Mark Brown Date: Mon Feb 28 14:33:01 2011 +0000 ASoC: Staticise non-exported symbols in SGTL5000 Signed-off-by: Mark Brown commit d6ccc442b12102414c1343f0adacaa8a1aaa516c Author: Heikki Krogerus Date: Fri Feb 25 13:56:36 2011 +0200 twl4030_charger: Make the driver atomic notifier safe This queues work from the otg notification where the i2c operations can be safely made. Needed for atomic otg notifiers. Signed-off-by: Heikki Krogerus Tested-by: Grazvydas Ignotas Signed-off-by: Anton Vorontsov commit 5f83df9a6192b3197a58beb66908b3732cb5a670 Author: Zeng Zhaoming Date: Mon Feb 28 03:45:21 2011 +0800 ASoC: remove unnecessary header including in SGTL5000 codec driver Remove unnecessary headers: - mach/hardware.h in sgtl5000.c - linux/i2c.h in sgtl5000.h Signed-off-by: Zeng Zhaoming Signed-off-by: Mark Brown commit ad849a223f912bfd6c666e0414d0ff368a9dc1a7 Author: Kukjin Kim Date: Mon Feb 28 20:35:33 2011 +0900 ARM: EXYNOS4: Fix wrong constants in the hotplug assembly code. This patch fixes wrong constants in the hotplug assembly code for Exynos4 such as Russell's changing in vexpress hotplug and fixes hard-coded control register constatns also. Reported-by: Changhwan Youn Cc: Russell King Signed-off-by: Kukjin Kim commit d73af18330ca5c17e03d36d436b5642ae764467f Author: Lars-Peter Clausen Date: Mon Feb 28 20:26:36 2011 +0900 ARM: S3C2440: Add touchscreen support on GTA02 This patch adds registers the s3c touchscreen and adc devices to add touchscreen support for the gta02. Signed-off-by: Lars-Peter Clausen Signed-off-by: Kukjin Kim commit 5246ae86770d084abff091a6090ca82bde8e2083 Author: Lars-Peter Clausen Date: Mon Feb 28 20:22:58 2011 +0900 ARM: S3C2440: Remove state_mem constraints for the pcf50633 regulators on GTA02 The pcf50633 regulator driver does not use the state_mem constraints, so there is no use in setting them. Signed-off-by: Lars-Peter Clausen Signed-off-by: Kukjin Kim commit b9ec40af0e18fb7d02106be148036c2ea490fdf9 Author: Christoph Lameter Date: Mon Feb 28 11:02:24 2011 +0100 percpu, x86: Add arch-specific this_cpu_cmpxchg_double() support Support this_cpu_cmpxchg_double() using the cmpxchg16b and cmpxchg8b instructions. -tj: s/percpu_cmpxchg16b/percpu_cmpxchg16b_double/ for consistency and other cosmetic changes. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 7c3343392172ba98d9d90a83edcc4c2e80897009 Author: Christoph Lameter Date: Mon Feb 28 11:02:24 2011 +0100 percpu: Generic support for this_cpu_cmpxchg_double() Introduce this_cpu_cmpxchg_double(). this_cpu_cmpxchg_double() allows the comparison between two consecutive words and replaces them if there is a match. bool this_cpu_cmpxchg_double(pcp1, pcp2, old_word1, old_word2, new_word1, new_word2) this_cpu_cmpxchg_double does not return the old value (difficult since there are two words) but a boolean indicating if the operation was successful. The first percpu variable must be double word aligned! -tj: Updated to return bool instead of int, converted size check to BUILD_BUG_ON() instead of VM_BUG_ON() and other cosmetic changes. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 8460ae70bb6bf1729bd247465c02b7a8c986c61d Author: Risto Suominen Date: Mon Feb 28 10:38:45 2011 +0200 ALSA: powermac - Allow input from microphone on Tumbler Allow input from microphone on remaining PowerBooks and iBooks with Tumbler. Tested only with PowerBook G4 Gigabit Ethernet (PowerBook3,3). [Fixed to use of_machine_is_compatible by tiwai] Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit a56ec98357ad26b380f1005198de1aa519c9e9cb Author: Sebastian Andrzej Siewior Date: Sun Feb 27 19:13:39 2011 +0100 x86: dt: Correct local apic documentation in device tree bindings Until "x86: dt: Cleanup local apic setup" we read the local apic address from the MSR and ignored the entry in DT. Reflect this change in the documentation. Signed-off-by: Sebastian Andrzej Siewior LKML-Reference: <1298830419-22681-1-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit a314c5c0040aab51ebb1ecfd37a9198a91962243 Author: Grant Likely Date: Tue Feb 22 20:06:04 2011 -0700 leds/leds-gpio: merge platform_driver with of_platform_driver Both interfaces can be driven with the same driver, and of_platform_driver is getting removed. This patch merges the two driver registrations. Signed-off-by: Grant Likely commit 4ebb24f707187196937607c60810d42f7112d7aa Author: Grant Likely Date: Tue Feb 22 20:01:33 2011 -0700 dt/sparc: Eliminate users of of_platform_{,un}register_driver Get rid of old users of of_platform_driver in arch/sparc. Most of_platform_driver users can be converted to use the platform_bus directly. Signed-off-by: Grant Likely commit 000061245a6797d542854106463b6b20fbdcb12e Author: Grant Likely Date: Tue Feb 22 19:59:54 2011 -0700 dt/powerpc: Eliminate users of of_platform_{,un}register_driver Get rid of old users of of_platform_driver in arch/powerpc. Most of_platform_driver users can be converted to use the platform_bus directly. Signed-off-by: Grant Likely commit 710ac54be44e0cc53f5bf29b03d12c8706e7077a Author: Grant Likely Date: Thu Feb 17 00:26:57 2011 -0700 dt/powerpc: move of_bus_type infrastructure to ibmebus arch/powerpc/kernel/ibmebus.c is the only remaining user of the of_bus_type support code for initializing the bus and registering drivers. All others have either been switched to the vanilla platform bus or already have their own infrastructure. This patch moves the functionality that ibmebus is using out of drivers/of/{platform,device}.c and into ibmebus.c where it is actually used. Also renames the moved symbols from of_platform_* to ibmebus_bus_* to reflect the actual usage. This patch is part of moving all of the of_platform_bus_type users over to the platform_bus_type. Signed-off-by: Grant Likely commit b826291c14c396e7aa5d84523aafac117f430902 Author: Grant Likely Date: Thu Feb 17 02:37:15 2011 -0700 drivercore/dt: add a match table pointer to struct device Add a new .of_match field to struct device which points at the matching device driver .of_match_table entry when a device is probed via the device tree Signed-off-by: Grant Likely Acked-by: Greg Kroah-Hartman commit 3d6b88282751a3329d7b041a8d18db87641db9e8 Author: Lennert Buytenhek Date: Tue Feb 22 18:18:51 2011 +0100 dt: Typo fix. Signed-off-by: Lennert Buytenhek Signed-off-by: Grant Likely commit 38a5d6736e7f714cc56d58692001e66dcbb98799 Merge: 0bfd95a f5412be Author: Grant Likely Date: Mon Feb 28 01:36:21 2011 -0700 Merge commit 'v2.6.38-rc6' into devicetree/next Conflicts: drivers/spi/pxa2xx_spi_pci.c commit ea7ee4cae4db6630b388f39c3abe4f86f67211f9 Author: Denis 'GNUtoo' Carikli Date: Fri Feb 18 22:22:23 2011 +0100 mx31: add support for the bugbase 1.3 from buglabs Note that the hardware schematics and documentations can be obtained here: http://www.bugcommunity.com/wiki/index.php/BUGbase Signed-off-by: Denis 'GNUtoo' Carikli Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit b03b2a7a2007e4122ec105b54580327d4126e000 Author: Shawn Guo Date: Wed Feb 23 16:06:55 2011 +0800 ARM: mx51_defconfig: change CONFIG_LEDS_CLASS 'm' to 'y' This patch is to fix the warning below. arch/arm/configs/mx51_defconfig:113:warning: symbol value 'm' invalid for LEDS_CLASS Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit ddb95fdd25d38a53eb3d227cc1a21f997d3bef7d Author: Fabio Estevam Date: Tue Feb 22 20:24:13 2011 -0300 ARM: imx/mach-mx25_3ds: Use IMX_GPIO_NR instead of hard-coded values Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 510dc2ec6849f1ca8ab829b8149d08b955db381b Author: Richard Zhu Date: Tue Feb 22 18:13:22 2011 +0800 ARM: imx53: add sdhc pad settings Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 5b2c4dd2ec12cf0e53b2bd2926f0fe2d1fbb4eda Author: Jiri Pirko Date: Wed Feb 23 09:05:42 2011 +0000 net: convert bonding to use rx_handler This patch converts bonding to use rx_handler. Results in cleaner __netif_receive_skb() with much less exceptions needed. Also bond-specific work is moved into bond code. Did performance test using pktgen and counting incoming packets by iptables. No regression noted. Signed-off-by: Jiri Pirko Reviewed-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit e3dfa389fd2c79526b4bbf295726b66d21001664 Author: David S. Miller Date: Sun Feb 27 23:20:19 2011 -0800 xfrm: Pass const xfrm_mark to xfrm_mark_put(). Signed-off-by: David S. Miller commit a70486f0e669730bad6713063e3f59e2e870044f Author: David S. Miller Date: Sun Feb 27 23:17:24 2011 -0800 xfrm: Pass const xfrm_address_t objects to xfrm_state_lookup* and xfrm_find_acq. Signed-off-by: David S. Miller commit 851586218f5d463bbd62af40dfa264c5e3539572 Author: David S. Miller Date: Sun Feb 27 23:07:02 2011 -0800 xfrm: Pass const arg to xfrm_alg_len and xfrm_alg_auth_len. Signed-off-by: David S. Miller commit 6f2f19ed955e62a6789495da512d510f26ad4885 Author: David S. Miller Date: Sun Feb 27 23:04:45 2011 -0800 xfrm: Pass name as const to xfrm_*_get_byname(). Signed-off-by: David S. Miller commit 3c861b88d0c2a1099b75c7a28648514cc67c8be6 Author: Lars-Peter Clausen Date: Mon Feb 28 15:25:43 2011 +0900 ARM: S3C2440: Call regulator_has_full_constraints on GTA02 This allows the regulator core to disable all regulators which are not in use at the end of the kernel init phase. Signed-off-by: Lars-Peter Clausen Signed-off-by: Kukjin Kim commit 7cda34407714b17db73d59f8fa9e9b62ee594ebf Author: Lars-Peter Clausen Date: Mon Feb 28 15:25:08 2011 +0900 ARM: S3C2440: Fix regulator valid_modes_ops on GTA02 The REGULATOR_CHANGE_STATUS flag needs to be set on valid_ops_mask, otherwise it a driver wont be able to turn the regulator on or off. Signed-off-by: Lars-Peter Clausen Signed-off-by: Kukjin Kim commit 003ddede62892f332992b200b1a1d7506f253d56 Author: Lars-Peter Clausen Date: Mon Feb 28 15:24:34 2011 +0900 ARM: S3C2440: Add button support on GTA02 This patch adds support for the two buttons found on the gta02 device, which are connectd to gpio pins, using the gpio-keys driver. Signed-off-by: Lars-Peter Clausen Signed-off-by: Kukjin Kim commit afbb1edcd48bc7e2d90d6ae9ea5aa662d222c07c Author: Lars-Peter Clausen Date: Mon Feb 28 15:24:07 2011 +0900 ARM: S3C2440: Register PCM device on GTA02 The ASoC multi-component patch introduced a new pcm platform device, which needs to be registered by board files in order for sound to work. This patch does this for the gta02 board. Signed-off-by: Lars-Peter Clausen Signed-off-by: Kukjin Kim commit d39195c33bb1b5fdcb0f416e8a0b34bfdb07a027 Author: Amir Goldstein Date: Mon Feb 28 00:53:45 2011 -0500 ext4: skip orphan cleanup if fs has unknown ROCOMPAT features Orphan cleanup is currently executed even if the file system has some number of unknown ROCOMPAT features, which deletes inodes and frees blocks, which could be very bad for some RO_COMPAT features, especially the SNAPSHOT feature. This patch skips the orphan cleanup if it contains readonly compatible features not known by this ext4 implementation, which would prevent the fs from being mounted (or remounted) readwrite. Signed-off-by: Amir Goldstein Signed-off-by: "Theodore Ts'o" commit 8e8eaabefee3ff645b9551ee32c6c54c7d80ad19 Author: Amir Goldstein Date: Sun Feb 27 23:32:12 2011 -0500 ext4: use the nblocks arg to ext4_truncate_restart_trans() nblocks is passed into ext4_truncate_restart_trans() from ext4_ext_truncate_extend_restart() with a value different from the default blocks_for_truncate(), but is being ignored. The two other calls to ext4_truncate_restart_trans() already pass the default value, which is then being recalculated inside the function. Fix the problem by using the passed argument. Signed-off-by: Amir Goldstein commit af50621a18418a7a0a71b0b4f60ce74b37967b9e Author: Dave Airlie Date: Mon Feb 28 14:27:03 2011 +1000 drm/radeon: make sure ib reads are in-order. have to read values from the IB in order as we could cross a page boundary at any time and won't be able to go backwards. Signed-off-by: Dave Airlie commit 5a698af53fb85b92d6462939a2c75ec4c7233bb9 Author: Amerigo Wang Date: Thu Feb 17 23:43:34 2011 +0000 bond: service netpoll arp queue on master device Neil pointed out that we can't send ARP reply on behalf of slaves, we need to move the arp queue to their bond device. Signed-off-by: WANG Cong Acked-by: Neil Horman Signed-off-by: David S. Miller commit ce722d269ff85ab11aa680784bcc6eff06e3e3ea Author: Thara Gopinath Date: Wed Feb 23 00:14:05 2011 -0700 OMAP3: hwmod data: add dmtimer Add dmtimer data. Signed-off-by: Thara Gopinath Signed-off-by: Tarun Kanti DebBarma Acked-by: Benoit Cousson commit b6b582291fbe8cca987c8823c87ee4a62b24f105 Author: Thara Gopinath Date: Wed Feb 23 00:14:05 2011 -0700 OMAP2430: hwmod data: add dmtimer Add dmtimer data. Signed-off-by: Thara Gopinath Signed-off-by: Tarun Kanti DebBarma Acked-by: Benoit Cousson commit eddb12624d9a8087f1f8f1a2812f840c5e8191ac Author: Thara Gopinath Date: Wed Feb 23 00:14:04 2011 -0700 OMAP2420: hwmod data: add dmtimer Add dmtimer data. Signed-off-by: Thara Gopinath Signed-off-by: Tarun Kanti DebBarma Acked-by: Benoit Cousson commit 32a9bb57d7c1fd04ae0f72b8f671501f000a0e9f Author: Manish Katiyar Date: Sun Feb 27 20:42:06 2011 -0500 ext4: fix missing iput of root inode for some mount error paths This assures that the root inode is not leaked, and that sb->s_root is NULL, which will prevent generic_shutdown_super() from doing extra work, including call sync_filesystem, which ultimately results in ext4_sync_fs() getting called with an uninitialized struct super, which is the cause of the crash noted in Kernel Bugzilla #26752. https://bugzilla.kernel.org/show_bug.cgi?id=26752 Signed-off-by: Manish Katiyar Signed-off-by: "Theodore Ts'o" commit 080e4130b1fb6a02e75149a1cccc8192e734713d Author: Amerigo Wang Date: Thu Feb 17 23:43:33 2011 +0000 netpoll: remove IFF_IN_NETPOLL flag V4: rebase to net-next-2.6 This patch removes the flag IFF_IN_NETPOLL, we don't need it any more since we have netpoll_tx_running() now. Signed-off-by: WANG Cong Acked-by: Neil Horman Cc: Herbert Xu Signed-off-by: David S. Miller commit 8a8efa22f51b3c3f879d272914e3dbbc2041bf91 Author: Amerigo Wang Date: Thu Feb 17 23:43:32 2011 +0000 bonding: sync netpoll code with bridge V4: rebase to net-next-2.6 V3: remove an useless #ifdef. This patch unifies the netpoll code in bonding with netpoll code in bridge, thanks to Herbert that code is much cleaner now. Signed-off-by: WANG Cong Acked-by: Neil Horman Cc: Herbert Xu Signed-off-by: David S. Miller commit cf8a47d1561a44f77f0269834a669e377b382f62 Author: Dan Carpenter Date: Sat Feb 26 04:48:18 2011 +0300 drm/radeon/r600_cs: off by one errors There are a bunch of off by one errors in the sanity checks here. Signed-off-by: Dan Carpenter Signed-off-by: Dave Airlie commit 6d9c85eb700bd3ac59e63bb9de463dea1aca084c Author: Yongqiang Yang Date: Sun Feb 27 17:25:47 2011 -0500 ext4: make FIEMAP and delayed allocation play well together Fix the FIEMAP ioctl so that it returns all of the page ranges which are still subject to delayed allocation. We were missing some cases if the file was sparse. Reported by Chris Mason : >We've had reports on btrfs that cp is giving us files full of zeros >instead of actually copying them. It was tracked down to a bug with >the btrfs fiemap implementation where it was returning holes for >delalloc ranges. > >Newer versions of cp are trusting fiemap to tell it where the holes >are, which does seem like a pretty neat trick. > >I decided to give xfs and ext4 a shot with a few tests cases too, xfs >passed with all the ones btrfs was getting wrong, and ext4 got the basic >delalloc case right. >$ mkfs.ext4 /dev/xxx >$ mount /dev/xxx /mnt >$ dd if=/dev/zero of=/mnt/foo bs=1M count=1 >$ fiemap-test foo >ext: 0 logical: [ 0.. 255] phys: 0.. 255 >flags: 0x007 tot: 256 > >Horray! But once we throw a hole in, things go bad: >$ mkfs.ext4 /dev/xxx >$ mount /dev/xxx /mnt >$ dd if=/dev/zero of=/mnt/foo bs=1M count=1 seek=1 >$ fiemap-test foo >< no output > > >We've got a delalloc extent after the hole and ext4 fiemap didn't find >it. If I run sync to kick the delalloc out: >$sync >$ fiemap-test foo >ext: 0 logical: [ 256.. 511] phys: 34048.. 34303 >flags: 0x001 tot: 256 > >fiemap-test is sitting in my /usr/local/bin, and I have no idea how it >got there. It's full of pretty comments so I know it isn't mine, but >you can grab it here: > >http://oss.oracle.com/~mason/fiemap-test.c > >xfsqa has a fiemap program too. After Fix, test results are as follows: ext: 0 logical: [ 256.. 511] phys: 0.. 255 flags: 0x007 tot: 256 ext: 0 logical: [ 256.. 511] phys: 33280.. 33535 flags: 0x001 tot: 256 $ mkfs.ext4 /dev/xxx $ mount /dev/xxx /mnt $ dd if=/dev/zero of=/mnt/foo bs=1M count=1 seek=1 $ sync $ dd if=/dev/zero of=/mnt/foo bs=1M count=1 seek=3 $ dd if=/dev/zero of=/mnt/foo bs=1M count=1 seek=5 $ fiemap-test foo ext: 0 logical: [ 256.. 511] phys: 33280.. 33535 flags: 0x000 tot: 256 ext: 1 logical: [ 768.. 1023] phys: 0.. 255 flags: 0x006 tot: 256 ext: 2 logical: [ 1280.. 1535] phys: 0.. 255 flags: 0x007 tot: 256 Tested-by: Eric Sandeen Reviewed-by: Andreas Dilger Signed-off-by: Yongqiang Yang Signed-off-by: "Theodore Ts'o" commit 4dd89fc6251a6bda2c18e71e7d266e983806579d Author: Theodore Ts'o Date: Sun Feb 27 17:23:47 2011 -0500 ext4: suppress verbose debugging information if malloc-debug is off If CONFIG_EXT4_DEBUG is enabled, then if a block allocation fails due to disk being full, a verbose debugging message is printed, even if the malloc-debug switch has not been enabled. Suppress the debugging message so that nothing is printed unless malloc-debug has been turned on. Signed-off-by: "Theodore Ts'o" commit a54aa76108619e5d8290b49081c2aaaeff5be9a2 Author: Theodore Ts'o Date: Sun Feb 27 16:43:24 2011 -0500 ext4: don't leave PageWriteback set after memory failure In ext4_bio_write_page(), if the memory allocation for the struct ext4_io_page fails, it returns with the page's PageWriteback flag set. This will end up causing the page not to skip writeback in WB_SYNC_NONE mode, and in WB_SYNC_ALL mode (i.e., on a sync, fsync, or umount) the writeback daemon will get stuck forever on the wait_on_page_writeback() function in write_cache_pages_da(). Or, if journalling is enabled and the file gets deleted, it the journal thread can get stuck in journal_finish_inode_data_buffers() call to filemap_fdatawait(). Another place where things can get hung up is in truncate_inode_pages(), called out of ext4_evict_inode(). Fix this by not setting PageWriteback until after we have successfully allocated the struct ext4_io_page. Signed-off-by: "Theodore Ts'o" commit 30e7627219f985cd17a1ac24e0163ebcfb1277bf Author: Ville Tervo Date: Tue Feb 22 16:10:53 2011 -0300 Bluetooth: Use ERR_PTR as return error from hci_connect Use ERR_PTR mechanism to return error from hci_connect. Signed-off-by: Ville Tervo Signed-off-by: Anderson Briglia Signed-off-by: Gustavo F. Padovan commit bdce7bafb786701004b2055e15d6ff4b3be678f3 Author: Szymon Janc Date: Fri Feb 25 19:05:49 2011 +0100 Bluetooth: Validate data size before accessing mgmt commands Crafted (too small) data buffer could result in reading data outside of buffer. Validate buffer size and return EINVAL if size is wrong. Signed-off-by: Szymon Janc Acked-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 4e51eae9cdda4bf096e73a4ebe23f8f96a17596a Author: Szymon Janc Date: Fri Feb 25 19:05:48 2011 +0100 Bluetooth: Move index to common header in management interface Most mgmt commands and event are related to hci adapter. Moving index to common header allow to easily use it in command status while reporting errors. For those not related to adapter use MGMT_INDEX_NONE (0xFFFF) as index. Signed-off-by: Szymon Janc Acked-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 779cb85016587d9ffaea681c38691d5301a3fedc Author: Szymon Janc Date: Fri Feb 25 19:05:47 2011 +0100 Bluetooth: Use proper command structure in remove_uuid The structure used for command was wrong (probably copy-paste mistake). Signed-off-by: Szymon Janc Acked-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 0c3a6ede3c9ffff6771915320504e8e140ac18b8 Author: Greg Kroah-Hartman Date: Sun Feb 27 07:43:10 2011 -0800 Staging: hv: add mouse driver This driver adds mouse support to the hyper-v subsystem. The code was originally written by Citrix, modified heavily by Hank at Microsoft, and then further by me, to get it to build properly due to all of the recent hyperv changes in the tree. At the moment, it is marked "BROKEN" as it has not been tested well, and it will conflict with other api changes that KY is doing, which I will fix up later in this driver. It still needs lots of work, and normal "cleanup". I don't recommend anyone running it on their machine unless they are very brave and know how to debug kernel drivers in a hyperv system. Signed-off-by: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 50d1ae2f8084807be80313796548a46f756dff91 Author: Nils Faerber Date: Sat Feb 26 23:45:42 2011 +0100 Staging: samsung-laptop: fix brightness level and add new device ids The patch is against the 2.6.37 drivers/staging/samsung-laptop driver and implements some extra enhancements. It fixes an issue that the brightness would not change the level at once as well as and some other oddities. It was resolved by reallocated the SABI memory reagion using the "nocache" option. The patch also introduces a new set of supported netbook models, especially the NC10plus which was used for testing this patch. This new set of models also offer 9 instead of just 8 brightness levels so it also introduces an additional parameter for the models struct so that models can define their own brightness range. Signed-off-by: Nils Faerber Signed-off-by: Greg Kroah-Hartman commit 8aa2bb43646aa24bcee5298bf83051a8ce9967a6 Author: Riccardo Magliocchetti Date: Sat Feb 26 17:06:44 2011 +0100 Staging: samsung-laptop: Add P460 to supported laptops Signed-off-by: Riccardo Magliocchetti Signed-off-by: Greg Kroah-Hartman commit dc5ecf45f3e772a9845c1afebfbc423474f2e46a Author: Joe Perches Date: Fri Feb 25 15:57:36 2011 -0800 Staging: samsung-laptop: Constify samsung-laptop.c Change sabi_config to const. Reduces data, increases text ~200 bytes. $ size drivers/platform/x86/samsung-laptop.o* text data bss dec hex filename 6933 5084 1560 13577 3509 drivers/platform/x86/samsung-laptop.o.new 6765 5252 1560 13577 3509 drivers/platform/x86/samsung-laptop.o.old Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 3de4ade3d696db31d1543dce585ba6296f876612 Author: Will Deacon Date: Mon Feb 21 19:12:27 2011 +0100 ARM: 6751/1: vexpress: select applicable errata workarounds in Kconfig The Cortex-A9 tile on the Versatile Express suffers from a number of engineering errata. This patch selects workarounds in the ARCH_VEXPRESS_CA9X4 Kconfig entry so that users don't need to worry about which ones to apply. Reported-by: Ulrich Weigand Signed-off-by: Will Deacon Signed-off-by: Russell King commit d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 Author: Mariusz Kozlowski Date: Sat Feb 26 20:10:26 2011 +0100 slub: fix ksize() build error mm/slub.c: In function 'ksize': mm/slub.c:2728: error: implicit declaration of function 'slab_ksize' slab_ksize() needs to go out of CONFIG_SLUB_DEBUG section. Acked-by: Randy Dunlap Acked-by: David Rientjes Signed-off-by: Mariusz Kozlowski Signed-off-by: Pekka Enberg commit 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 Author: Peter Korsgaard Date: Fri Feb 25 09:30:46 2011 -0800 Input: evdev - fix evdev_write return value on partial writes As was recently brought up on the busybox list (http://lists.busybox.net/pipermail/busybox/2011-January/074565.html), evdev_write doesn't properly check the count argument, which will lead to a return value > count on partial writes if the remaining bytes are accessible - causing userspace confusion. Fix it by only handling each full input_event structure and return -EINVAL if less than 1 struct was written, similar to how it is done in evdev_read. Reported-by: Baruch Siach Signed-off-by: Peter Korsgaard Acked-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov commit 5063511539bbb436ae8e4f75409561ef547f8516 Author: Henrik Rydberg Date: Fri Feb 25 09:33:13 2011 -0800 Input: bcm5974 - Report button also for zero fingers With the current code, pressing the integrated button with an isolating tool does not result in any button report. Fixed with this this patch. Signed-off-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov commit b6aa63eeb3e9670edd44162b441b6b7de304fed0 Author: Justin P. Mattock Date: Sat Feb 26 20:34:10 2011 -0800 sound:core:seq:seq_ports.c Remove one to many n's in a word. The Patch below removes one to many "n's" in a word.. Signed-off-by: Justin P. Mattock Signed-off-by: Takashi Iwai commit 70919e23ac35c9c244dfd73f97312894cae7d65f Author: Ursula Braun Date: Sat Feb 26 22:41:36 2011 -0800 qeth: remove needless IPA-commands in offline If a qeth device is set offline, data and control subchannels are cleared, which means removal of all IP Assist Primitive settings implicitly. There is no need to delete those settings explicitly. This patch removes all IP Assist invocations from offline. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 168fc0223c0e944957b1f31d88c2334fc904baf1 Author: Theodore Ts'o Date: Sat Feb 26 14:09:20 2011 -0500 ext4: move setup of the mpd structure to write_cache_pages_da() Move the initialization of all of the fields of the mpd structure to write_cache_pages_da(). This simplifies the code considerably. Signed-off-by: "Theodore Ts'o" commit 78aaced3408141bb7c836f2db0ca435790399da5 Author: Theodore Ts'o Date: Sat Feb 26 14:09:14 2011 -0500 ext4: don't lock the next page in write_cache_pages if not needed If we have accumulated a contiguous region of memory to be written out, and the next page can added to this region, don't bother locking (and then unlocking the page) before writing out the memory. In the unlikely event that the next page was being written back by some other CPU, we can also skip waiting that page to finish writeback. Signed-off-by: "Theodore Ts'o" commit ee6ecbcc5d73672217fdea420d182ecb0cdf310c Author: Theodore Ts'o Date: Sat Feb 26 14:08:11 2011 -0500 ext4: remove page_skipped hackery in ext4_da_writepages() Because the ext4 page writeback codepath had been prematurely calling clear_page_dirty_for_io(), if it turned out that a particular page couldn't be written out during a particular pass of write_cache_pages_da(), the page would have to get redirtied by calling redirty_pages_for_writeback(). Not only was this wasted work, but redirty_page_for_writeback() would increment wbc->pages_skipped to signal to writeback_sb_inodes() that buffers were locked, and that it should skip this inode until later. Since this signal was incorrect in ext4's case --- which was caused by ext4's historically incorrect use of write_cache_pages() --- ext4_da_writepages() saved and restored wbc->skipped_pages to avoid confusing writeback_sb_inodes(). Now that we've fixed ext4 to call clear_page_dirty_for_io() right before initiating the page I/O, we can nuke the page_skipped save/restore hackery, and breathe a sigh of relief. Signed-off-by: "Theodore Ts'o" commit 9749895644a817cfd28a535bc3ae60e4267bdc50 Author: Theodore Ts'o Date: Sat Feb 26 14:08:01 2011 -0500 ext4: clear the dirty bit for a page in writeback at the last minute Move when we call clear_page_dirty_for_io() to just before we actually write the page. This simplifies the code somewhat, and avoids marking pages as clean and then needing to remark them as dirty later. Signed-off-by: "Theodore Ts'o" commit 4f01b02c8c4e4111bd1adbcafb5741e8e991f5fd Author: Theodore Ts'o Date: Sat Feb 26 14:07:37 2011 -0500 ext4: simple cleanups to write_cache_pages_da() Eliminate duplicate code, unneeded variables, etc., to make it easier to understand the code. No behavioral changes were made in this patch. Signed-off-by: "Theodore Ts'o" commit 8eb9e5ce211de1b98bc84e93258b7db0860a103c Author: Theodore Ts'o Date: Sat Feb 26 14:07:31 2011 -0500 ext4: fold __mpage_da_writepage() into write_cache_pages_da() Fold the __mpage_da_writepage() function into write_cache_pages_da(). This will give us opportunities to clean up and simplify the resulting code. Signed-off-by: "Theodore Ts'o" commit 6fd7a46781999c32f423025767e43b349b967d57 Author: Theodore Ts'o Date: Sat Feb 26 13:53:09 2011 -0500 ext4: enable mblk_io_submit by default Now that we've fixed the file corruption bug in commit d50bdd5aa55, it's time to enable mblk_io_submit by default. Signed-off-by: "Theodore Ts'o" commit 6013270a030e370400e459922176c467a6c19293 Author: Wey-Yi Guy Date: Fri Feb 18 17:23:54 2011 -0800 iwlagn: enable BT session 2 type UART for 2000 series For 2000 series device, use session 2 type of BT UART message Signed-off-by: Wey-Yi Guy commit 399f66fda08675e3e231ac6df9c59ea831441f4b Author: Wey-Yi Guy Date: Tue Feb 22 08:24:22 2011 -0800 iwlagn: split BT page and inquiry UART msg Both inquiry and page was combine in frame7 of UART message, separate it Signed-off-by: Wey-Yi Guy commit d7220f0d4f7a7e84470916a3da8113a51f480514 Author: Wey-Yi Guy Date: Fri Feb 18 17:23:52 2011 -0800 iwlagn: add BT Session Activity 2 UART message (BT -> WiFi) additional UART message defines Signed-off-by: Wey-Yi Guy commit d6f626553d13e66b36a1ea2dbf23a5c21277a004 Author: Wey-Yi Guy Date: Fri Feb 18 17:23:51 2011 -0800 iwlagn: add bt config structure support for 2000 series 2000 series has different bt config command structure, add support for it Signed-off-by: Wey-Yi Guy commit 5596026081198f8012b52e0f589530f2bb6f9b40 Author: Wey-Yi Guy Date: Fri Feb 18 17:23:50 2011 -0800 iwlagn: name change for BT config command No functional changes, name changes to reflect the structure used by 6000 series. Signed-off-by: Wey-Yi Guy commit c7f5938adce6727b9d17785f289c1146bd88d678 Author: Curt Wohlgemuth Date: Sat Feb 26 12:27:52 2011 -0500 ext4: fix ext4_da_block_invalidatepages() to handle page range properly If ext4_da_block_invalidatepages() is called because of a failure from ext4_map_blocks() in mpage_da_map_and_submit(), it's supposed to clean up -- including unlock -- all the pages in the mpd structure. But these values may not match up, even on a system in which block size == page size: mpd->b_blocknr != mpd->first_page mpd->b_size != (mpd->next_page - mpd->first_page) ext4_da_block_invalidatepages() has been using b_blocknr and b_size; this patch changes it to use first_page and next_page. Tested: I injected a small number (5%) of failures in ext4_map_blocks() in the case that the flags contain EXT4_GET_BLOCKS_DELALLOC_RESERVE, and ran fsstress on this kernel. Without this patch, I got hung tasks every time. With this patch, I see no hangs in many runs of fsstress. Signed-off-by: Curt Wohlgemuth Signed-off-by: "Theodore Ts'o" commit e0fd9b90765f604374c42de8ac59d6584afce264 Author: Curt Wohlgemuth Date: Sat Feb 26 12:25:52 2011 -0500 ext4: mark multi-page IO complete on mapping failure In mpage_da_map_and_submit(), if we have a delayed block allocation failure from ext4_map_blocks(), we need to mark the IO as complete, by setting mpd->io_done = 1; Otherwise, we could end up submitting the pages in an outer loop; since they are unlocked on mapping failure in ext4_da_block_invalidatepages(), this will cause a bug check in mpage_da_submit_io(). I tested this by injected failures into ext4_map_blocks(). Without this patch, a simple fsstress run will bug check; with the patch, it works fine. Signed-off-by: Curt Wohlgemuth Signed-off-by: "Theodore Ts'o" commit 26d890f0d09fd58f7194aad651e86283cb9e6574 Author: Tomoya MORINAGA Date: Fri Feb 18 10:01:21 2011 +0530 pch_dma: set the number of array correctly set the number of array correctly. Signed-off-by: Tomoya MORINAGA Signed-off-by: Vinod Koul commit c5a9f9d0895b2c16908979244d3d678fd6db0545 Author: Tomoya MORINAGA Date: Fri Feb 18 10:01:20 2011 +0530 pch_dma: fix kernel error issue fix the following kernel error ------------[ cut here ]------------ WARNING: at kernel/softirq.c:159 _local_bh_enable_ip.clone.5+0x35/0x71() Hardware name: To be filled by O.E.M. Modules linked in: pch_uart pch_dma fuse mga drm cpufreq_ondemand acpi_cpufreq mperf ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables ipv6 uinput snd_hda_codec_realtek snd_hda_intel snd_hda_codec matroxfb_base snd_hwdep 8250_pnp snd_seq snd_seq_device matroxfb_DAC1064 snd_pcm joydev 8250 matroxfb_accel snd_timer matroxfb_Ti3026 ppdev pegasus parport_pc snd parport matroxfb_g450 g450_pll serial_core video output matroxfb_misc soundcore snd_page_alloc serio_raw pcspkr ext4 jbd2 crc16 sdhci_pci sdhci mmc_core floppy [last unloaded: scsi_wait_scan] Pid: 0, comm: swapper Not tainted 2.6.37.upstream_check+ #8 Call Trace: [] warn_slowpath_common+0x65/0x7a [] ? _local_bh_enable_ip.clone.5+0x35/0x71 [] warn_slowpath_null+0xf/0x13 [] _local_bh_enable_ip.clone.5+0x35/0x71 [] local_bh_enable_ip+0x8/0xa [] _raw_spin_unlock_bh+0x10/0x12 [] pd_prep_slave_sg+0xba/0x200 [pch_dma] [] pch_uart_interrupt+0x44d/0x6aa [pch_uart] [] handle_IRQ_event+0x1d/0x9e [] handle_fasteoi_irq+0x90/0xc7 [] ? handle_fasteoi_irq+0x0/0xc7 [] ? do_IRQ+0x3e/0x89 [] ? common_interrupt+0x29/0x30 [] ? sys_getpriority+0x12d/0x1a2 [] ? arch_local_irq_enable+0x5/0xb [] ? acpi_idle_enter_bm+0x22a/0x261 [] ? cpuidle_idle_call+0x70/0xa1 [] ? cpu_idle+0x49/0x6a [] ? rest_init+0x58/0x5a [] ? start_kernel+0x2d0/0x2d5 [] ? i386_start_kernel+0xce/0xd5 Signed-off-by: Tomoya MORINAGA Signed-off-by: Vinod Koul commit 44b74d909dc943fd9384930a141450cb17133511 Author: Clemens Ladisch Date: Wed Feb 23 09:27:40 2011 +0100 firewire: ohci: prevent starting of iso contexts with empty queue If a misguided program tried to start an isochronous context before it has queued any packets, the call would appear to succeed, but the context would not actually go into the running state, and the OHCI controller would then raise an unrecoverableError interrupt because the first Z value is zero and thus invalid. The driver logs such errors, but there is no mechanism to report this back to the program. Add an explicit check so that this error can be returned synchronously. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit e81cbebdfc384f9c2ae91225f16ef994118e5e2c Author: Clemens Ladisch Date: Wed Feb 16 10:32:11 2011 +0100 firewire: ohci: prevent iso completion callbacks after context stop To prevent the iso packet callback from being called after fw_iso_context_stop() has returned, make sure that the context's tasklet has finished executing before that. This fixes access-after-free bugs that have so far been observed only in the upcoming snd-firewire-speakers driver, but can theoretically also happen in the firedtv driver. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 5aaffc65a27dd9db65455c2c9ab3ede57238d2f5 Author: Clemens Ladisch Date: Mon Jan 31 11:58:58 2011 +0100 firewire: core: rename some variables In manage_channel(), rename the variables "c" and "i" to the more expressive "bit" and "channel". Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 8fd2af11d2fe1d50621e958747744f1c93e5b758 Author: Stefan Richter Date: Sun Jan 23 12:26:51 2011 +0100 firewire: nosy: should work on Power Mac G4 PCI too The first board generation of Power Mac G4 ("Yikes!", those with PCI graphics) still had a PCILynx controller like their G3 predecessors, but not the later AGP models. (Jonathan Woithe recalls to have heard of it, and some web sources reinforce it.) Signed-off-by: Stefan Richter commit d239b1dc093d551046a909920b5310c1d1e308c1 Author: Nicolas Pitre Date: Mon Feb 21 04:57:38 2011 +0100 ARM: 6746/1: remove the 4x expansion presumption while decompressing the kernel We currently presume a 4x expansion to guess the decompressed kernel size in order to determine if the decompressed kernel is in conflict with the location where zImage is loaded. This guess may cause many issues by overestimating the final kernel image size: - This may force a needless relocation if the location of zImage was fine, wasting some precious microseconds of boot time. - The relocation may be located way too far, possibly overwriting the initrd image in RAM. - If the kernel image includes a large already-compressed initramfs image then the problem is even more exacerbated. And if by some strange means the 4x guess is too low then we may overwrite ourselves with the decompressed image. So let's use the exact decompressed kernel image size instead. For that we need to rely on the stat command, but this is hardly a new build dependency as the kernel already depends on many external commands to be built provided by the coreutils package where stat is found. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 80f0aad77f3e1e9d9e518b09ac46963d628ae2be Author: Dave Martin Date: Fri Feb 25 17:54:52 2011 +0100 ARM: 6766/1: Thumb-2: Reflect ARM/Thumb-2 configuration in module vermagic Loading Thumb-2 modules into an ARM kernel or vice-versa isn't guaranteed to work safely, since the kernel is not interworking- aware everywhere. This patch adds "thumb2" to the module vermagic when CONFIG_THUMB2_KERNEL is enabled, to help avoid accidental loading of modules into the wrong kernel. Signed-off-by: Dave Martin Acked-by: Nicolas Pitre Signed-off-by: Russell King commit cc28989437de5617875a2943697fe6ba51a0da8f Author: Yinghai Lu Date: Sat Feb 26 13:05:43 2011 +0100 mm: Move early_node_map[] reverse scan helpers under HAVE_MEMBLOCK Heiko found recent memblock change triggers these warnings on s390: mm/page_alloc.c:3623:22: warning: 'last_active_region_index_in_nid' defined but not used mm/page_alloc.c:3638:22: warning: 'previous_active_region_index_in_nid' defined but not used Need to move those two function under HAVE_MEMBLOCK with its only user, find_memory_core_early(). -tj: Minor updates to description. Reported-by: Heiko Carstens Signed-off-by: Yinghai Lu Signed-off-by: Tejun Heo commit 8d32a307e4faa8b123dc8a9cd56d1a7525f69ad3 Author: Thomas Gleixner Date: Wed Feb 23 23:52:23 2011 +0000 genirq: Provide forced interrupt threading Add a commandline parameter "threadirqs" which forces all interrupts except those marked IRQF_NO_THREAD to run threaded. That's mostly a debug option to allow retrieving better debug data from crashing interrupt handlers. If "threadirqs" is not enabled on the kernel command line, then there is no impact in the interrupt hotpath. Architecture code needs to select CONFIG_IRQ_FORCED_THREADING after marking the interrupts which cant be threaded IRQF_NO_THREAD. All interrupts which have IRQF_TIMER set are implict marked IRQF_NO_THREAD. Also all PER_CPU interrupts are excluded. Forced threading hard interrupts also forces all soft interrupt handling into thread context. When enabled it might slow down things a bit, but for debugging problems in interrupt code it's a reasonable penalty as it does not immediately crash and burn the machine when an interrupt handler is buggy. Some test results on a Core2Duo machine: Cache cold run of: # time git grep irq_desc non-threaded threaded real 1m18.741s 1m19.061s user 0m1.874s 0m1.757s sys 0m5.843s 0m5.427s # iperf -c server non-threaded [ 3] 0.0-10.0 sec 1.09 GBytes 933 Mbits/sec [ 3] 0.0-10.0 sec 1.09 GBytes 934 Mbits/sec [ 3] 0.0-10.0 sec 1.09 GBytes 933 Mbits/sec threaded [ 3] 0.0-10.0 sec 1.09 GBytes 939 Mbits/sec [ 3] 0.0-10.0 sec 1.09 GBytes 934 Mbits/sec [ 3] 0.0-10.0 sec 1.09 GBytes 937 Mbits/sec Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra LKML-Reference: <20110223234956.772668648@linutronix.de> commit ccecc127a858927d45a9d004fa76866645eaff40 Merge: 573f89b 43c6318 Author: Mark Brown Date: Sat Feb 26 09:50:01 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 544b4a1f309d18f40969dbab7e08bafd136b2f55 Author: Venkatesh Pallipadi Date: Fri Feb 25 15:13:16 2011 -0800 sched: Clean up the IRQ_TIME_ACCOUNTING code Fix this warning: lkml.org/lkml/2011/1/30/124 kernel/sched.c:3719: warning: 'irqtime_account_idle_ticks' defined but not used kernel/sched.c:3720: warning: 'irqtime_account_process_tick' defined but not used In a cleaner way than: 7e9498705e81: sched: Add #ifdef around irq time accounting functions This patch will not have any functional impact. Signed-off-by: Venkatesh Pallipadi Cc: heiko.carstens@de.ibm.com Cc: a.p.zijlstra@chello.nl LKML-Reference: <1298675596-10992-1-git-send-email-venki@google.com> Signed-off-by: Ingo Molnar commit 4c93fbb0626080d196fb461c859b24a1feec3270 Author: David S. Miller Date: Fri Feb 25 18:07:06 2011 -0800 pfkey: Use const where possible. This actually pointed out a (seemingly known) bug where we mangle the pfkey header in a potentially shared SKB, which is fixed here. Signed-off-by: David S. Miller commit 50899e8d3a1b0655087838374a51ee5b865961b6 Author: Gustavo F. Padovan Date: Tue Feb 22 12:30:53 2011 -0300 Bluetooth: Remove duplicated BT_INFO() from L2CAP The message for the initialization of the L2CAP layer was being printed twice. Signed-off-by: Gustavo F. Padovan commit 0ed54dad52e8056f4440da723a4c117f2aef1f68 Author: Anand Gadiyar Date: Tue Feb 22 12:43:26 2011 +0530 Bluetooth: remove unnecessary call to hci_sock_cleanup hci_sock_cleanup is already called after the sock_err label. It appears that we can drop this call. Signed-off-by: Anand Gadiyar Signed-off-by: Gustavo F. Padovan commit 7bf04be8f48ceeeffa5b5a79734d6d6e0d59e5f8 Author: Stratos Psomadakis Date: Fri Feb 25 22:46:13 2011 +0200 x86, asm: Cleanup unnecssary macros in asm-offsets.c PAGE_SIZE_asm, PAGE_SHIFT_asm, THREAD_SIZE_asm can be safely removed from asm-offsets.c, and be replaced by their non-'_asm' counterparts in the code that uses them, since the _AC macro defined in include/linux/const.h makes PAGE_SIZE/PAGE_SHIFT/THREAD_SIZE work with as. Signed-off-by: Stratos Psomadakis LKML-Reference: <1298666774-17646-2-git-send-email-psomas@cslab.ece.ntua.gr> Signed-off-by: H. Peter Anvin commit 66245ad025e02fe9e727c03d43308bb24e346bb6 Author: Mike Waychison Date: Fri Feb 25 15:41:49 2011 -0800 firmware: Fix unaligned memory accesses in dmi-sysfs DMI entries are arranged in memory back to back with no alignment guarantees. This means that the struct dmi_header passed to callbacks from dmi_walk() itself isn't byte aligned. This causes problems on architectures that expect aligned data, such as IA64. The dmi-sysfs patchset introduced structure member accesses through this passed in dmi_header. Fix this by memcpy()ing the structures to temporary locations on stack when inspecting/copying them. Signed-off-by: Mike Waychison Tested-by: Tony Luck Signed-off-by: Greg Kroah-Hartman commit c6461f5c5970833cf28c5096cdfc7a095eb3bbb5 Author: Paul Walmsley Date: Fri Feb 25 15:49:53 2011 -0700 OMAP2+: clock: disable autoidle on all clocks during clock init Disable autoidle on all clocks during clock framework initialization. (If CONFIG_PM is set, autoidle is re-enabled for all clocks later in the boot process.) The principle behind this patch, and some similar patches, is that the kernel should start with all power management features disabled. Later in the boot process, the PM code, if compiled in with CONFIG_PM, enables or re-enables power management features. Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Reviewed-by: Kevin Hilman commit 70db8a6273692fdf5226c007c9882a10b3203963 Author: Rajendra Nayak Date: Fri Feb 25 15:49:02 2011 -0700 omap4: dpll: Enable auto gate control for all MX postdividers Enable hardware gate control for all dpll MX and X2 postdividers. This requires the allow_idle/deny_idle functions to be populated for all clock nodes (mx/x2 post dividers) in clkops. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 97f678989afe5dd1584a0877dfd8b0d2e124b73a Author: Rajendra Nayak Date: Fri Feb 25 15:49:01 2011 -0700 OMAP4: DPLL: Add dpll api to control GATE_CTRL On OMAP4, the dpll post divider outputs (MX outputs) along with clockout_x2 output provide a way to allow/deny hardware level autogating. Allowing autoidle would mean that the hw would autogate this clock when there is no dependency for it. Denying idle would mean that this clock output will be forced to stay enabled. Add dpll api's to read/allow/deny idle control for these dpll mx postdividers. NOTE: The gatectrl bit set to 0 allows gatectrl, and the bit set to 1 denies gatectrl. Signed-off-by: Rajendra Nayak [paul@pwsan.com: moved OMAP4-specific DPLL control code to mach-omap2/dpll44xx.c; added some documentation for CLOCK_CLKOUTX2] Signed-off-by: Paul Walmsley commit b80b956dc56c6a3cb77b97e2abff48fb7ebc2119 Author: Paul Walmsley Date: Fri Feb 25 15:49:01 2011 -0700 OMAP2+: clock: autoidle as many clocks as possible if CONFIG_OMAP_RESET_CLOCKS Attempt to enable autoidle for as many clocks as possible in the OMAP2+-common CONFIG_OMAP_RESET_CLOCKS code. Currently, this only enables DPLL autoidle for OMAP3/4 DPLLs; but future patches will enable autoidle for other clocks and the OMAP2 DPLL/APLLs. In the long run, we should probably get rid of CONFIG_OMAP_RESET_CLOCKS, and unconditionally run the code that it selects. Otherwise, the state of the clock tree won't match the hardware state - this could result in clocks being enabled or disabled unpredictably. Based on a patch by Rajendra Nayak that did this in the pm34xx.c/pm44xx.c code. Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit 6c6f5a7437955cec637c00ab1d09b8f70fc0ab3a Author: Rajendra Nayak Date: Fri Feb 25 15:49:00 2011 -0700 OMAP3/4: DPLL: Add allow_idle/deny_idle support for all DPLL's All OMAP3/4 dpll's support hardware level autogating. Populate allow_idle/deny_idle function pointers for all DPLL's in clkops. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 58e846fe7870d0ba22f8eeb1d522fbae37e80cbf Author: Rajendra Nayak Date: Fri Feb 25 15:49:00 2011 -0700 OMAP: clock: Add allow_idle/deny_idle support in clkops On OMAP various clock nodes (dpll's, mx post dividers, interface clocks) support hardware level autogating which can be controlled from software. Support such functionality by adding two new function pointer allow_idle and deny_idle in the clkops structure. These function pointers can be populated for any clock node which supports hardware level autogating. Also add 2 new functions (omap_clk_enable_autoidle_all and omap_clk_disable_autoidle_all) which can be called from architecture specific PM core code, if hardware level autogating (for all supported clock nodes) is to be enabled or disabled. Signed-off-by: Rajendra Nayak [paul@pwsan.com: use spinlock rather than mutex due to race; renamed functions; functions now return ints] Signed-off-by: Paul Walmsley commit 5a2926b8805bc697d47a243dbf2f20de68abe14c Author: Rajendra Nayak Date: Fri Feb 25 15:48:37 2011 -0700 omap3: dpll: Populate clkops for dpll1_ck DPLL1 on omap3 is very similar to the rest of the non-core dpll's. Hence populate clkops_omap3_noncore_dpll_ops as the clkops for it, instead of the currently populated clkops_null. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 6c52f32dcf1d76a95bda3a12d6be9a3102a2693c Author: Rajendra Nayak Date: Fri Feb 25 15:48:36 2011 -0700 omap: clock: Check for enable/disable ops support Check if enable/disable operations are supported for a given clock node before attempting to call them. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 5f8662ba3da6e410eb771b5d8751a1e02d87513f Author: Rajendra Nayak Date: Fri Feb 25 15:48:14 2011 -0700 OMAP4: clockdomain: Remove pr_errs' stating unsupported wkdep Now that wkup and sleep dependencies are supported (in the form of static deps) for OMAP4, remove all instances of pr_errs' stating dependencies are still unsupported on OMAP4. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 15b08d930f0b1a65a20e042046bd99ed7f75556b Author: Rajendra Nayak Date: Fri Feb 25 15:48:14 2011 -0700 OMAP4: clockdomain: Add wkup/sleep dependency support Add OMAP4 platform specific implementation to support clkdm wkup and sleep dependencies a.k.a static dependencies. Signed-off-by: Rajendra Nayak [paul@pwsan.com: removed comment about PRM; zero-prefixed STATICDEP register offset; fixed loop termination condition in omap4_clkdm_clear_all_wkup_sleep_deps(); thanks to Kevin Hilman for finding and helping fix this bug] Cc: Kevin Hilman Signed-off-by: Paul Walmsley commit 04eb7773d803bd0a8249c5bba37f81c496253ea1 Author: Rajendra Nayak Date: Fri Feb 25 15:48:14 2011 -0700 OMAP4: CM: Add CM accesor api for bitwise control Add new OMAP4 CM accesor apis to set/clear and read bitfields (based on mask) from CM registers. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 514c5948b2b5a3f9f9ebc344fc03073f3bd481b4 Author: Rajendra Nayak Date: Fri Feb 25 15:48:13 2011 -0700 OMAP4: clockdomain: Add clkdm static dependency srcs OMAP4 supports static dependencies and dynamic dependencies between clock domains. Static dependencies imply both wakeup as well as sleep dependencies. Generate all clockdomain static dependency sources. (Dynamic dependency sources are hardwired and cannot to controlled from software). The autogen scripts are updated to generate the contents of this patch. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 4da71ae607fc657075286abd2774041ff4d00fe5 Author: Rajendra Nayak Date: Fri Feb 25 16:06:48 2011 -0700 OMAP: clockdomain: Arch specific funcs for clkdm_clk_enable/disable Define the following architecture specific funtions for omap2/3/4 .clkdm_clk_enable .clkdm_clk_disable Convert the platform-independent framework to call these functions. Also rename the api's by removing the omap2_ preamble. Hence call omap2_clkdm_k_enable as clkdm_clk_enable and omap2_clkdm_clk_disable as clkdm_clk_disable.a Remove unused functions (_enable/_disable_hwsup) and unsed headers from clockdomain.c file. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 5cd1937b6d5990fe5d5287d925f05afd38e9fb02 Author: Rajendra Nayak Date: Fri Feb 25 16:06:48 2011 -0700 OMAP: clockdomain: Arch specific funcs for hwsup control of clkdm Define the following architecture specific funtions for omap2/3/4 .clkdm_allow_idle .clkdm_deny_idle Convert the platform-independent framework to call these functions. Also rename the api's by removing the omap2_ preamble. Hence call omap2_clkdm_allow_idle as clkdm_allow_idle and omap2_clkdm_deny_idle as clkdm_deny_idle. Make the _clkdm_add_autodeps and _clkdm_del_autodeps as non-static so they can be accessed from OMAP2/3 platform specific code. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 68b921ad7f35e0323ce0d9fe94e5701a112f257c Author: Rajendra Nayak Date: Fri Feb 25 16:06:47 2011 -0700 OMAP: clockdomain: Arch specific funcs for sleep/wakeup of clkdm Define the following architecture specific funtions for omap2/3/4 .clkdm_sleep .clkdm_wakeup Convert the platform-independent framework to call these functions. Also rename the api's by removing the omap2_ preamble. Hence call omap2_clkdm_wakeup as clkdm_wakeup and omap2_clkdm_sleep as clkdm_sleep. Signed-off-by: Rajendra Nayak [paul@pwsan.com: fixed omap3_clkdm_clear_all_sleepdeps() and omap2_clkdm_clear_all_wkdeps() to test against the correct loop termination condition; thanks to Kevin Hilman for finding and helping fix] Cc: Kevin Hilman Signed-off-by: Paul Walmsley commit 4aef7a2a5aad52b60ac1a2f3cee055b8271b70d5 Author: Rajendra Nayak Date: Fri Feb 25 16:06:47 2011 -0700 OMAP: clockdomain: Arch specific funcs to handle deps Define the following architecture specific funtions for omap2/3 .clkdm_add_wkdep .clkdm_del_wkdep .clkdm_read_wkdep .clkdm_clear_all_wkdeps .clkdm_add_sleepdep .clkdm_del_sleepdep .clkdm_read_sleepdep .clkdm_clear_all_sleepdeps Convert the platform-independent framework to call these functions. With this also move the clkdm lookups for all wkdep_srcs and sleepdep_srcs at clkdm_init. Signed-off-by: Rajendra Nayak [paul@pwsan.com: fixed loop termination conditions in omap*_clkdm_clear_all_*(); thanks to Kevin Hilman for finding and helping fix those bugs; also avoid re-resolving clockdomains during init; abstracted out clkdm_dep walk] Cc: Kevin Hilman Signed-off-by: Paul Walmsley commit 32d4034eea9c5c2b2edc365e1a0787c8f5b84c3c Author: Rajendra Nayak Date: Fri Feb 25 16:06:47 2011 -0700 OMAP: clockdomain: Infrastructure to put arch specific code Put infrastructure in place, so arch specific func pointers can be hooked up to the platform-independent part of the framework. This is in preparation of splitting the clockdomain framework into platform-independent part (for all omaps) and platform-specific parts. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 3673d1ef5dc94d8b942c33fe1895a0ff52efbc3c Author: Rajendra Nayak Date: Fri Feb 25 16:06:46 2011 -0700 OMAP: powerdomain: remove unused func declaration Trivial fix to remove the unused function declaration from the powerdomain header. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley commit 00bfe272bb7f26511919da1b44fa5d21e67bab15 Author: Greg Kroah-Hartman Date: Fri Feb 25 14:41:06 2011 -0800 staging: samsung-laptop: address review comments Fixed up the printk stuff to use pr_XXX where applicable, and reversed the logic when testing for commands to complete properly. Signed-off-by: Greg Kroah-Hartman commit 189b5d559c49b6ba422a9e2e8d676b6f30f5d898 Author: Greg Kroah-Hartman Date: Fri Feb 25 14:32:26 2011 -0800 Staging: samsung-laptop: fix header address for N128 When doing the conversion to the "support more than one model" the header address of the N128 was incorrectly copied. This fixes the driver to work properly now on this laptop model. Cc: Ingmar Steen Signed-off-by: Greg Kroah-Hartman commit ef33417dc9be8d8daca3c715fb5d1226b250725c Author: John W. Linville Date: Fri Feb 25 15:51:01 2011 -0500 iwlegacy: change some symbols duplicated from iwlwifi directory drivers/net/wireless/iwlegacy/built-in.o:(.rodata+0x29f0): multiple definition of `iwl_rates' drivers/net/wireless/iwlwifi/built-in.o:(.rodata+0xa68): first defined here powerpc64-linux-ld: Warning: size of symbol `iwl_rates' changed from 143 in drivers/net/wireless/iwlwifi/built-in.o to 130 in drivers/net/wireless/iwlegacy/built-in.o drivers/net/wireless/iwlegacy/built-in.o:(.data+0x0): multiple definition of `bt_coex_active' drivers/net/wireless/iwlwifi/built-in.o:(.data+0x668): first defined here drivers/net/wireless/iwlegacy/built-in.o:(.rodata+0x750): multiple definition of `iwl_eeprom_band_1' drivers/net/wireless/iwlwifi/built-in.o:(.rodata+0x27d0): first defined here drivers/net/wireless/iwlegacy/built-in.o:(.rodata+0x3f0): multiple definition of `iwl_bcast_addr' drivers/net/wireless/iwlwifi/built-in.o:(.rodata+0x24f8): first defined here drivers/net/wireless/iwlegacy/built-in.o:(.bss+0x3d48): multiple definition of `iwl_debug_level' drivers/net/wireless/iwlwifi/built-in.o:(.bss+0x21950): first defined here Reported-by: Stephen Rothwell Signed-off-by: John W. Linville commit 52bc97470e22e67f11b054e51a31eee100ef6867 Author: Hagen Paul Pfeifer Date: Fri Feb 25 05:45:21 2011 +0000 sched: protocol only needed when CONFIG_NET_CLS_ACT is enabled Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit ddc3731fcb712646e4a0f8e6117af6a153e9d36f Author: Hagen Paul Pfeifer Date: Fri Feb 25 05:45:20 2011 +0000 ipv6: ignore rtnl_unicast() return code rtnl_unicast() return value is not of interest, we can silently ignore it, save some instructions and four byte on the stack. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit e9476e95d8707d1567d1af60df2c1f19630219a3 Author: Hagen Paul Pfeifer Date: Fri Feb 25 05:45:19 2011 +0000 ipv6: variable next is never used in this function Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit 96d796a38e9ec9a7c04a6cda3fc15d79efebb008 Author: Hagen Paul Pfeifer Date: Fri Feb 25 05:45:18 2011 +0000 ipv6: hash is calculated but not used afterwards hash is declared and assigned but not used anymore. ipv6_addr_hash() exhibit no side-effects. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit a5f5e3689c8682e06ba155676d69ccf3f4172cb4 Author: Hagen Paul Pfeifer Date: Fri Feb 25 05:45:17 2011 +0000 ipv6: totlen is declared and assigned but not used Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit 3b193ade594e4f2d501d4c3a9f43d49176f03230 Author: Hagen Paul Pfeifer Date: Fri Feb 25 05:45:16 2011 +0000 dccp: newdp is declared/assigned but never be used Declaration and assignment of newdp is removed. Usage of dccp_sk() exhibit no side effects. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit db559b079a60535f45a06f64595fbe4b78e2efbb Author: Roman Grebennikov Date: Fri Feb 18 13:15:57 2011 +0300 staging: samsung-laptop: Add support for Samsung NP-X120/X170 laptop Add Samsung NP-X120/X170 laptop DMI signature to samsung-laptop DMI table. Signed-off-by: Roman Grebennikov Signed-off-by: Greg Kroah-Hartman commit 9b5040be4779b36d208362a3c0df00bb97f6c0a0 Author: Greg Kroah-Hartman Date: Fri Feb 25 13:35:41 2011 -0800 staging: samsung-laptop: add support for R519 laptops Reported-by: Piotr Mitas Signed-off-by: Greg Kroah-Hartman commit e20b6f359ad9d1fe26eae08a0051bcbd277be540 Author: Greg Kroah-Hartman Date: Fri Feb 25 13:05:30 2011 -0800 staging: samsung-laptop: add support for r70 laptops Reported-by: Evgeny Bobkin Signed-off-by: Greg Kroah-Hartman commit 5f5b5c51858e79fb0b338dd0d96c8789ba876878 Author: Richard Schütz Date: Fri Feb 11 17:27:19 2011 +0100 staging: samsung-laptop: add support for N145P/N250P/N260P machines Add DMI data for Samsung N145P/N250P/N260P Signed-off-by: Richard Schütz Signed-off-by: Greg Kroah-Hartman commit 0b24dcb7f2f7a0ce9b762eef0362c21c88f47b32 Author: Eric Paris Date: Fri Feb 25 15:39:20 2011 -0500 Revert "selinux: simplify ioctl checking" This reverts commit 242631c49d4cf39642741d6627750151b058233b. Conflicts: security/selinux/hooks.c SELinux used to recognize certain individual ioctls and check permissions based on the knowledge of the individual ioctl. In commit 242631c49d4cf396 the SELinux code stopped trying to understand individual ioctls and to instead looked at the ioctl access bits to determine in we should check read or write for that operation. This same suggestion was made to SMACK (and I believe copied into TOMOYO). But this suggestion is total rubbish. The ioctl access bits are actually the access requirements for the structure being passed into the ioctl, and are completely unrelated to the operation of the ioctl or the object the ioctl is being performed upon. Take FS_IOC_FIEMAP as an example. FS_IOC_FIEMAP is defined as: FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) So it has access bits R and W. What this really means is that the kernel is going to both read and write to the struct fiemap. It has nothing at all to do with the operations that this ioctl might perform on the file itself! Signed-off-by: Eric Paris Acked-by: Stephen Smalley commit 47ac19ea429aee561f66e9cd05b908e8ffbc498a Author: Eric Paris Date: Fri Feb 25 15:39:20 2011 -0500 selinux: drop unused packet flow permissions These permissions are not used and can be dropped in the kernel definitions. Suggested-by: Stephen Smalley Signed-off-by: Eric Paris Acked-by: Stephen Smalley commit 5f16a43617d46cf255a66f4dc193a7f5b2540aaf Author: Johannes Berg Date: Fri Feb 25 15:36:57 2011 +0100 mac80211: support direct offchannel TX offload For devices supported by iwlwifi sometimes off-channel transmissions need to be handled by the device completely. To support this mac80211 needs to pass the frame directly to the driver and not through the TX path as the driver needs the frame and channel information at the same time. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 8628172f45c839376bf2b70bbd326d56e68dadc3 Author: Stanislaw Gruszka Date: Fri Feb 25 14:46:02 2011 +0100 mac80211: better fix for conn_mon_timer running after disassociate Is still possible to schedule conn_mon_timer after disassociate from ieee80211_sta_tx_notify() and ieee80211_offchannel_ps_disable(). Move disassociate check to ieee80211_sta_reset_conn_monitor() to cover all these cases, and add unlikely since in most the time we call ieee80211_sta_reset_conn_monitor() when associated. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 08f6c85223b71ba7bf2a5ebbdf735881475a8e3c Author: Vivek Natarajan Date: Fri Feb 25 17:31:03 2011 +0530 ath9k: Fix compilation warning. Initialize txq to avoid this warning: drivers/net/wireless/ath/ath9k/main.c: In function ‘ath9k_flush’: drivers/net/wireless/ath/ath9k/main.c:2138: warning: ‘txq’ may be used uninitialized in this function Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 7e3514fdc0f2c1c007f46f0ca584808edbfaee8f Author: Vivek Natarajan Date: Fri Feb 25 17:31:02 2011 +0530 ath9k: Cancel pll_work while disabling radio. pll_work should be cancelled on full_sleep or it may cause redundant chip reset. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 06fed5737932585775f0f70bc06eb0fac76c7a27 Author: Vivek Natarajan Date: Fri Feb 25 17:31:01 2011 +0530 ath9k_hw: Fix pcie_serdes setting for AR9485 1.1 version. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 3311abbbbff1719bbbc8208761e4a75f095f383c Author: RafaÅ‚ MiÅ‚ecki Date: Fri Feb 25 12:34:11 2011 +0100 b43: fill PHY ctl word1 in TX header for N-PHY This patch fixes tramissing on OFDM rates for PHYs 1 and 2. There is still something wrong with PHYs 3+. Tests has shown decreasing of performance on CCK rates by 1-2%, we have to live with that. Additionaly this noticeably reduces amount of PHY errors. They were mostly produced by auto-switching to higher rate for better performanced, which resulted in no transmit at all and PHY errors. Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit 850bedcc10377629ea88c96c07f8e1d0a99cf4ca Author: Johannes Berg Date: Fri Feb 25 12:24:11 2011 +0100 iwlagn: fix iwlagn_check_needed_chains This function was intended to calculate the number of RX chains needed, but could only work where the AP's streams were asymmetric, i.e. 2 TX and 3 RX or similar. In the case where IEEE80211_HT_MCS_TX_RX_DIFF was not set, this function would calculate the wrong information. Additionally, mac80211 didn't pass through the required values at all, so it couldn't work anyway. Rewrite the logic in this function and add appropriate comments to make it readable. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 90b4ca9dba87bef9a3352c3d5bcab998be70fc4f Author: Johannes Berg Date: Fri Feb 25 12:24:10 2011 +0100 mac80211: copy peer MCS TX parameters We need to copy this to allow drivers to look at the information where needed. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 46c2cb8cae87c903caba67eb8afc0f8985832956 Author: Joe Gunn Date: Fri Feb 25 02:08:49 2011 -0800 orinoco: Drop scan results with unknown channels If the frequency can not be mapped to a channel structure log it and drop it. Signed-off-by: Joseph J. Gunn Signed-off-by: John W. Linville commit 2973773775ec05d18e4b942a28604120cb15bbf2 Author: Johannes Berg Date: Thu Feb 24 14:46:13 2011 +0100 mac80211: remove IBSS merge delay This reverts 4a332a38 ("mac80211: Give it some time to do the TSF sync"). There's no point in waiting with a new IBSS merge just because the hardware hasn't merged up with the old IBSS yet, and since 34e8f082 we no longer attempt to merge with the IBSS we're already in. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7bb4568372856688bc070917265bce0b88bb7d4d Author: Johannes Berg Date: Thu Feb 24 14:42:06 2011 +0100 mac80211: make tx() operation return void The return value of the tx operation is commonly misused by drivers, leading to errors. All drivers will drop frames if they fail to TX the frame, and they must also properly manage the queues (if they didn't, mac80211 would already warn). Removing the ability for drivers to return a BUSY value also allows significant cleanups of the TX TX handling code in mac80211. Note that this also fixes a bug in ath9k_htc, the old "return -1" there was wrong. Signed-off-by: Johannes Berg Tested-by: Sedat Dilek [ath5k] Acked-by: Gertjan van Wingerde [rt2x00] Acked-by: Larry Finger [b43, rtl8187, rtlwifi] Acked-by: Luciano Coelho [wl12xx] Signed-off-by: John W. Linville commit 43f12d47f0580e04e26c14c03cb19cea9687854e Author: Stanislaw Gruszka Date: Thu Feb 24 14:23:55 2011 +0100 iwlegacy: do not set tx power when channel is changing Same fix as f844a709a7d8f8be61a571afc31dfaca9e779621 "iwlwifi: do not set tx power when channel is changing". Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 3083e83c86e604ac7005c100b7d7242389407ba5 Author: Christian Lamparter Date: Thu Feb 24 14:12:20 2011 +0100 p54: implement set_coverage_class The callback sets slot time as specified in IEEE 802.11-2007 section 17.3.8.6 and raises round trip delay accordingly. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 9effd8221fc109e5d33e417e3eaaf8e475003e2d Author: Mike Waychison Date: Tue Feb 22 17:53:36 2011 -0800 firmware: Add documentation for /sys/firmware/dmi Document the new ABI added by the dmi-sysfs module. Signed-off-by: Mike Waychison Signed-off-by: Greg Kroah-Hartman commit a3857a5c9893aa69d44be6e881927b0950b1d931 Author: Mike Waychison Date: Tue Feb 22 17:53:31 2011 -0800 firmware: Expose DMI type 15 System Event Log The System Event Log described by DMI entry type 15 may be backed by either memory or may be indirectly accessed via an IO index/data register pair. In order to get read access to this log, expose it in the "system_event_log" sub-directory of type 15 DMI entries, ie: /sys/firmware/dmi/entries/15-0/system_event_log/raw_event_log. This commit handles both IO accessed and memory access system event logs. OEM specific access and GPNV support is explicitly not handled and we error out in the logs when we do not recognize the access method. Signed-off-by: Mike Waychison Signed-off-by: Greg Kroah-Hartman commit 925a1da7477fc4ba5849c6f0243934fa5072493c Author: Mike Waychison Date: Tue Feb 22 17:53:26 2011 -0800 firmware: Break out system_event_log in dmi-sysfs The optional type 15 entry of the DMI table describes a non-volatile storage-backed system event log. In preparation for the next commit which exposes the raw bits of the event log to userland, create a new sub-directory within the dmi entry called "system_event_log" and expose attribute files that describe the event log itself. Currently, only a single child object is permitted within a dmi_sysfs_entry. We simply point at this child from the dmi_sysfs_entry if it exists. Signed-off-by: Mike Waychison Signed-off-by: Greg Kroah-Hartman commit 948af1f0bbc8526448e8cbe3f8d3bf211bdf5181 Author: Mike Waychison Date: Tue Feb 22 17:53:21 2011 -0800 firmware: Basic dmi-sysfs support Introduce a new module "dmi-sysfs" that exports the broken out entries of the DMI table through sysfs. Entries are enumerated via dmi_walk() on module load, and are populated as kobjects rooted at /sys/firmware/dmi/entries. Entries are named "-", where: : is the type of the entry, and : is the ordinal count within the DMI table of that entry type. This instance is used in lieu the DMI entry's handle as no assurances are made by the kernel that handles are unique. All entries export the following attributes: length : The length of the formatted portion of the entry handle : The handle given to this entry by the firmware raw : The raw bytes of the entire entry, including the formatted portion, the unformatted (strings) portion, and the two terminating nul characters. type : The DMI entry type instance : The ordinal instance of this entry given its type. position : The position ordinal of the entry within the table in its entirety. Entries in dmi-sysfs are kobject backed members called "struct dmi_sysfs_entry" and belong to dmi_kset. They are threaded through entry_list (protected by entry_list_lock) so that we can find them at cleanup time. Signed-off-by: Mike Waychison Signed-off-by: Greg Kroah-Hartman commit 4a7ab3dcad0b66a486c468ccf0d6197c5dbe3326 Author: Steffen Klassert Date: Wed Feb 23 12:56:23 2011 +0100 selinux: Fix packet forwarding checks on postrouting The IPSKB_FORWARDED and IP6SKB_FORWARDED flags are used only in the multicast forwarding case to indicate that a packet looped back after forward. So these flags are not a good indicator for packet forwarding. A better indicator is the incoming interface. If we have no socket context, but an incoming interface and we see the packet in the ip postroute hook, the packet is going to be forwarded. With this patch we use the incoming interface as an indicator on packet forwarding. Signed-off-by: Steffen Klassert Acked-by: Paul Moore Signed-off-by: Eric Paris commit b9679a76187694138099e09d7f5091b73086e6d7 Author: Steffen Klassert Date: Wed Feb 23 12:55:21 2011 +0100 selinux: Fix wrong checks for selinux_policycap_netpeer selinux_sock_rcv_skb_compat and selinux_ip_postroute_compat are just called if selinux_policycap_netpeer is not set. However in these functions we check if selinux_policycap_netpeer is set. This leads to some dead code and to the fact that selinux_xfrm_postroute_last is never executed. This patch removes the dead code and the checks for selinux_policycap_netpeer in the compatibility functions. Signed-off-by: Steffen Klassert Acked-by: Paul Moore Signed-off-by: Eric Paris commit 8f82a6880d8d03961181d973388e1df2772a8b24 Author: Steffen Klassert Date: Wed Feb 23 12:54:33 2011 +0100 selinux: Fix check for xfrm selinux context algorithm selinux_xfrm_sec_ctx_alloc accidentally checks the xfrm domain of interpretation against the selinux context algorithm. This patch fixes this by checking ctx_alg against the selinux context algorithm. Signed-off-by: Steffen Klassert Acked-by: Paul Moore Signed-off-by: Eric Paris commit 93c890dbe5287d146007083021148e7318058e37 Author: Mike Waychison Date: Tue Feb 22 17:53:15 2011 -0800 firmware: Add DMI entry types to the headers In preparation for the upcoming commits, introduce the DMI entry types to the headers. These type names are based on those specified in the DMTF SMBIOS specification version 2.7.1. Signed-off-by: Mike Waychison Signed-off-by: Greg Kroah-Hartman commit 2c590f3ca99c193a04fe90ec89046138b66fcc1e Author: Tejun Heo Date: Mon Jan 24 17:54:48 2011 +0100 nozomi: don't use flush_scheduled_work() flush_scheduled_work() in tty_exit() doesn't seem to target any specific work. If it was to flush work items used in tty generic layer, they're already flushed properly during tty release. flush_scheduled_work() is going away. Remove the seemingly redundant usage. Signed-off-by: Tejun Heo Cc: Jiri Slaby Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 601e72a067f0230cb815ae0c206081c3ea19c095 Author: Justin P. Mattock Date: Thu Feb 24 22:13:09 2011 -0800 drivers:uwb:scan.c remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 7aed9dfedd39ab77fb661d0e6d331aeabe61aa85 Author: Justin P. Mattock Date: Thu Feb 24 22:11:55 2011 -0800 drivers:usb:wusbhc.h remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 309a057932ab20057da9fe4cb18fb61803dfc924 Author: Martin Jansen Date: Thu Feb 24 14:50:16 2011 +0100 USB: opticon: add rts and cts support Add support for RTS and CTS line status Signed-off-by: Martin Jansen Signed-off-by: Greg Kroah-Hartman commit c9642374d0e969e8c17f4f31cd1a2bd111634227 Author: Dmitry Torokhov Date: Wed Feb 23 14:38:20 2011 -0800 USB: fix unsafe USB_SS_MAX_STREAMS() definition Macro arguments used in expressions need to be enclosed in parenthesis to avoid unpleasant surprises. Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 969e3033ae7733a0af8f7742ca74cd16c0857e71 Author: Alan Stern Date: Wed Feb 23 15:28:18 2011 -0500 USB: serial drivers need to use larger bulk-in buffers When a driver doesn't know how much data a device is going to send, the buffer size should be at least as big as the endpoint's maxpacket value. The serial drivers don't follow this rule; many of them request only 256-byte bulk-in buffers. As a result, they suffer overflow errors if a high-speed device wants to send a lot of data, because high-speed bulk endpoints are required to have a maxpacket size of 512. This patch (as1450) fixes the problem by using the driver's bulk_in_size value as a minimum, always allocating buffers no smaller than the endpoint's maxpacket size. Signed-off-by: Alan Stern Tested-by: Flynn Marquardt CC: [after .39-rc1 is out] Signed-off-by: Greg Kroah-Hartman commit 22ced6874fc47bb051e7460443e454ca8efc457e Author: Anoop Date: Thu Feb 24 19:26:28 2011 +0530 USB: EHCI bus glue for on-chip PMC MSP USB controller This patch add bus glue for USB controller commonly found in PMC-Sierra MSP71xx family of SoC's. Signed-off-by: Anoop P A Signed-off-by: Greg Kroah-Hartman commit 2edb11cbac95231f66f1239b3ca26bdc0967183a Author: Maulik Mankad Date: Tue Feb 22 19:08:42 2011 +0530 usb: gadget: composite: fix req->length in composite_setup() When USB CV MSC tests are run on f_mass_storage gadget Bulk Only Mass Storage Reset fails since req->length is set to USB_BUFSIZ=1024 in composite_setup(). Initialize req->length to zero to fix this. Signed-off-by: Maulik Mankad Cc: Alan Stern Cc: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 3b29b68b1627781b5eecb581d3b9d5f0043a72f2 Author: Alan Stern Date: Tue Feb 22 09:53:41 2011 -0500 USB: use "device number" instead of "address" The USB stack historically has conflated device numbers (i.e., the value of udev->devnum) with device addresses. This is understandable, because until recently the two values were always the same. But with USB-3.0 they aren't the same, so we should start calling these things by their correct names. This patch (as1449b) changes many of the references to "address" in the hub driver to "device number" or "devnum". The patch also removes some unnecessary or misleading comments. Signed-off-by: Alan Stern Reported-by: Luben Tuikov Reviewed-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 10408bb9c4bf669f56f8de380f3ce18ef601a3d4 Author: Rémi Denis-Courmont Date: Mon Feb 21 16:16:53 2011 +0200 USB: f_phonet: avoid pskb_pull(), fix OOPS with CONFIG_HIGHMEM This is similar to what we already do in cdc-phonet.c in the same situation. Signed-off-by: Rémi Denis-Courmont Signed-off-by: Greg Kroah-Hartman commit 18f53461e786f21e5625124b507802a797337f6f Author: Pavankumar Kondeti Date: Fri Feb 18 17:30:11 2011 +0530 USB: EHCI: Fix compiler warnings with MSM driver This patch fixes the following compile warnings drivers/usb/host/ehci-dbg.c:45: warning: 'dbg_hcs_params' defined but not used drivers/usb/host/ehci-dbg.c:89: warning: 'dbg_hcc_params' defined but not used Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 541cace8cd619808424ffaf1c8f7a006e5d55742 Author: Pavankumar Kondeti Date: Fri Feb 18 17:43:18 2011 +0530 USB: gadget: Add test mode support for ci13xxx_udc Implement the test modes mentioned in 7.1.20 section of USB 2.0 specification. High-speed capable devices must support these test modes to facilitate compliance testing. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit e2b61c1df650595d0216c6d086024b5a98d949c7 Author: Pavankumar Kondeti Date: Fri Feb 18 17:43:17 2011 +0530 USB: gadget: Implement remote wakeup in ci13xxx_udc This patch adds support for remote wakeup. The following things are handled: - Process SET_FEATURE/CLEAR_FEATURE control requests sent by host for enabling/disabling remote wakeup feature. - Report remote wakeup enable status in response to GET_STATUS control request. - Implement wakeup method defined in usb_gadget_ops for initiating remote wakeup. - Notify gadget driver about suspend and resume. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 0e6ca1998e4c803b0be98f97a1d1e1ea562b8964 Author: Pavankumar Kondeti Date: Fri Feb 18 17:43:16 2011 +0530 USB: gadget: Implement hardware queuing in ci13xxx_udc Chipidea USB controller provides a means (Add dTD TripWire semaphore) for safely adding a new dTD to an active endpoint's linked list. Make use of this feature to improve performance. Dynamically allocate and free dTD for supporting zero length packet termination. Honor no_interrupt flag set by gadget drivers. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 91f58ae61913b40da35e119017e70b3420c6f3a0 Author: Huzaifa Sidhpurwala Date: Mon Feb 21 12:58:45 2011 +0530 USB: serial: mos7720: Fix possible null pointer dereference Signed-off-by: Huzaifa Sidhpurwala Signed-off-by: Greg Kroah-Hartman commit d866150a1914453c3d57689adfd8d01bf741d9d4 Author: Huzaifa Sidhpurwala Date: Mon Feb 21 12:58:44 2011 +0530 USB: serial: keyspan: Fix possible null pointer dereference. Signed-off-by: Huzaifa Sidhpurwala Signed-off-by: Greg Kroah-Hartman commit 108be95f9ffc53660c9a35b5ceef94121b1e23c4 Author: Yusuke Goda Date: Mon Feb 21 12:55:32 2011 +0900 usb: m66592-udc: Fixed bufnum of Bulk Signed-off-by: Yusuke Goda Acked-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit 294d95f2cbc2aef5346258f216cd9df570e271a5 Author: Matthew Garrett Date: Tue Jan 11 12:26:48 2011 -0500 ehci: Check individual port status registers on resume If a device plug/unplug is detected on an ATI SB700 USB controller in D3, it appears to set the port status register but not the controller status register. As a result we'll fail to detect the plug event. Check the port status register on resume as well in order to catch this case. Signed-off-by: Matthew Garrett Cc: stable [after .39-rc1 is out] Signed-off-by: Greg Kroah-Hartman commit 8eb90c30e0e815a1308828352eabd03ca04229dd Author: Thomas Gleixner Date: Wed Feb 23 23:52:21 2011 +0000 sched: Switch wait_task_inactive to schedule_hrtimeout() When we force thread hard and soft interrupts the startup of ksoftirqd would hang in kthread_bind() when wait_task_inactive() calls schedule_timeout_uninterruptible() because there is no softirq yet which will wake us up. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra LKML-Reference: <20110223234956.677109139@linutronix.de> commit 0c4602ff88d6d6ef0ee6d228ee9acaa6448ff6f5 Author: Thomas Gleixner Date: Wed Feb 23 23:52:18 2011 +0000 genirq: Add IRQF_NO_THREAD Some low level interrupts cannot be threaded even when we force thread all interrupt handlers. Add a flag to annotate such interrupts. Add all timer interrupts to this category by default. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra LKML-Reference: <20110223234956.578893460@linutronix.de> commit 9d591edd02a245305b1b9379e4c5571bad4d2774 Author: Thomas Gleixner Date: Wed Feb 23 23:52:16 2011 +0000 genirq: Allow shared oneshot interrupts Support ONESHOT on shared interrupts, if all drivers agree on it. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra LKML-Reference: <20110223234956.483640430@linutronix.de> commit b5faba21a6805c33b40e258d36f57997ee1de131 Author: Thomas Gleixner Date: Wed Feb 23 23:52:13 2011 +0000 genirq: Prepare the handling of shared oneshot interrupts For level type interrupts we need to track how many threads are on flight to avoid useless interrupt storms when not all thread handlers have finished yet. Keep track of the woken threads and only unmask when there are no more threads in flight. Yes, I'm lazy and using a bitfield. But not only because I'm lazy, the main reason is that it's way simpler than using a refcount. A refcount based solution would need to keep track of various things like crashing the irq thread, spurious interrupts coming in, disables/enables, free_irq() and some more. The bitfield keeps the tracking simple and makes things just work. It's also nicely confined to the thread code pathes and does not require additional checks all over the place. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra LKML-Reference: <20110223234956.388095876@linutronix.de> commit 004971353a403d75e7d50f8b3b304272ef056248 Author: David S. Miller Date: Fri Feb 25 11:23:22 2011 -0800 phonet: Protect pipe_do_remove() with appropriate ifdefs. It is only used when CONFIG_PHONET_PIPECTRLR is not set. Signed-off-by: David S. Miller commit 8f44fcc72a454c5eb7cbc138bd53f0963f23e87f Author: Rémi Denis-Courmont Date: Thu Feb 24 23:15:01 2011 +0000 Phonet: fix flawed "SYN/ACK" logic * Do not fail if the peer supports more or less than 3 algorithms. * Ignore unknown congestion control algorithms instead of failing. * Simplify congestion algorithm negotiation (largest is best). * Do not use a static buffer. * Fix off-by-two read overflow. * Avoid extra memory copy (in addition to skb_copy_bits()). The previous code really made no sense. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 0165d69bcb18c5aa220538389c872852243f9725 Author: Rémi Denis-Courmont Date: Thu Feb 24 23:15:00 2011 +0000 Phonet: don't bother with transaction IDs (especially for indications) Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 2feb61816f7f0be57f4bc61137555e9a8cb4f322 Author: Rémi Denis-Courmont Date: Thu Feb 24 23:14:59 2011 +0000 Phonet: remove redumdant pep->pipe_state sk->sk_state already contains the pipe state. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 14ba8faebcc241e4d60a4ef4a7d3fdef1c2e846f Author: Rémi Denis-Courmont Date: Thu Feb 24 23:14:58 2011 +0000 Phonet: use socket destination in pipe protocol Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit a8059512b120362b15424f152b2548fe8b11bd0c Author: Rémi Denis-Courmont Date: Thu Feb 24 23:14:57 2011 +0000 Phonet: implement per-socket destination/peer address Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 96241544ca34721d601925850868188d6304cc0f Author: Rémi Denis-Courmont Date: Thu Feb 24 23:14:56 2011 +0000 Phonet: allow multiple listen() and fix small race condition Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit e41cccfe794d188b0ae7f17f01692bcbc0e0dc87 Author: Tony Lindgren Date: Thu Feb 24 14:36:03 2011 -0800 omap2+: Minimize board specific init_early calls We should only call init_common_infrastructure and init_common_devices from init_early. Signed-off-by: Tony Lindgren commit e0530460f6bc268b446040f1973d427d21f042d9 Author: Radek PilaÅ™ (Mrkva) Date: Thu Feb 24 19:02:49 2011 +0100 OMAP3 Touchbook: fix board initialization init_early hook runs too early for omap3_mux_init(), so the board won't boot. Moved to init_machine, then it works just fine. Signed-off-by: Radek Pilar Signed-off-by: Tony Lindgren commit 589541c0bfb1426ad39c7b59c0372346bcf84229 Author: Jarkko Nikula Date: Mon Feb 21 08:42:36 2011 +0200 omap: rx51: Add SI4713 FM transmitter Add SI4713 FM transmitter supplies, platform data and setup to RX-51/N900. It is connected to line output signals of TLV320AIC34 codec A part. Driver can be either built-in or a module. It can be tuned with v4l2-ctl from ivtv-utils. Following examples illustrate the use of it: v4l2-ctl -d /dev/radio0 --set-ctrl=mute=0 (power up) v4l2-ctl -d /dev/radio0 -f 107900 (tune 107.9 MHz) v4l2-ctl -d /dev/radio0 --set-ctrl=mute=1 (power down) Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit bd061715392ccd72a398577615e856175d2b7b2b Author: Tony Lindgren Date: Fri Feb 25 10:11:15 2011 -0800 omap: Fix compile if MTD_NAND_OMAP2 is not selected Fix compile if MTD_NAND_OMAP2 is not selected Signed-off-by: Tony Lindgren commit c206e5147717782bac25d3506fa9fa05890b0767 Author: Tony Lindgren Date: Thu Feb 24 14:36:03 2011 -0800 omap2+: Minimize board specific init_early calls We should only call init_common_infrastructure and init_common_devices from init_early. Signed-off-by: Tony Lindgren commit 8c6e9112ebc7ba5a782e986152c8e766dad1486f Author: Grant Likely Date: Tue Feb 22 19:12:21 2011 -0700 tty/serial: Relax the device_type restriction from of_serial There is no need to test for a device_type property in ns8250 compatible serial ports. device_type is an OpenFirmware property that is not required when using the flattened tree representation. Signed-off-by: Grant Likely Signed-off-by: Greg Kroah-Hartman commit 76f0c37a26b48522a1f4051a7b8d091fc3e545d5 Author: Madhuranath Iyengar Date: Wed Feb 23 15:27:18 2011 -0800 [SCSI] qla2xxx: Update version number to 8.03.07.00 We'll be using the new version number scheme from now on. The 'k' in the version in the past will be removed. The format will be: ... A scsi-misc submission increments and resets . An scsi-rc-fixes submission, increments . Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 4e98d3b8ac81696d38eb7b54e8566e763f7aa97a Author: Andrew Vasquez Date: Wed Feb 23 15:27:17 2011 -0800 [SCSI] qla2xxx: Check return value of fc_block_scsi_eh() The fc_block_scsi_eh() might return with status FAST_IO_FAIL indicating I/O has been terminated due to fast_io_fail timeout. In this case the rport is still blocked, so any error recovery will be failing on this port. Hence we need to check if the return value from fc_block_scsi_eh() is something other than 0, in which case it should just return with that status. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit e46ef004f8938eb7bc80f350d8efed9bf57f04b3 Author: Saurav Kashyap Date: Wed Feb 23 15:27:16 2011 -0800 [SCSI] qla2xxx: The ISP82XX should be online while waiting for commands completion. If adapter is not online, the driver will not process the response queue, even on getting an interrupt. Signed-off-by: Saurav Kashyap Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit ff2fc42e74e43721310bff710416230aae6ce0b9 Author: Andrew Vasquez Date: Wed Feb 23 15:27:15 2011 -0800 [SCSI] qla2xxx: Propagate block-layer tags on submitted I/Os. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 97dec564fd4948e0e560869c80b76e166ca2a83e Author: Andrew Vasquez Date: Wed Feb 23 15:27:14 2011 -0800 [SCSI] qla2xxx: Adjust FCP_RSP response-info field check after TMF completion. Based on reading of the FCP2/4 specification, the driver cannot expect the storage device to send FCP_RSP information. Instead, the driver should interpret the data which is present in the frame to base decisions on the success or failure of the system. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 6aef87bea9d37d5adf45f3d1c674ccf6f95799ca Author: Andrew Vasquez Date: Wed Feb 23 15:27:13 2011 -0800 [SCSI] qla2xxx: Clear any stale login-states during an adapter reset. By not clearing the 'login needed' nor 'login outstanding' states for an fcport after a big-hammer (adapter reset), the driver may not properly perform a PLOGI/PRLI sequence (and lose visibility to the rport) during a follow-on SNS scan. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit a2e6093c638a9846cfe81b84ea9a0643f9540c1f Author: Joe Perches Date: Tue Feb 22 21:42:01 2011 -0800 MAINTAINERS: Update HVC file patterns Commit 728674a7e466628df2aeec6d11a2ae1ef968fb67 ("tty: move hvc drivers to drivers/tty/hvc/") moved the files, update the patterns as appropriate. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 65c56e073e4fd10385283561b91189572e33b519 Author: Heiko Carstens Date: Fri Feb 25 14:28:30 2011 +0100 tty: phase out of ioctl file pointer for tty3270 as well The patch "tty: now phase out the ioctl file pointer for good" missed the tty3270 driver. This is the missing piece. Signed-off-by: Heiko Carstens Signed-off-by: Greg Kroah-Hartman commit 7a78ceda1c294addb42a54e10d614c6ff0c4a6c9 Author: Andrew Vasquez Date: Wed Feb 23 15:27:12 2011 -0800 [SCSI] qla2xxx: Pass right CT command string for CT status processing. Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 862cd01e5c2f3f5cf1ca989aa1184d61b6988ba2 Author: Giridhar Malavali Date: Wed Feb 23 15:27:11 2011 -0800 [SCSI] qla2xxx: Don't wait for active mailbox command completion when firmware is hung. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 310388beea4d00bb1c56e81ded82bdc25bdcf719 Author: Greg Kroah-Hartman Date: Fri Feb 25 09:53:41 2011 -0800 tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile This caused a build error. Many thanks to Stephen Rothwell for pointing this mistake out. Reported-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit 7190575f7a48c82fd99363748544023739dc4bb8 Author: Giridhar Malavali Date: Wed Feb 23 15:27:10 2011 -0800 [SCSI] qla2xxx: Abort pending commands for faster recovery during ISP reset. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit cf2d771255251bfd4570b01bea491a631b4033c9 Author: Giridhar Malavali Date: Wed Feb 23 15:27:09 2011 -0800 [SCSI] qla2xxx: Display nport_id when any SNS command fails. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 0060ddf8f7b10799e0789d10ac505cd3fb7576cb Author: Giridhar Malavali Date: Wed Feb 23 15:27:08 2011 -0800 [SCSI] qla2xxx: Reinitialize the device initialize timeout value after reset on ISP82xx. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 0d3c07378bb7d423302d7cb0dcd3fa5a26c40220 Author: Iiro Valkonen Date: Wed Feb 23 21:07:20 2011 -0800 Input: atmel_mxt_ts - remove matrix size check The mxt_check_matrix_size() is currently setting the CTE mode to match xline/yline information that is in the platform data, but it does not take into account for example the fact that we could have a key array in use too (key array would use some x/y lines as well). It would be better to simply rely on the configuration data, and make sure that the CTE mode set in there matches the touch object (touchscreen, key array, proximity) configuration (which are set in the config data too). Signed-off-by: Iiro Valkonen Signed-off-by: Dmitry Torokhov commit 7c8cf2fee1027caaadf0e96145ff97f931ba4bdd Author: Chad Dupuis Date: Wed Feb 23 15:27:07 2011 -0800 [SCSI] qla2xxx: Fix array subscript is above array bounds in qla2xx_build_scsi_type_6_iocbs(). The additional increment of dsd_seg was causing the compiler to throw an array out of bounds warning. This patch moves to a direct assignment of cmd_pkt->fcp_data_dseg_len so that the compiler doesn't generate an array out bounds warning. Signed-off-by: Chad Dupuis Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit f5e3e40b398d3593e26fcced987d4bd7b8f9e57a Author: Madhuranath Iyengar Date: Wed Feb 23 15:27:06 2011 -0800 [SCSI] qla2xxx: Remove host_lock in queuecommand function Also in qla_os.c, rename the function, remove DEF_SCSI_QCMD, etc. Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 038d9446a9e601d7972926ca69fee10eeda6f3c7 Author: Christof Schmitt Date: Tue Feb 22 19:54:48 2011 +0100 [SCSI] zfcp: Add information to symbolic port name when running in NPIV mode Query the FC symbolic port name for reporting in the fc_host sysfs and enable the symbolic_name attribute in the fc_host sysfs. When running in NPIV mode, extend the symbolic port name with the devno and the hostname. This allows better identification of Linux systems for SAN and storage administrators. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit 22fd411ac9853f4becb3db9860f6d0b8398cac44 Author: Christof Schmitt Date: Tue Feb 22 19:54:47 2011 +0100 [SCSI] fc: Add GSPN_ID request to header file Add request code and corresponding structs for "Get Symbolic Port Name" (GSPN_ID) request. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit 1947c72a122a8c367fdfc650c39a98ba76cc573a Author: Christof Schmitt Date: Tue Feb 22 19:54:46 2011 +0100 [SCSI] zfcp: Move SCSI host and transport templates out of struct zfcp_data The SCSI host and transport templates are the only members left in the global zfcp_data struct. Move them out of zfcp_data and remove the now unused zfcp_data struct. Also update the names of the register and unregister functions to use the zfcp_scsi prefix. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit 2443c8b23aea83d529868030e28f45a6fa6553b2 Author: Christof Schmitt Date: Tue Feb 22 19:54:45 2011 +0100 [SCSI] zfcp: Merge FCP task management setup with regular FCP command setup For task management commands, only LUN and flags are required. The regular FCP setup already sets the LUN in the fcp_cmnd. All is required for merging the function is setting up the TM flags. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit 259afe2ed92c179e0a85da10ca63bf927b9851ca Author: Christof Schmitt Date: Tue Feb 22 19:54:44 2011 +0100 [SCSI] zfcp: Move qtcb kmem_cache to zfcp_fsf.c Move the kmem_cache for allocating the qtcb to zfcp_fsf.c and rename it accordingly. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit f9773229be6d8a3caa4c9dfc2961a63ab51a4e2a Author: Christof Schmitt Date: Tue Feb 22 19:54:43 2011 +0100 [SCSI] zfcp: Use common FC kmem_cache for GPN_FT request Switch the allocation of the GPN_FT request data to the FC kmem_cache and remove the zfcp_gpn kmem_cache. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit fcf7e6144df60cd5082e5bc52f1ca5d1ca99a2d6 Author: Christof Schmitt Date: Tue Feb 22 19:54:42 2011 +0100 [SCSI] zfcp: Allocate GID_PN data through new FC kmem_cache Allocate the data for the GID_PN request through the new FC kmem_cache. While updating the GID_PN code, also introduce a helper function for initializing the CT header for FC nameserver requests. Remove the "paranoia" check as well, the GID_PN request data does not suddenly change. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit 087897e36982ef8536dc9c8baed159a31517b5e6 Author: Christof Schmitt Date: Tue Feb 22 19:54:41 2011 +0100 [SCSI] zfcp: Introduce new kmem_cache for FC request and response data A data buffer that is passed to the hardware must not cross a page boundary. zfcp uses a series of kmem_caches to align the data to not cross a page boundary. Introduce a new kmem_cache for the FC requests sent from the zfcp driver and use it for the ELS ADISC data. The goal is to migrate to the FC kmem_cache in later patches and remove the request specific kmem_caches. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit c7b279ae51942c14529bf2806685e9c658f28611 Author: Christof Schmitt Date: Tue Feb 22 19:54:40 2011 +0100 [SCSI] zfcp: Replace kmem_cache for "status read" data zfcp requires a mempool for the status read data blocks to resubmit the "status read" requests at any time. Each status read data block has the size of a page (4096 bytes) and needs to be placed in one page. Instead of having a kmem_cache for allocating page sized chunks, use mempool_create_page_pool to create a mempool returning pages and remove the zfcp kmem_cache. Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit 7c35e77b96b2f0af8c278c13d484d42dad3c7422 Author: Christof Schmitt Date: Tue Feb 22 19:54:39 2011 +0100 [SCSI] zfcp: Remove unused flag ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit 4e7d7af4dfea65b50b0fc694e3febc202e4e9839 Author: Tobias Klauser Date: Tue Feb 22 19:54:38 2011 +0100 [SCSI] zfcp: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: Christof Schmitt Signed-off-by: Steffen Maier Signed-off-by: James Bottomley commit b056b6a0144de90707cd22cf7b4f60bf69c86d59 Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: suspend: remove xen_hvm_suspend It is now identical to xen_suspend, the differences are encapsulated in the suspend_info struct. Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit 55fb4acef7089a6d4d93ed8caae6c258d06cfaf7 Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: suspend: pull pre/post suspend hooks out into suspend_info Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit 07af38102fc4f260cc5a2418ec833707f53cdf70 Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: suspend: move arch specific pre/post suspend hooks into generic hooks Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit 82043bb60d24d2897074905c94be5a53071e8913 Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: suspend: refactor non-arch specific pre/post suspend hooks Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit 03c8142bd2fb3b87effa6ecb2f8957be588bc85f Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: suspend: add "arch" to pre/post suspend hooks xen_pre_device_suspend is unused on ia64. Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit 36b401e2c2788c7b4881115ddbbff603fe4cf78d Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: suspend: pass extra hypercall argument via suspend_info struct Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit ceb180294790c8a6a437533488616f6b591b49d0 Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: suspend: refactor cancellation flag into a structure Will add extra fields in subsequent patches. Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit bd1c0ad28451df4610d352c7e438213c84de0c28 Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: suspend: use HYPERVISOR_suspend for PVHVM case instead of open coding Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit a8b7458363b9174f3c2196ca6085630b4b30b7a1 Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: switch to new schedop hypercall by default. Rename old interface to sched_op_compat and rename sched_op_new to simply sched_op. Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit 8e15597fa430c03415e2268dfbae0f262b948788 Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: use new schedop interface for suspend Take the opportunity to comment on the semantics of the PV guest suspend hypercall arguments. Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit 552717231e50b478dfd19d63fd97879476ae051d Author: Ian Campbell Date: Thu Feb 17 11:04:20 2011 +0000 xen: do not respond to unknown xenstore control requests The PV xenbus control/shutdown node is written by the toolstack as a request to the guest to perform a particular action (shutdown, reboot, suspend etc). The guest is expected to acknowledge that it will complete a request by clearing the control node. Previously it would acknowledge any request, even if it did not know what to do with it. Specifically in the case where CONFIG_PM_SLEEP is not enabled the kernel would acknowledge a suspend request even though it was not actually going to do anything. Instead make the kernel only acknowledge requests if it is actually going to do something with it. This will improve the toolstack's ability to diagnose and deal with failures. Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk commit e057a4b6e0eb6701f6ec923be2075d4984cef51a Author: Stefano Stabellini Date: Fri Feb 11 17:55:13 2011 +0000 xen: fix compile issue if XEN is enabled but XEN_PVHVM is disabled Signed-off-by: Stefano Stabellini commit 99bbb3a84a99cd04ab16b998b20f01a72cfa9f4f Author: Stefano Stabellini Date: Thu Dec 2 17:55:10 2010 +0000 xen: PV on HVM: support PV spinlocks and IPIs Initialize PV spinlocks on boot CPU right after native_smp_prepare_cpus (that switch to APIC mode and initialize APIC routing); on secondary CPUs on CPU_UP_PREPARE. Enable the usage of event channels to send and receive IPIs when running as a PV on HVM guest. Signed-off-by: Stefano Stabellini commit 53d5522cad291a0e93a385e0594b6aea6b54a071 Author: Stefano Stabellini Date: Thu Dec 2 17:55:05 2010 +0000 xen: make the ballon driver work for hvm domains Signed-off-by: Stefano Stabellini commit c80a420995e721099906607b07c09a24543b31d9 Author: Stefano Stabellini Date: Thu Dec 2 17:55:00 2010 +0000 xen-blkfront: handle Xen major numbers other than XENVBD This patch makes sure blkfront handles correctly virtual device numbers corresponding to Xen emulated IDE and SCSI disks: in those cases blkfront translates the major number to XENVBD and the minor number to a low xvd minor. Note: this behaviour is different from what old xenlinux PV guests used to do: they used to steal an IDE or SCSI major number and use it instead. Signed-off-by: Stefano Stabellini Acked-by: Jeremy Fitzhardinge commit cff520b9c2ee1486ea9ff1dbc774510c62e5ecb9 Author: Stefano Stabellini Date: Thu Dec 2 17:54:54 2010 +0000 xen: do not use xen_info on HVM, set pv_info name to "Xen HVM" Signed-off-by: Stefano Stabellini Acked-by: Jeremy Fitzhardinge commit 702d4eb9b3de4398ab99cf0a4e799e552c7ab756 Author: Stefano Stabellini Date: Thu Dec 2 17:54:50 2010 +0000 xen: no need to delay xen_setup_shutdown_event for hvm guests anymore Now that xenstore_ready is used correctly for PV on HVM guests too, we don't need to delay the initialization of xen_setup_shutdown_event anymore. Signed-off-by: Stefano Stabellini Acked-by: Jeremy Fitzhardinge commit 1204e95689f9fbd245a4ce5c1b0cd0a9b77f8d25 Author: Thomas Gleixner Date: Fri Feb 25 17:17:18 2011 +0100 genirq: Make warning in handle_percpu_event useful The WARN_ON_ONCE in handle_percpu_event() which emits a warning when an action handler returns with interrupts enabled is not really useful. It does not reveal the interrupt number and handler function which caused it. Make it WARN_ONCE() and add the information. Reported-by: Tony Luck Signed-off-by: Thomas Gleixner commit a906fdaacca49917d83e5032dfc31f694249ad10 Author: Thomas Gleixner Date: Fri Feb 25 16:09:31 2011 +0100 x86: dt: Cleanup local apic setup Up to now we force enable the local apic in the devicetree setup uncoditionally and set smp_found_config unconditionally to 1 when a devicetree blob is available. This breaks, when local apic is disabled in the Kconfig. Make it consistent by initializing device tree explicitely before smp_get_config() so a non lapic configuration could be used as well. To be functional that would require to implement PIT as an interrupt host, but the only user of this code until now is ce4100 which requires apics to be available. So we leave this up to those who need it. Tested-by: Sebastian Siewior Signed-off-by: Thomas Gleixner commit b210b3bb1b002f27165325a5edb6ebce3c168e92 Author: Arnaldo Carvalho de Melo Date: Fri Feb 25 11:33:31 2011 -0300 perf ui browser: Introduce ui_browser__show_title Needed because we were only showing the title in ui_browser__show, not in ui_browser__run, and in the run loop we may be calling other browsers that would then change the title, when we go back to the previous browser, we need to redraw the title. We could have done this as the Newt help line, with pop, etc, but I don't think its worth, doing it explicitely, when needed (some browsers may not use the title area at all) seems enough/more flexible. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit d356b595e5a95c0c2305ec0a7d1cdb3e26f57716 Author: Chris Metcalf Date: Fri Feb 25 08:46:38 2011 -0500 arch/tile: Fix atomic_read() definition to use ACCESS_ONCE This adds the volatile cast which forces the compiler to emit the load. Suggested by Peter Zijlstra . Signed-off-by: Chris Metcalf commit 7e9498705e810404ecf29bb2d6fa632b9484c609 Author: Heiko Carstens Date: Fri Feb 25 14:32:28 2011 +0100 sched: Add #ifdef around irq time accounting functions Get rid of this: kernel/sched.c:3731:13: warning: 'irqtime_account_idle_ticks' defined but not used kernel/sched.c:3732:13: warning: 'irqtime_account_process_tick' defined but not used Signed-off-by: Heiko Carstens Cc: Venkatesh Pallipadi Cc: Peter Zijlstra LKML-Reference: <20110225133228.GD7469@osiris.boeblingen.de.ibm.com> Signed-off-by: Ingo Molnar commit 573f89b5f39a8b7b4f0a21a7567dd1121430a3c3 Author: Eric Bénard Date: Fri Feb 25 13:48:15 2011 +0100 ASoC: eukrea-tlv320: add MBIMXSD51 support Signed-off-by: Eric Bénard Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b3111a9aa8823e360f20e3ed9fb106d757b89704 Author: Mark Brown Date: Fri Feb 25 12:25:18 2011 +0000 ASoC: Move WM2000 to dev_pm_ops There's a general move to use dev_pm_ops rather than bus specific functions in order to facilitate work on the PM core. Do this conversion to WM2000. The driver ought to be updated to work better in a multi-component model but the mechanical conversion ensures that we avoid blocking PM core work until that happens. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c16bfe9ac389b13a37ff617a09682ecc0685960f Author: Arnaldo Carvalho de Melo Date: Fri Feb 25 09:30:29 2011 -0300 perf top browser: Fix up exit keys The left key was exiting 'perf top --tui' when it really shouldn't, it was too easy to leave the live annotation window and then press one too many <- and get out of the tool altogether. Do just like the report TUI does, ignore the left key for exit and also ask the user when pressing ESC if that is really what is wanted. Reported-by: Mike Galbraith Suggested-by: Ingo Molnar Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 9b34e6cc3bc2bf826c078c93c81b46f6c08da25f Author: Zeng Zhaoming Date: Thu Feb 24 02:08:21 2011 +0800 ASoC: Add Freescale SGTL5000 codec support Add Freescale SGTL5000 codec support. Supported features: - line-in and mic input - headphone and line-out output - line-in bypass ADC and DAC to headphone - 16, 20, 24, 32 bit audio - 8 ~ 96k sample rates Signed-off-by: Zeng Zhaoming Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit ceade6c81bd913b23bffb3d80909ea430850c79b Author: Justin P. Mattock Date: Thu Feb 24 22:16:37 2011 -0800 ASoC: remove one to many l's in the word The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5448716ba966307d518d5c6fd52a9de5e7108e26 Merge: a3cd50d 4bfc4e2 Author: Mark Brown Date: Fri Feb 25 11:45:09 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit a3cd50deef7ba7df506af5347764a00b4621d7a7 Author: Stephen Warren Date: Tue Feb 22 17:23:56 2011 -0700 ASoC: Tegra: Move utilities to separate module The utilities will be required by every machine driver. Including the utility object directly into every machine driver causes a build failure if the modules are actually built into the kernel, since each will define the symbols exported by the utility file. Solve this by moving the utility object into a separate module. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 67f5ed6e716bf9b574c8cbe04765171de5d4d0fe Author: Dimitris Papastamos Date: Thu Feb 24 17:09:32 2011 +0000 ASoC: soc-dapm: Include quotes around contents in debugfs entries Sometimes the name of the control switch of a dapm route contains spaces which makes it impossible to distinguish it from the source widget. Add quotes around the names of the widgets to makes these parsable. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 2031c0645c8e2f3935254bf201b4f6f00dd0790d Author: Mark Brown Date: Thu Feb 24 20:26:02 2011 +0000 ASoC: Remove -codec suffix from WM9081 driver Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1f565a896ee139a70e1a16f74a4ec29707691b0b Author: David Rientjes Date: Fri Feb 25 10:06:39 2011 +0100 x86-64, NUMA: Fix size of numa_distance array numa_distance should be sized like the SLIT, an NxN matrix where N is the highest node id + 1. This patch fixes the calculation to avoid overflowing the array on the subsequent iteration. -tj: The original patch used last index to calculate size. Yinghai pointed out it should be incremented so it is the number of elements instead of the last index to calculate the size of the table. Updated accordingly. Signed-off-by: David Rientjes Cc: Yinghai Lu Signed-off-by: Tejun Heo commit fb9b5a0eb68fdc93b1fa5ad377d749fe01023216 Author: Justin P. Mattock Date: Thu Feb 24 22:15:42 2011 -0800 ALSA: emu10k1 - emu10k1_main.c remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Takashi Iwai commit a2e2bc2874ee5c7d45a40367cb2f5dda6445c963 Author: Justin P. Mattock Date: Thu Feb 24 22:16:02 2011 -0800 ALSA: hda - patch_realtek.c remove one to many l's in the word. The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock Signed-off-by: Takashi Iwai commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac Author: David S. Miller Date: Thu Feb 24 22:50:30 2011 -0800 rtlwifi: Need to include vmalloc.h Signed-off-by: David S. Miller commit 78776d3f2b2b6d59e32cdaf3f30228a0d9d0b720 Author: David S. Miller Date: Thu Feb 24 22:48:13 2011 -0800 sch_netem: Need to include vmalloc.h Signed-off-by: David S. Miller commit 1b0db64fb7693c1a131b7bcc38f7bc63fb396850 Merge: 26f70e1 5db5e44 Author: David S. Miller Date: Thu Feb 24 22:35:12 2011 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 26f70e1202b3c66c4f63b8b25e0419dd0b3a91e3 Author: Eric Dumazet Date: Thu Feb 24 17:45:41 2011 +0000 sch_choke: add choke_skb_cb Better document choke skb->cb[] use, like we did in netem and sfb This adds a compile time check to make sure we dont exhaust skb->cb[] space. Signed-off-by: Eric Dumazet CC: Stephen Hemminger CC: Patrick McHardy Signed-off-by: David S. Miller commit 250a65f78265940ac33a2dd2002924e6126efe14 Author: stephen hemminger Date: Wed Feb 23 13:04:22 2011 +0000 netem: update version and cleanup Get rid of debug message that are not useful, and enable the log messages in case of error. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 661b79725fea030803a89a16cda506bac8eeca78 Author: stephen hemminger Date: Wed Feb 23 13:04:21 2011 +0000 netem: revised correlated loss generator This is a patch originated with Stefano Salsano and Fabio Ludovici. It provides several alternative loss models for use with netem. This patch adds two state machine based loss models. See: http://netgroup.uniroma2.it/twiki/bin/view.cgi/Main/NetemCLG Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 10f6dfcfde884441db89dc66b945d6c948e1d356 Author: stephen hemminger Date: Wed Feb 23 13:04:20 2011 +0000 Revert "sch_netem: Remove classful functionality" Many users have wanted the old functionality that was lost to be able to use pfifo as inner qdisc for netem. The reason that netem could not be classful with the older API was because of the limitations of the old dequeue/requeue interface; now that qdisc API has a peek function, there is no longer a problem with using any inner qdisc's. This reverts commit 02201464119334690fe209849843881b8e9cfa9f. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit df173bda2639ac744ccf596ec1f8f7e66fe4c343 Author: stephen hemminger Date: Wed Feb 23 13:04:19 2011 +0000 netem: define NETEM_DIST_MAX Rather than magic constant in code, expose the maximum size of packet distribution table in API. In iproute2, q_netem defines MAX_DIST as 16K already. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6373a9a286bdd955a76924cee88a2f8f784988b1 Author: stephen hemminger Date: Wed Feb 23 13:04:18 2011 +0000 netem: use vmalloc for distribution table The netem probability table can be large (up to 64K bytes) which may be too large to allocate in one contiguous chunk. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 861d7f745f37506bbd90227e97b95baf2a5fac34 Author: stephen hemminger Date: Wed Feb 23 13:04:17 2011 +0000 netem: cleanup dump code Use nla_put_nested to update netlink attribute value. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit dc87eaf1771d15152ca379a0b7c32df57a0e87dc Merge: a2c06ee 562af10 Author: Dave Airlie Date: Fri Feb 25 13:37:02 2011 +1000 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (50 commits) drm/nv50: flesh out ZCULL init and match nvidia on later chipsets drm/nv50: support for compression drm/nv50-nvc0: delay GART binding until move_notify time drm/nouveau: rename nouveau_vram to nouveau_mem drm/nvc0: allow creation of buffers with any non-compressed memtype drm/nv50-nvc0: unmap buffers from the vm when they're evicted drm/nv50-nvc0: move vm bind/unbind to move_notify hook drm/nv50-nvc0: restrict memtype to those specified at creation time drm/nouveau: pass domain rather than ttm flags to gem_new() drm/nv50: simplify bo moves now that they're all through the vm drm/nouveau: remove no_vm/mappable flags from nouveau_bo drm/nouveau: Fix pageflip event drm/nouveau/vbios: parse more gpio tag bits from connector table drm/nouveau: decode PFIFO DMA_PUSHER error codes drm/nv50: fix typos in CCACHE error reporting drm/nvc0: support for sw methods + enable page flipping drm/nv50: enable page flipping drm/nv50-nvc0: activate/update ds channel's framebuffer on modesets drm/nv50-nvc0: initialise display sync channels drm/nv50-nvc0: precalculate some fb state when creating them ... commit b552f7e3a9524abcbcdf86f0a99b2be58e55a9c6 Author: Changli Gao Date: Sat Feb 19 17:32:28 2011 +0800 ipvs: unify the formula to estimate the overhead of processing connections lc and wlc use the same formula, but lblc and lblcr use another one. There is no reason for using two different formulas for the lc variants. The formula used by lc is used by all the lc variants in this patch. Signed-off-by: Changli Gao Acked-by: Wensong Zhang Signed-off-by: Simon Horman commit 290f5e3b594af70ac8f7fab44dba79ccae1531cd Merge: dca8b08 c2b6a05 Author: David S. Miller Date: Thu Feb 24 16:29:00 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit a39676857459e8d4a0de2eac27206a3a01c1d6b8 Author: Tony Luck Date: Thu Feb 24 15:22:05 2011 -0800 [IA64] disable interrupts at end of ia64_mca_cpe_int_handler() SAL requires that interrupts be enabled when making some calls to it to pick up error records, so we enable interrupts inside this handler. We should disable them again at the end. Found by a new WARN_ONCE that tglx added to handle_irq_event_percpu() Signed-off-by: Tony Luck commit d594f1f31afe13edd8c02f3854a65cc58cfb3b74 Author: David Cohen Date: Wed Feb 16 19:35:51 2011 +0000 omap: IOMMU: add support to callback during fault handling Add support to register an isr for IOMMU fault situations and adapt it to allow such (*isr)() to be used as fault callback. Drivers using IOMMU module might want to be informed when errors happen in order to debug it or react. Signed-off-by: David Cohen Acked-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit 92e753d7984db36f0a3c0bbf0f377da114768775 Author: David Cohen Date: Wed Feb 16 19:35:50 2011 +0000 OMAP2+: IOMMU: don't print fault warning on specific layer IOMMU upper layer and user are responsible to handle a fault and to define whether it will end up as an error or not. OMAP2+ specific layer should not print anything in such case. Signed-off-by: David Cohen Acked-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit 41cae2d01385af4199666db57274c0df3283b065 Author: Johannes Berg Date: Thu Feb 24 20:39:05 2011 +0100 rtl8192c: fix compilation errors On my G5 this fails to compile with drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:701: error: __ksymtab__rtl92c_phy_txpwr_idx_to_dbm causes a section type conflict drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:701: error: __ksymtab__rtl92c_phy_txpwr_idx_to_dbm causes a section type conflict drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:677: error: __ksymtab__rtl92c_phy_dbm_to_txpwr_Idx causes a section type conflict drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:677: error: __ksymtab__rtl92c_phy_dbm_to_txpwr_Idx causes a section type conflict since you can't export static functions. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit dca8b089c95d94afa1d715df257de0286350e99d Author: David S. Miller Date: Thu Feb 24 13:38:12 2011 -0800 ipv4: Rearrange how ip_route_newports() gets port keys. ip_route_newports() is the only place in the entire kernel that cares about the port members in the routing cache entry's lookup flow key. Therefore the only reason we store an entire flow inside of the struct rtentry is for this one special case. Rewrite ip_route_newports() such that: 1) The caller passes in the original port values, so we don't need to use the rth->fl.fl_ip_{s,d}port values to remember them. 2) The lookup flow is constructed by hand instead of being copied from the routing cache entry's flow. Signed-off-by: David S. Miller commit b176654e7796b2812632e7c4a1a4b6efbfae5f1b Author: Kishon Vijay Abraham I Date: Thu Feb 24 15:16:57 2011 +0530 OMAP: hwmod: Removal of macros for data that is obtained from hwmod database Information like base address and DMA channel nubers should no longer be obtained using macros. These information should be obtained from hwmod database. Hence the macros that define the base address are removed. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Charulatha V Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Tony Lindgren commit 2686e07b3efe45d964acba22c3a756fd7dd81389 Author: Kishon Vijay Abraham I Date: Thu Feb 24 15:16:56 2011 +0530 ASoC: McBSP: get hw params from McBSP driver Removed the use of macros to obtain base address and DMA channel number. Instead use the McBSP driver API's that passes base address and DMA channel number to the client driver. Signed-off-by: Kishon Vijay Abraham I Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Tony Lindgren commit 9504ba64f014cfd50a64106e49c8ba729522db5b Author: Kishon Vijay Abraham I Date: Thu Feb 24 15:16:55 2011 +0530 OMAP: McBSP: APIs to pass DMA params from McBSP driver to client drivers After McBSP driver is hwmod adapted, the information about the hw would be obtained from the hwmod database by the mcbsp driver. Since DMA programming is handled by the client driver, APIs are provided to pass the DMA channel number and base address of data register required by the client driver for DMA programming. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Charulatha V Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Tony Lindgren commit e95496d4acadd0b72c4947be61e8d44700fdaae7 Author: Kishon Vijay Abraham I Date: Thu Feb 24 15:16:54 2011 +0530 OMAP: McBSP: Add pm runtime support Add pm runtime support for McBSP driver. Reference to fclk is not removed because it is required when the functional clock is switched from one source to another. Signed-off-by: Kishon Vijay Abraham I Cc: Paul Walmsley Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Tony Lindgren commit f36d01d64f1caf0545214a5dc14096477f68cfbe Author: Kishon Vijay Abraham I Date: Thu Feb 24 15:16:53 2011 +0530 OMAP: McBSP: use omap_device APIs to modify SYSCONFIG McBSP2/3 in OMAP3 has sidetone feature which requires autoidle to be disabled before starting the sidetone. Also SYSCONFIG register has to be set with smart idle or no idle depending on the dma op mode (threshold or element sync). For doing these operations dynamically at runtime, omap_device APIs are used to modify SYSCONFIG register. Signed-off-by: Kishon Vijay Abraham I Cc: Paul Walmsley Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Mark Brown [tony@atomide.com: updated to compile without omap_device idle calls] Signed-off-by: Tony Lindgren commit 64bcbd33c7c70d0aea4e614212a2568321a0396b Author: Kishon Vijay Abraham I Date: Thu Feb 24 15:16:52 2011 +0530 OMAP2+: McBSP: hwmod adaptation for McBSP Modify OMAP2+ McBSP to use omap hwmod framework APIs Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Charulatha V Signed-off-by: Shubhrajyoti D Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Tony Lindgren commit 8b1906f12a60d377b11d8a3dd256ce0a0ef6c614 Author: Kishon Vijay Abraham I Date: Thu Feb 24 15:16:51 2011 +0530 OMAP3: hwmod: add dev_attr for McBSP sidetone Since the sidetone block is tightly coupled to the mcbsp, sidetone information is directly added to mcbsp2 & 3 hwmod dev_attr. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Benoit Cousson Signed-off-by: Tony Lindgren commit cb7e9ded3240d717d1d24812d33b3ef2c98c084e Author: Kishon Vijay Abraham I Date: Thu Feb 24 15:16:50 2011 +0530 OMAP4: hwmod: Naming of address space Added a name to address space belonging to SDMA and MPU facilitating the driver to get the address space info by name. Added a revision member inorder to facilitate the driver to differentiate between mcbsp in different omap. Also added a platform_get_irq in probe to get irq number by index since from OMAP4, there will be a single irq line. Signed-off-by: Benoit Cousson Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Tony Lindgren commit dc48e5fc782f8d447aae2e82ba7453ddcf32c617 Author: Charulatha V Date: Thu Feb 24 15:16:49 2011 +0530 OMAP3: hwmod data: Add McBSP Add McBSP hwmod data for OMAP3. Added a revision member inorder to facilitate the driver to differentiate between mcbsp in different omap. Signed-off-by: Charulatha V Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Shubhrajyoti D Cc: Benoit Cousson Signed-off-by: Tony Lindgren commit 37801b3df60a000cc1d65ea8b472e841dc93ea75 Author: Charulatha V Date: Thu Feb 24 12:51:46 2011 -0800 OMAP2430: hwmod data: Add McBSP Add McBSP hwmod data for OMAP2430. Added a revision member inorder to facilitate the driver to differentiate between mcbsp in different omap. Signed-off-by: Charulatha V Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Shubhrajyoti D Cc: Benoit Cousson Signed-off-by: Tony Lindgren commit 3cb72fa4fed52437484a699ba78ad926ff4483c5 Author: Charulatha V Date: Thu Feb 24 12:51:46 2011 -0800 OMAP2420: hwmod data: Add McBSP Add McBSP hwmod data for OMAP2420. Also add macros in prcm-common.h for idlest bit of OMAP24XX McBSP devices Signed-off-by: Charulatha V Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Shubhrajyoti D Cc: Benoit Cousson Signed-off-by: Tony Lindgren commit 3cf32bba8ca0e0052ca41d74d455a5805b7fea85 Author: Kishon Vijay Abraham I Date: Thu Feb 24 12:51:45 2011 -0800 OMAP: McBSP: Convert McBSP to platform device model Implement McBSP as platform device and add support for registering through platform device layer using resource structures. Later in this patch series, OMAP2+ McBSP driver would be modified to use hwmod framework after populating the omap2+ hwmod database. Signed-off-by: Kishon Vijay Abraham I Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Tony Lindgren commit cd5038024d6c92fbe4bf67af91eea5c6fb24a192 Author: Kishon Vijay Abraham I Date: Thu Feb 24 12:51:45 2011 -0800 OMAP: hwmod: allow hwmod to provide address space accessible from SDMA Adds support for resource API to get address space info other than just MPU. The drivers can now use platform_get_resource_byname() to get resource of type 'IORESOURCE_MEM' by name. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Benoit Cousson Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 82d2a5db5296834a4317e554f57b8883d7abb86d Author: Omar Ramirez Luna Date: Thu Feb 24 12:51:33 2011 -0800 OMAP: mailbox: use runtime pm for clk and sysc handling Use runtime pm APIs to enable/disable mailbox clocks and to configure SYSC register. Based on the patch sent by Felipe Contreras: https://patchwork.kernel.org/patch/101662/ Signed-off-by: Omar Ramirez Luna Signed-off-by: Tony Lindgren commit 69dbf857c80e9697621ecb0d4323385999449663 Author: Felipe Contreras Date: Thu Feb 24 12:51:33 2011 -0800 OMAP: mailbox: build device using omap_device/omap_hwmod Remove static platform_device and resource data within omap mailbox driver; use the one defined in the hwmod database along with omap_device framework for device build and registration. Add device latency functions to be used, so clock can be enabled and sysconfig is configured. Signed-off-by: Felipe Contreras Signed-off-by: Omar Ramirez Luna Signed-off-by: Tony Lindgren commit 0f9dfdd3d76d356250595cde200efe7c07dec0a1 Author: Felipe Contreras Date: Thu Feb 24 12:51:32 2011 -0800 OMAP3: hwmod data: add mailbox data Mailbox hwmod data for omap3. Signed-off-by: Felipe Contreras Signed-off-by: Omar Ramirez Luna Signed-off-by: Tony Lindgren commit fca1ab55f9a9f7e862a03a68c2b5577c15c344df Author: Omar Ramirez Luna Date: Thu Feb 24 12:51:32 2011 -0800 OMAP2: hwmod data: add mailbox data Mailbox hwmod data for omap2430 and 2420. Signed-off-by: Omar Ramirez Luna Signed-off-by: Tony Lindgren commit 4111772900ba908e8be6f671013545f7aa41bc76 Author: David Cohen Date: Thu Feb 24 12:51:32 2011 -0800 omap: iommu: print module name on error messages OMAP IOMMU generic layer doesn't need ot print function name during error messages. Print module name instead which is more useful. Signed-off-by: David Cohen Signed-off-by: Tony Lindgren commit ef4815ab1ff10d642c21ef92faa6544934bc78d1 Author: Martin Hostettler Date: Thu Feb 24 12:51:31 2011 -0800 omap: iommu: Gracefully fail iommu_enable if no arch_iommu is registered In a modular build of the iommu code it's possible that the arch iommu code isn't loaded when trying to enable the iommu. Instead of blindly following a null pointer return -NODEV in that case. Signed-off-by: Martin Hostettler Signed-off-by: Tony Lindgren commit 562af10c676936ba510860d3a25e60e55312d5cd Author: Ben Skeggs Date: Wed Feb 23 09:00:35 2011 +1000 drm/nv50: flesh out ZCULL init and match nvidia on later chipsets Signed-off-by: Ben Skeggs commit 8f7286f8e4e80f7b868ba3d117ae900f0d207cbe Author: Ben Skeggs Date: Mon Feb 14 09:57:35 2011 +1000 drm/nv50: support for compression Signed-off-by: Ben Skeggs commit 26c0c9e33a2eb44b345d22d5928d5c8b7b261226 Author: Ben Skeggs Date: Thu Feb 10 12:59:51 2011 +1000 drm/nv50-nvc0: delay GART binding until move_notify time The immediate benefit of doing this is that on NV50 and up, the GPU virtual address of any buffer is now constant, regardless of what memtype they're placed in. Signed-off-by: Ben Skeggs commit d5f423947a11103c43ad26ebb680d049c2d8edd6 Author: Ben Skeggs Date: Thu Feb 10 12:22:52 2011 +1000 drm/nouveau: rename nouveau_vram to nouveau_mem This structure will also be used for GART in the near future. Signed-off-by: Ben Skeggs commit b5e2f0769a64046cefbfc307cbe6f7fa40dddf10 Author: Ben Skeggs Date: Mon Feb 14 07:34:55 2011 +1000 drm/nvc0: allow creation of buffers with any non-compressed memtype This adds a table of known nvc0 memtypes, and modifies the validity check to allow any non-compressed type. Support for Z compression will come at a later point. Signed-off-by: Ben Skeggs commit 3425df486ca247d9e8487be06a6cd0763ba38180 Author: Ben Skeggs Date: Thu Feb 10 11:22:12 2011 +1000 drm/nv50-nvc0: unmap buffers from the vm when they're evicted Signed-off-by: Ben Skeggs commit a4154bbffdc9f6a38556ea9e82aef4975018ba23 Author: Ben Skeggs Date: Thu Feb 10 10:35:16 2011 +1000 drm/nv50-nvc0: move vm bind/unbind to move_notify hook Signed-off-by: Ben Skeggs commit db5c8e299a30db48a3a60dadc676cf05d19d268d Author: Ben Skeggs Date: Thu Feb 10 13:41:01 2011 +1000 drm/nv50-nvc0: restrict memtype to those specified at creation time Upcoming patches are going to enable full support for buffers that keep a constant GPU virtual address whenever they're validated for use by the GPU. In order for this to work properly while keeping support for large pages, we need to know if it's ever going to be possible for a buffer to end up in GART, and if so, disable large pages for the buffer's VMA. This is a new restriction that's not present in earlier kernel's, but should not break userspace as the current code never attempts to validate buffers into a memtype other than it was created with. Signed-off-by: Ben Skeggs commit 6ba9a68317781537d6184d3fdb2d0f20c97da3a4 Author: Ben Skeggs Date: Thu Feb 10 14:42:08 2011 +1000 drm/nouveau: pass domain rather than ttm flags to gem_new() Signed-off-by: Ben Skeggs commit a67047883410ee37d27806bb8415a84673934b4f Author: Ben Skeggs Date: Wed Feb 16 09:10:20 2011 +1000 drm/nv50: simplify bo moves now that they're all through the vm Signed-off-by: Ben Skeggs commit d550c41e4ff11fe69b5f92868157253d27937d1f Author: Ben Skeggs Date: Wed Feb 16 08:41:56 2011 +1000 drm/nouveau: remove no_vm/mappable flags from nouveau_bo 'mappable' isn't really used at all, nor is it necessary anymore as the bo code is capable of moving buffers to mappable vram as required. 'no_vm' isn't necessary anymore either, any places that don't want to be mapped into a GPU address space should allocate the VRAM directly instead. Signed-off-by: Ben Skeggs commit 2503c6fa3edf7c2bb001c7f7926786eed24cc06e Author: Benjamin Franzke Date: Wed Feb 16 10:04:48 2011 +0100 drm/nouveau: Fix pageflip event Assign correct event when initializing nouveau_page_flip_state. Signed-off-by: Ben Skeggs commit a589e87fe704808120e6e30f6723b720a085669d Author: Ben Skeggs Date: Thu Feb 17 08:03:53 2011 +1000 drm/nouveau/vbios: parse more gpio tag bits from connector table Signed-off-by: Ben Skeggs commit 3248421670925af12b1ade5da987f6757d737748 Author: Marcin Slusarz Date: Sun Feb 13 20:46:40 2011 +0100 drm/nouveau: decode PFIFO DMA_PUSHER error codes Signed-off-by: Marcin Slusarz Signed-off-by: Ben Skeggs commit 4dcf905c843af9de623da42c3b5b12b98c68e62b Author: Marcin Slusarz Date: Sun Feb 13 20:46:41 2011 +0100 drm/nv50: fix typos in CCACHE error reporting The code was supposed to print registers around 0x405018 (which is read earlier), not 0x405818. Signed-off-by: Marcin Slusarz Signed-off-by: Ben Skeggs commit bd2f2037a42d4657ead3be2918db22e63626cd35 Author: Ben Skeggs Date: Tue Feb 8 15:16:23 2011 +1000 drm/nvc0: support for sw methods + enable page flipping Signed-off-by: Ben Skeggs commit d7117e0d4e21034202833088e51fc21f8c8271f9 Author: Ben Skeggs Date: Mon Feb 7 14:27:04 2011 +1000 drm/nv50: enable page flipping Signed-off-by: Ben Skeggs commit 1d3fac0c2ae3bb1b054df2f203fdaf08a1d42370 Author: Ben Skeggs Date: Mon Feb 7 14:18:37 2011 +1000 drm/nv50-nvc0: activate/update ds channel's framebuffer on modesets The hw doesn't really appear to be designed to be used the way we have to use it due to DRI2's design. This leads us to having to keep the flipped fb support active at all times. Signed-off-by: Ben Skeggs commit cdccc70eff1eaf3627a716374f9ebc115fc4621c Author: Ben Skeggs Date: Mon Feb 7 13:29:23 2011 +1000 drm/nv50-nvc0: initialise display sync channels Also imports a couple of helper functions that'll be used to implement page flipping in the following commits.. Signed-off-by: Ben Skeggs commit 45c4e0aae96c6354bf5131a282a74fe38d032de3 Author: Ben Skeggs Date: Wed Feb 9 11:57:45 2011 +1000 drm/nv50-nvc0: precalculate some fb state when creating them Just a cleanup, to avoid duplicating parts of nv50_crtc.c's code in the page flipping routines. Signed-off-by: Ben Skeggs commit 292deb7a3b6b03df664b8f5024a351d3389543ae Author: Ben Skeggs Date: Mon Feb 7 13:08:16 2011 +1000 drm/nv50-nvc0: tidy evo object creation some more Signed-off-by: Ben Skeggs commit 60f60bf1bc45bef38568244f5c4e0d0f105c5032 Author: Ben Skeggs Date: Thu Feb 3 15:46:14 2011 +1000 drm/nv50-nvc0: request and wait on notification of modeset completion This should prevent a number of races from occuring, the most obvious of which will be exposed when we start making use of the "display sync" evo channel for page flipping. The DS channel will reject any command stream that doesn't completely agree with the current "master" state. Signed-off-by: Ben Skeggs commit f13e435c59573aa0ac398210777cc0406c476593 Author: Ben Skeggs Date: Thu Feb 3 20:06:14 2011 +1000 drm/nv50-nvc0: switch to tasklet for display isr bh We need to be able to have the bh run while possibly spinning waiting for the EVO notifier to signal. This apparently happens in some circumstances with preempt disabled, so our workqueue was never being run. Signed-off-by: Ben Skeggs commit c7ca4d1b6b529dac9de9ff3f951689f2e4365cc2 Author: Ben Skeggs Date: Thu Feb 3 20:10:49 2011 +1000 drm/nouveau: make vbios parser runnable from an atomic context The nv50 display isr bh needs to be converted to a tasklet, which means we can't sleep anymore. The places we execute vbios init tables are rare, and not in any way performance critical, so this isn't a huge problem. Signed-off-by: Ben Skeggs commit 8348f36d89d1c9630580932931aca51b6069097a Author: Ben Skeggs Date: Thu Feb 3 16:07:44 2011 +1000 drm/nv50-nvc0: include nv50_display in evo debugging Signed-off-by: Ben Skeggs commit 33f409df1ef4b1eba580a3c3f78a28aa4cd2ed0c Author: Ben Skeggs Date: Tue Feb 1 10:59:07 2011 +1000 drm/nv50-nvc0: tidy evo init failure paths Signed-off-by: Ben Skeggs commit 961b6e686ec73cfd2721c4e13745a8fe43e04350 Author: Ben Skeggs Date: Tue Feb 1 10:41:01 2011 +1000 drm/nv50-nvc0: fix ramht entries for multiple evo channels Signed-off-by: Ben Skeggs commit 30d81817a2a7eefcf4aa8b703d5f8330451c2648 Author: Ben Skeggs Date: Tue Feb 1 10:39:45 2011 +1000 drm/nv50-nvc0: disp channels have fixed purposes, don't "allocate" them Signed-off-by: Ben Skeggs commit 59c0f5780f21ef10428bdaccd9999879f38225bc Author: Ben Skeggs Date: Tue Feb 1 10:24:41 2011 +1000 drm/nv50-nvc0: rename disp->evo to disp->master More appropriate, and we're about to be using more than just the master EVO channel. Signed-off-by: Ben Skeggs commit ef8389a84bbd80daaf6c60a5534461d82ba22c0a Author: Ben Skeggs Date: Tue Feb 1 10:07:32 2011 +1000 drm/nv50-nvc0: move non-sharable display state into private structure Signed-off-by: Ben Skeggs commit d82f8e6c802bb1244ce590d3877f7c66a8fb0ff0 Author: Tejun Heo Date: Wed Jan 26 17:49:18 2011 +0100 drm/nouveau: use system_wq instead of dev_priv->wq With cmwq, there's no reason for nouveau to use a dedicated workqueue. Drop dev_priv->wq and use system_wq instead. Each work item is sync flushed when the containing structure is unregistered/destroyed. Note that this change also makes sure that nv50_gpio_handler is not freed while the contained work item is still running. Signed-off-by: Tejun Heo Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Ben Skeggs commit f17811dfa7f07e3df6d0e3c4ab4af8eb47e8fabc Author: Lucas Stach Date: Sun Feb 6 22:42:54 2011 +0100 drm/nouveau: use I2C_MODULE_PREFIX kernel define Signed-off-by: Lucas Stach Signed-off-by: Ben Skeggs commit ec23802d616f4e33476cca5c7a975ce1682ad2d7 Author: Ben Skeggs Date: Wed Feb 2 14:57:05 2011 +1000 drm/nv50: drop explicit yields in favour of smaller PFIFO timeslice This gives a small, but noticeable performance gain at lower performance levels, and unchanged at the higher ones. With this commit, we're now using the same timeslice size as the NVIDIA binary driver currently does, and dropping an unknown bit that NVIDIA no longer appear to set. Signed-off-by: Ben Skeggs commit e3b7ed5e9972dd4878a5390fd3147a973cbe2d05 Author: Ben Skeggs Date: Wed Feb 2 13:21:57 2011 +1000 drm/nv84: use vm offsets for semaphores We may well be making more use of semaphores in the future, having the entire VM available makes requiring DMA objects for each and every semaphore block unnecessary. Signed-off-by: Ben Skeggs commit fc772ec48d7d57ef5fb3fe171eae467d3d440bc4 Author: Ben Skeggs Date: Mon Jan 31 16:42:28 2011 +1000 drm/nv50: 0x50 needs semaphore yields too Evil, evil chipset. Worst of both worlds. Signed-off-by: Ben Skeggs commit ea5f2786a0942832f32deb7c507531b766028356 Author: Ben Skeggs Date: Mon Jan 31 08:26:04 2011 +1000 drm/nouveau: silence some compiler warnings Signed-off-by: Ben Skeggs commit cb1d771aa03dd9f3980f08f1512d9434dd5bebfb Author: Ben Skeggs Date: Fri Jan 28 13:44:32 2011 +1000 drm/nvc0: implement semaphores for inter-channel sync Signed-off-by: Ben Skeggs commit cc8cd6479cb9d6b384ccdaa4b21fcbf0826bd232 Author: Ben Skeggs Date: Fri Jan 28 13:42:16 2011 +1000 drm/nvc0/pfifo: semi-handle a couple more irqs And also, don't disable PFIFO IRQs completely whenever we recieve one, just when we don't know about it already. Signed-off-by: Ben Skeggs commit c3b90a7d4ce28c5c25de8aad3956c5c3f188d6a1 Author: Ben Skeggs Date: Fri Jan 28 12:08:29 2011 +1000 drm/nv84: switch to new-style semaphores These are the same semaphores nvc0 will use, and they potentially allow us to do much cooler things than our current inter-channel sync impl. Lets switch to them where possible now for some testing. Signed-off-by: Ben Skeggs commit e0435120a8e91990e995ffacb109f82cd44fdfc1 Author: Ben Skeggs Date: Tue Jan 11 15:50:26 2011 +1000 drm/nv40: support for 39-bit dma addresses on native PCIE chipsets Signed-off-by: Ben Skeggs commit 7948758d27be1b69b6a79ed4f3f22e36a3b95965 Author: Ben Skeggs Date: Tue Jan 11 14:52:40 2011 +1000 drm/nv40: implement support for on-chip PCIEGART v2. moved nv44 pciegart table back to instmem, where it's not accessible by userspace clients. Signed-off-by: Ben Skeggs commit 58e6c7a9183071b89b0ac94862f369ed55775a7a Author: Ben Skeggs Date: Tue Jan 11 14:10:09 2011 +1000 drm/nouveau: introduce new gart type, and name _SGDMA more appropriately In preparation for the addition of a new nv40 backend, we'll need to be able to distinguish between a paged dma object and the on-chip GART. Signed-off-by: Ben Skeggs commit efa58db3de82ab0fdc0774aef69e2dd8a27cc98f Author: Ben Skeggs Date: Mon Jan 10 16:24:00 2011 +1000 drm/nouveau: move + rename some stuff in nouveau_sgdma.c In preparation for the addition of a new nv40 pcie backend. Signed-off-by: Ben Skeggs commit e11d57ca0b6dada29007ce3ad3db6c84034a768f Merge: 317495b a2c06ee Author: Ben Skeggs Date: Fri Feb 25 06:17:07 2011 +1000 Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next commit 57d9c10dd91f942f836592f407d6351e2969548a Author: Hannu Heikkinen Date: Thu Feb 24 21:31:33 2011 +0200 spi/omap_mcspi: Off-by-one error in finding the right divisor Off-by-one error, gave erroneous divisor value 16 if speed_hz is over zero but less than OMAP2_MCSPI_MAX_FREQ / (1 << 15), that is, [1..1463]. Also few overly complex bit shifts in divisor fixed. Also one dev_dgb line fixed, which indicated max speed exceeding transfer speed. Introducing a new function omap2_mcspi_calc_divisor() for getting the right divisor in omap2_mcspi_setup_transfer(). Signed-off-by: Phil Carmody Signed-off-by: Hannu Heikkinen Signed-off-by: Grant Likely commit f227e08b71b9c273eaa29a57370a3a5b833aa382 Merge: fec38d1 f5412be Author: Greg Kroah-Hartman Date: Thu Feb 24 11:36:31 2011 -0800 Merge 2.6.38-rc6 into tty-next This was to resolve a merge issue with drivers/char/Makefile and drivers/tty/serial/68328serial.c Signed-off-by: Greg Kroah-Hartman commit 5a54b2f199fdf19533f96c3e285b70c6729e1e4a Author: Coly Li Date: Thu Feb 24 14:10:05 2011 -0500 ext4: mballoc: don't replace the current preallocation group unnecessarily In ext4_mb_check_group_pa(), the current preallocation space is replaced with a new preallocation space when the two have the same distance from the goal block. This doesn't actually gain us anything, so change things so that the function only switches to the new preallocation group if its distance from the goal block is strictly smaller than the current preallocaiton group's distance from the goal block. Signed-off-by: Coly Li Signed-off-by: "Theodore Ts'o" commit 58696f3ab2b23fd6519189875fafdb5d1281eb54 Author: Coly Li Date: Thu Feb 24 14:10:00 2011 -0500 ext4: clarify description of ac_g_ex in struct ext4_allocation_context Signed-off-by: Coly Li Cc: Alex Tomas Cc: Theodore Tso commit dd87cc53c42f3260b7eb7f60822de0fa9e58af59 Merge: 981858b bb45e39 aad83b1 23fe363 Author: Rafael J. Wysocki Date: Thu Feb 24 20:00:44 2011 +0100 Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next commit 23fe36306ea489eef7dd88506bdcefdc8da39c91 Author: Rafael J. Wysocki Date: Tue Feb 8 23:48:16 2011 +0100 ACPI: Avoid calling request_irq() many times for the same interrupt In principle acpi_os_install_interrupt_handler() may be called multiple times for different interrupts, either from acpi_ev_get_gpe_xrupt_block(), or from acpi_ev_install_sci_handler(). However, it always attempts to request the same interrupt, acpi_gbl_FADT.sci_interrupt and it doesn't check whether or not this interrupt has already been requested. Modify this function so that it refuses to request interrupts other than acpi_gbl_FADT.sci_interrupt and change acpi_os_remove_interrupt_handler() so that it refuses to free such interrupts. Use the observation that the only supported ACPI interrupt must be equal to acpi_gbl_FADT.sci_interrupt and drop an unnecessary variable acpi_irq_irq. This change has been tested on Toshiba Portege R500 and HP nx6325 without introducing any visible problems. Signed-off-by: Rafael J. Wysocki commit aad83b143008e1d406248803550bfbfc600b6398 Author: Rafael J. Wysocki Date: Tue Feb 8 23:42:35 2011 +0100 ACPI / PM: acpi_hibernation_enter() need not switch interrupts off The function acpi_hibernation_enter() is always called with interrupts off, so it doesn't need to switch them off and on. Signed-off-by: Rafael J. Wysocki commit f1a2003e22f6b50ea21f7f4b38b38c5ebc9c8017 Author: Rafael J. Wysocki Date: Tue Feb 8 23:42:22 2011 +0100 ACPI / PM: Merge do_suspend_lowlevel() into acpi_save_state_mem() The function do_suspend_lowlevel() is specific to x86 and defined in assembly code, so it should be called from the x86 low-level suspend code rather than from acpi_suspend_enter(). Merge do_suspend_lowlevel() into the x86's acpi_save_state_mem() and change the name of the latter to acpi_suspend_lowlevel(), so that the function's purpose is better reflected by its name. Signed-off-by: Rafael J. Wysocki commit 979f11b060c0b35b03b86ae854d6f21a710305d0 Author: Rafael J. Wysocki Date: Tue Feb 8 23:42:09 2011 +0100 ACPI / PM: Call acpi_save_state_mem() right before low-level suspend Since acpi_save_state_mem() is only called by acpi_suspend_enter() if the target sleep state is S3, it's better to call it under the switch (acpi_state), right before do_suspend_lowlevel(). Signed-off-by: Rafael J. Wysocki commit 7a63f08b2b904d25e966dd0e15c9af4a13c80b90 Author: Rafael J. Wysocki Date: Tue Feb 8 23:41:57 2011 +0100 ACPI / PM: Modify the "low-level resume finished" message Move the low-level resume completion message to the point where control goes back to acpi_suspend_enter() during resume and change it so that it's more informative. Signed-off-by: Rafael J. Wysocki commit 82911fe1988fadfc9c01673202cbc411aa803244 Author: Rafael J. Wysocki Date: Tue Feb 8 23:41:47 2011 +0100 ACPI / PM: acpi_suspend_enter() need not switch interrupts off The function acpi_suspend_enter() is always called with interrupts off, so it doesn't need to switch them off and on. Signed-off-by: Rafael J. Wysocki commit c41b93fb8551148a93d3bba870365e8489317f02 Author: Rafael J. Wysocki Date: Tue Feb 8 23:41:35 2011 +0100 ACPI / PM: Drop acpi_restore_state_mem() The function acpi_restore_state_mem() has never been and most likely never will be used, so remove it. Signed-off-by: Rafael J. Wysocki commit c19f9a84ec807da57fd75bbd9a3f2b8269611f79 Author: Rafael J. Wysocki Date: Tue Feb 8 23:41:13 2011 +0100 ACPI / Button: Avoid disabling wakeup unnecessarily on remove If a button device had already been enabled to wake up the system from sleep states before the button driver saw it, the driver shouldn't disable the device's wakeup capability when being detached from the device. Signed-off-by: Rafael J. Wysocki commit 5190726765b40774c069e187a958e10ccd970e65 Author: Rafael J. Wysocki Date: Tue Feb 8 23:40:37 2011 +0100 ACPI: Remove the wakeup.run_wake_count device field The wakeup.run_wake_count ACPI device field is only used by the PCI runtime PM code to "protect" devices from being prepared for generating wakeup signals more than once in a row. However, it really doesn't provide any protection, because (1) all of the functions it is supposed to protect use their own reference counters effectively ensuring that the device will be set up for generating wakeup signals just once and (2) the PCI runtime PM code uses wakeup.run_wake_count in a racy way, since nothing prevents acpi_dev_run_wake() from being called concurrently from two different threads for the same device. Remove the wakeup.run_wake_count ACPI device field which is unnecessary, confusing and used in a wrong way. Signed-off-by: Rafael J. Wysocki commit bb45e394e21eb2abc710ad43d98ebac1069bf355 Author: Rafael J. Wysocki Date: Tue Feb 8 23:38:38 2011 +0100 ACPI / PM: Use existing ACPI iomaps for NVS save/restore (v2) Modify the NVS save/restore code to use acpi_os_get_iomem() and acpi_os_unmap_memory() to acquire and release references to ACPI iomaps, respectively. If there's no ACPI iomap corresponding to the given NVS page, acpi_os_ioremap() is used to map that page and iounmap() is used to unmap it during resume. [If the page is not present in the ACPI iomaps already, it doesn't make sense to add its mapping to the list of ACPI iomaps, because it's going to be thrown away during the subsequent resume anyway.] Testing on my HP nx6325 shows that approx. 90% of the NVS pages have already been mapped by ACPI before suspend and are present in the ACPI iomaps, so this change appears to be the right thing to do in general. Signed-off-by: Rafael J. Wysocki commit 13606a2de1996f8d83a9ce296f74022bdbadf712 Author: Rafael J. Wysocki Date: Tue Feb 8 23:38:25 2011 +0100 ACPI: Introduce acpi_os_get_iomem() Introduce function acpi_os_get_iomem() that may be used by its callers to get a reference to an ACPI iomap. Signed-off-by: Rafael J. Wysocki commit b7c1fadd6c2eead56d0664a3a921980120de0c11 Author: Rafael J. Wysocki Date: Tue Feb 8 23:38:15 2011 +0100 ACPI: Do not use krefs under a mutex in osl.c The reference counting of ACPI iomaps is carried out entirely under acpi_ioremap_lock, so it is sufficient to use simple counters instead of krefs for this purpose. Signed-off-by: Rafael J. Wysocki commit 7ffd0443f2502478545e23e194b7eb8e16376072 Author: Rafael J. Wysocki Date: Tue Feb 8 23:38:05 2011 +0100 ACPI: Make acpi_os_map_memory() avoid creating unnecessary mappings Modify acpi_os_map_memory() so that it doesn't call acpi_os_ioremap() unconditionally every time it is executed (except when acpi_gbl_permanent_mmap is unset), which pretty much defeats the purpose of maintaining the list of ACPI iomaps in osl.c. Signed-off-by: Rafael J. Wysocki commit 7fe135dc058faea0ce319a03e3b6f98c5049955c Author: Rafael J. Wysocki Date: Tue Feb 8 23:37:53 2011 +0100 ACPI: Avoid walking the list of memory mappings in osl.c twice in a row Make acpi_os_unmap_generic_address() use acpi_map_lookup() to find the desired iomap and drop the reference to it directly (and eventually remove it if necessary) instead of calling acpi_os_unmap_memory(), which requires us to walk the list of ACPI iomaps twice in a row (first, to get the virtual address associated with the iomap and second, to get the iomap itself). Signed-off-by: Rafael J. Wysocki commit 7bbb890358b96cb6f77adc6815f2072bdf813d5d Author: Rafael J. Wysocki Date: Tue Feb 8 23:37:42 2011 +0100 ACPI: Change acpi_ioremap_lock into a mutex There's no reason why acpi_ioremap_lock has to be a spinlock, because all of the functions it is used in may sleep anyway and there's no reason why it should be locked with interrupts off. Use a mutex instead (that's going to allow us to put some more operations under the lock later). Signed-off-by: Rafael J. Wysocki commit 073b4964b3b75fd9e19bf3933b26d9c23591c9db Author: Rafael J. Wysocki Date: Tue Feb 8 23:37:31 2011 +0100 ACPI: Do not export functions that are only used in osl.c The functions acpi_os_map_generic_address() and acpi_os_unmap_generic_address() are only used in drivers/acpi/osl.c, so make them static and remove the extern definitions of them from include/linux/acpi_io.h. Signed-off-by: Rafael J. Wysocki commit 7c786059293335412f99732c6f4c2a886eab25c2 Author: Coly Li Date: Thu Feb 24 13:24:25 2011 -0500 mballoc: add comments to ext4_mb_mark_free_simple() This patch adds comments to ext4_mb_mark_free_simple to make it more understandable. Signed-off-by: Coly Li Cc: Alex Tomas Cc: Theodore Tso commit 235772da3e2adb1f4d71f27ec5475093dd38b2ac Author: Coly Li Date: Thu Feb 24 13:24:18 2011 -0500 ext4: remove unncessary call mb_find_buddy() in debugging code In __mb_check_buddy(), look at the code below: 591 fstart = -1; 592 buddy = mb_find_buddy(e4b, 0, &max); 593 for (i = 0; i < max; i++) { 594 if (!mb_test_bit(i, buddy)) { 595 MB_CHECK_ASSERT(i >= e4b->bd_info->bb_first_free); 596 if (fstart == -1) { 597 fragments++; 598 fstart = i; 599 } 600 continue; 601 } 602 fstart = -1; 603 /* check used bits only */ 604 for (j = 0; j < e4b->bd_blkbits + 1; j++) { 605 buddy2 = mb_find_buddy(e4b, j, &max2); 606 k = i >> j; 607 MB_CHECK_ASSERT(k < max2); 608 MB_CHECK_ASSERT(mb_test_bit(k, buddy2)); 609 } 610 } 611 MB_CHECK_ASSERT(!EXT4_MB_GRP_NEED_INIT(e4b->bd_info)); 612 MB_CHECK_ASSERT(e4b->bd_info->bb_fragments == fragments); 613 614 grp = ext4_get_group_info(sb, e4b->bd_group); 615 buddy = mb_find_buddy(e4b, 0, &max); On line 592, buddy is fetched by mb_find_buddy() with order 0, between line 593 to line 615, buddy is not changed, therefore there is no need to fetch buddy again from mb_find_buddy() with order 0 again. We can safely remove the second mb_find_buddy() on line 615. Signed-off-by: Coly Li Cc: Alex Tomas Cc: Theodore Tso commit 82d3c90cc8e3ca8a7b7fe67a292e30603c24e3d9 Author: Chris Wilson Date: Thu Feb 24 18:13:42 2011 +0000 drm/i915: Use a symbolic constant for OpRegion lid state Signed-off-by: Chris Wilson commit 84b775a354f640736176b5d966408fc5d5da6665 Author: Coly Li Date: Thu Feb 24 12:51:59 2011 -0500 ext4: code cleanup in mb_find_buddy() Current code calculate max no matter whether order is zero, it's unnecessary. This cleanup patch sets max to "1 << (e4b->bd_blkbits + 3)" only when order == 0. Signed-off-by: Coly Li Cc: Alex Tomas Cc: Theodore Tso commit c7f7fd5b7ea114e0f85fc4f2a853f6564410588d Author: Mike Christie Date: Wed Feb 16 15:04:41 2011 -0600 [SCSI] be2iscsi: fix null ptr ref in conn get param The ep_disconnect function could be freeing the ep while beiscsi_conn_get_param is running. This has the driver use the get ep param callback instead of the get conn param to fix this. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 7c53c6f89d7a6487986c51cd73ae9a9be338a8f4 Author: Mike Christie Date: Wed Feb 16 15:04:40 2011 -0600 [SCSI] iser: export addr and port This pactch has iser export the address and port of the endpoint. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit d8585bcd7da071f4278710f1c39e18dfe7cb0280 Author: Mike Christie Date: Wed Feb 16 15:04:39 2011 -0600 [SCSI] bnx2i: fix null ptr ref in conn get param bnx2i has some checks to try and make sure the ep is not destroyed while the addr/port is getting read. However, if after this check: if (!(bnx2i_conn && bnx2i_conn->ep && bnx2i_conn->ep->hba)) goto out; bnx2i_conn->ep is cleared by ep_disconnect then we will oops. This patches fixes the problem by having the driver use the get_ep_param callback instead of get_conn_param. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit c71b9b669e1243623f7ed4332877d3f2beafc6ab Author: Mike Christie Date: Wed Feb 16 15:04:38 2011 -0600 [SCSI] cxgbi: convert to use iscsi_conn_get_addr_param This has cxgbi use the iscsi_conn_get_addr_param helper and the get ep callback. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 289324b0c6007171d67bf1ab0827355ae3374773 Author: Mike Christie Date: Wed Feb 16 15:04:37 2011 -0600 [SCSI] iscsi class: add callout to get iscsi_endpoint values For drivers using the ep callbacks the addr and port are attached to the endpoint instead of the conn. This adds a callout to the iscsi_transport to get ep values. It also adds locking around the get param call to make sure that ep_disconnect does not free the LLD's ep interconnect structs from under us (the ep has a refcount so it will not go away but the LLD may have structs from other subsystems that are not allocated in the ep so we need to protect them from getting freed). Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit a79af8a64d395bd89de8695a5ea5e1a7f01f02a8 Author: Mike Christie Date: Wed Feb 16 15:04:36 2011 -0600 [SCSI] iscsi_tcp: use iscsi_conn_get_addr_param libiscsi function This has iscsi_tcp use the iscsi_conn_get_addr_param libiscsi function. It also drops the use of the libiscsi session portal buffers, so they can be removed in the next patches. Instead of copying the values at bind time we get them during get() time. If we are not connected userspace will now get -ENOTCONN, so it knows that connection is disconnected instead of a possible stale value. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 00f3708e6ed1698d6aee3901ea991197e31a8007 Author: Mike Christie Date: Wed Feb 16 15:04:35 2011 -0600 [SCSI] libiscsi: add helper to convert addr to string This adds a helper to convert a addr struct to a string. This will be used by the drivers in the next patches. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit bbc5261b2cb5e69754c935ea2466fb22775f0e48 Author: Mike Christie Date: Wed Feb 16 15:04:34 2011 -0600 [SCSI] iscsi class: remove unused active variable The active variable on the iscsi_cls_conn is not used so this patch removes it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 22a39fbbfecfea703b686a4626a631d706ccb3ee Author: Mike Christie Date: Wed Feb 16 15:04:33 2011 -0600 [SCSI] iscsi: fix iscsi_endpoint leak When iscsid restarts it does not know the connection's endpoint, so it is getting leaked. This fixes the problem by having the iscsi class force a disconnect before a new connection is bound. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit fdafd4dfc7bbdd40a4692192b77299b28c8a948f Author: Mike Christie Date: Wed Feb 16 15:04:32 2011 -0600 [SCSI] cxgbi: enable TEXT PDU support cxgb3i and cxgb4i support TEXT PDU offloading, so set the bits to enable it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit fc336387dbf02bd89cc5ea38da07e4058cfb4de0 Author: Eddie Wai Date: Wed Feb 16 15:04:31 2011 -0600 [SCSI] bnx2i: Updated to version 2.6.2.3 Signed-off-by: Eddie Wai Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 09813ba5bc1a09e39402d66c1671715af0124942 Author: Eddie Wai Date: Wed Feb 16 15:04:30 2011 -0600 [SCSI] bnx2i: Added iSCSI text pdu support for iSCSI offload This is part of an effort to support send target discovery via the iSCSI offload path. Signed-off-by: Eddie Wai Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 45188354ebd15be7fb15d2b144a1a0ecd2e797a9 Author: Eddie Wai Date: Wed Feb 16 15:04:29 2011 -0600 [SCSI] bnx2i: Added jumbo MTU support for the no shost case For scenarios where the shost is not being passed to bnx2i for the iSCSI offload connection request, the code would consult the routing table to select the CNIC device. This code path will erroneously error out if the corresponding L2 interface's MTU has been setup to > 1500. Signed-off-by: Eddie Wai Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 8a4a0f3ad071e258a9637c5491c34005a9a97903 Author: Eddie Wai Date: Wed Feb 16 15:04:28 2011 -0600 [SCSI] bnx2i: Added support for the 57712(E) devices Moved all PCI_DEVICE_ID_NX2_57712(E) definitions to pci_ids.h Signed-off-by: Eddie Wai Acked-by: Michael Chan Acked-by: Eilon Greenstein Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit a977d2c9dc463ab080e0aa8ebe563bdc414ee44f Author: Eddie Wai Date: Wed Feb 16 15:04:27 2011 -0600 [SCSI] bnx2i: Added handling for unsupported iSCSI offload hba The hba will now be unregistered and freed when iSCSI offload is not supported by the NIC. Signed-off-by: Eddie Wai Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ee15bd2da6a7c671e1b0095a3f128be9366b4db9 Author: Eddie Wai Date: Wed Feb 16 15:04:26 2011 -0600 [SCSI] bnx2i: Fixed the 32-bit swapping of the LUN field for nopouts for 5771X Fixed a bug where the 64-bit LUN field for nopouts were 32-bit swapped. This only pertains to 5771X devices. Signed-off-by: Eddie Wai Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ec8933b4bc27c6e143ca3ed4159f2e2c69b5499b Author: Eddie Wai Date: Wed Feb 16 15:04:25 2011 -0600 [SCSI] bnx2i: Allow ep CONNECT_FAILED condition to go through proper cleanup Allow CNIC to go through the proper cleanup procedure for an endpoint which failed to connect. Proper cleanup is necessary for the chip to reset back to the initial state for the offloaded endpoint. Signed-off-by: Eddie Wai Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 1648237dc2053bfd6ade3ce3dca3716d53cf9dcf Author: Dirk Eibach Date: Thu Feb 24 10:20:43 2011 +0100 gpio/pca953x: Fix wrong pointer type pca953x_get_alt_pdata() uses uint16_t* as result type for of_get_property(), but numeric of values are __be32. Checking for negative values is bogus because of-property values are unsigned by definition. Instead check for proper property size. v3: - assume big-endian properties - check property size v2: - removed bogus check for negative property values Signed-off-by: Dirk Eibach Signed-off-by: Grant Likely commit de933bd833be1a53bd361c9a327afd3c65413351 Author: Uwe Kleine-König Date: Fri Feb 18 21:47:20 2011 +0100 kbuild: reenable section mismatch analysis This was disabled in commit e5f95c8 (kbuild: print only total number of section mismatces found) because there were too many warnings. Now we're down to a reasonable number again, so we start scaring people with the details. Signed-off-by: Uwe Kleine-König Acked-by: Randy Dunlap Acked-by: Mike Frysinger Signed-off-by: Michal Marek commit d1b19426b04787e48f2689923e28d37b488969b0 Author: Yinghai Lu Date: Thu Feb 24 14:46:24 2011 +0100 x86: Rename e820_table_* to pgt_buf_* e820_table_{start|end|top}, which are used to buffer page table allocation during early boot, are now derived from memblock and don't have much to do with e820. Change the names so that they reflect what they're used for. This patch doesn't introduce any behavior change. -v2: Ingo found that earlier patch "x86: Use early pre-allocated page table buffer top-down" caused crash on 32bit and needed to be dropped. This patch was updated to reflect the change. -tj: Updated commit description. Signed-off-by: Yinghai Lu Signed-off-by: Tejun Heo commit 8bc1f91e1f0e977fb95b11d8fa686f5091888110 Author: Yinghai Lu Date: Thu Feb 24 14:43:06 2011 +0100 bootmem: Move __alloc_memory_core_early() to nobootmem.c Now that bootmem.c and nobootmem.c are separate, there's no reason to define __alloc_memory_core_early(), which is used only by nobootmem, inside #ifdef in page_alloc.c. Move it to nobootmem.c and make it static. This patch doesn't introduce any behavior change. -tj: Updated commit description. Signed-off-by: Yinghai Lu Acked-by: Andrew Morton Signed-off-by: Tejun Heo commit e782ab421bbba1912c87934bd0e8998630736418 Author: Yinghai Lu Date: Thu Feb 24 14:43:06 2011 +0100 bootmem: Move contig_page_data definition to bootmem.c/nobootmem.c Now that bootmem.c and nobootmem.c are separate, it's cleaner to define contig_page_data in each file than in page_alloc.c with #ifdef. Move it. This patch doesn't introduce any behavior change. -v2: According to Andrew, fixed the struct layout. -tj: Updated commit description. Signed-off-by: Yinghai Lu Acked-by: Andrew Morton Signed-off-by: Tejun Heo commit 0932587328d9bd5b500a640fbaff3290c8d4cabf Author: Yinghai Lu Date: Thu Feb 24 14:43:05 2011 +0100 bootmem: Separate out CONFIG_NO_BOOTMEM code into nobootmem.c mm/bootmem.c contained code paths for both bootmem and no bootmem configurations. They implement about the same set of APIs in different ways and as a result bootmem.c contains massive amount of #ifdef CONFIG_NO_BOOTMEM. Separate out CONFIG_NO_BOOTMEM code into mm/nobootmem.c. As the common part is relatively small, duplicate them in nobootmem.c instead of creating a common file or ifdef'ing in bootmem.c. The followings are duplicated. * {min|max}_low_pfn, max_pfn, saved_max_pfn * free_bootmem_late() * ___alloc_bootmem() * __alloc_bootmem_low() The followings are applicable only to nobootmem and moved verbatim. * __free_pages_memory() * free_all_memory_core_early() The followings are not applicable to nobootmem and omitted in nobootmem.c. * reserve_bootmem_node() * reserve_bootmem() The rest split function bodies according to CONFIG_NO_BOOTMEM. Makefile is updated so that only either bootmem.c or nobootmem.c is built according to CONFIG_NO_BOOTMEM. This patch doesn't introduce any behavior change. -tj: Rewrote commit description. Suggested-by: Ingo Molnar Signed-off-by: Yinghai Lu Acked-by: Andrew Morton Signed-off-by: Tejun Heo commit 4c16c36ad62fff8485215bd803d778eb2bd0b8bd Author: Bob Peterson Date: Wed Feb 23 16:11:33 2011 -0500 GFS2: deallocation performance patch This patch is a performance improvement to GFS2's dealloc code. Rather than update the quota file and statfs file for every single block that's stripped off in unlink function do_strip, this patch keeps track and updates them once for every layer that's stripped. This is done entirely inside the existing transaction, so there should be no risk of corruption. The other functions that deallocate blocks will be unaffected because they are using wrapper functions that do the same thing that they do today. I tested this code on my roth cluster by creating 200 files in a directory, each of which is 100MB, then on four nodes, I simultaneously deleted the files, thus competing for GFS2 resources (but different files). The commands I used were: [root@roth-01]# time for i in `seq 1 4 200` ; do rm /mnt/gfs2/bigdir/gfs2.$i; done [root@roth-02]# time for i in `seq 2 4 200` ; do rm /mnt/gfs2/bigdir/gfs2.$i; done [root@roth-03]# time for i in `seq 3 4 200` ; do rm /mnt/gfs2/bigdir/gfs2.$i; done [root@roth-05]# time for i in `seq 4 4 200` ; do rm /mnt/gfs2/bigdir/gfs2.$i; done The performance increase was significant: roth-01 roth-02 roth-03 roth-05 --------- --------- --------- --------- old: real 0m34.027 0m25.021s 0m23.906s 0m35.646s new: real 0m22.379s 0m24.362s 0m24.133s 0m18.562s Total time spent deleting: old: 118.6s new: 89.4 For this particular case, this showed a 25% performance increase for GFS2 unlinks. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit 4a66b1d95ad8baf6ab884a1c64461449b463eb78 Author: Sebastian Andrzej Siewior Date: Thu Feb 24 09:52:42 2011 +0100 x86: dt: Fix OLPC=y/INTEL_CE=n build Both OLPC and CE4100 activate CONFIG_OF. OLPC uses PROMTREE while CE uses FLATTREE. Compiling for OLPC only breaks due to missing flat tree functions and variables. Use proper wrappers and provide an empty x86_flattree_get_config() inline so OF=y FLATTREE=n builds and works. [ tglx: Make it work with HPET_TIMER=n and make a function static ] Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner commit bbac751dc85cbf0953a221171a746d69a0b1a85f Author: Tao Ma Date: Fri Jan 21 22:09:20 2011 +0800 ext3: speed up group trim with the right free block count. When we trim some free blocks in a group of ext3, we should calculate the free blocks properly and check whether there are enough freed blocks left for us to trim. Current solution will only calculate free spaces if they are large for a trim which is wrong. Let us see a small example: a group has 1.5M free which are 300k, 300k, 300k, 300k, 300k. And minblocks is 1M. With current solution, we have to iterate the whole group since these 300k will never be subtracted from 1.5M. But actually we should exit after we find the first 2 free spaces since the left 3 chunks only sum up to 900K if we subtract the first 600K although they can't be trimed. Cc: Jan Kara Cc: Lukas Czerner Signed-off-by: Tao Ma Signed-off-by: Jan Kara commit 4b44dd300d5bfd500f170bae13f95f589de0b28f Author: Tao Ma Date: Fri Jan 21 10:52:56 2011 +0800 ext3: Adjust trim start with first_data_block. As we have make the consense in the e-mail[1], the trim start should be added with first_data_block. So this patch fulfill it and remove the check for start < first_data_block. [1] http://www.spinics.net/lists/linux-ext4/msg22737.html Cc: Jan Kara Cc: Lukas Czerner Signed-off-by: Tao Ma Signed-off-by: Jan Kara commit 7a39de1510a3fd07a77530440292735d305fe510 Author: Davidlohr Bueso Date: Thu Jan 20 15:32:05 2011 -0300 quota: return -ENOMEM when memory allocation fails Signed-off-by: Davidlohr Bueso Signed-off-by: Jan Kara commit c2b6a059cf4d527e1e71f384e9e45326bcc8b41f Author: Carolyn Wyborny Date: Wed Feb 16 05:09:46 2011 +0000 igb: update version string This will synchronize the version with the out of tree driver which shares its functionality. Signed-off-by: Carolyn Wyborny Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 4c4b42cb2f7b8273f8e458a23f08b62d89c337f3 Author: Carolyn Wyborny Date: Thu Feb 17 09:02:30 2011 +0000 igb: Update Intel copyright notice for driver source. This fix updates copyright information to include current year 2011. Signed-off-by: Carolyn Wyborny Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 17dc566c5ee46e14021e6b8dd89098d3cb237208 Author: Lior Levy Date: Tue Feb 8 02:28:46 2011 +0000 igb: add support for VF Transmit rate limit using iproute2 Implemented igb_ndo_set_vf_bw function which is being used by iproute2 tool. In addition, updated igb_ndo_get_vf_config function to show the actual rate limit to the user. The rate limitation can be configured only when the link is up. The rate limit value can be ranged between 0 and actual link speed measured in Mbps. A value of '0' disables the rate limit for this specific VF. iproute2 usage will be 'ip link set ethX vf Y rate Z'. After the command is made, the rate will be changed instantly. To view the current rate limit, use 'ip link show ethX'. The rates will be zeroed only upon driver reload or a link speed change. This feature is being supported only by 82576 device. Signed-off-by: Lior Levy Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 6799746ad63b3df7ddf47797bb06467db35c6f94 Author: Lior Levy Date: Fri Feb 11 03:38:04 2011 +0000 igbvf: remove Tx hang detection Removed Tx hang detection mechanism from igbvf. This mechanism has no affect and can cause false alarm message in some cases. Signed-off-by: Lior Levy Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 65d676c8c13c39301ebf813c7af00a13f05b2035 Author: Greg Rose Date: Thu Feb 3 06:54:13 2011 +0000 ixgbevf: Fix name of function in function header comment Some of the function names in function header comments did not match actual name of the function. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 69bfbec47d1c120f66f2f24d5f2cb13a72fc88df Author: Greg Rose Date: Wed Jan 26 01:06:12 2011 +0000 ixgbevf: Enable jumbo frame support for X540 VF The X540 controller allows jumbo frame setup on a per VF basis. Enable use of jumbo frames when the VF device belongs to the X540 controller. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit e9f9807262083a663829d0154b3da10bafb713bb Author: Greg Rose Date: Wed Jan 26 01:06:07 2011 +0000 ixgbe: Enable Jumbo Frames on the X540 10Gigabit Controller The X540 controller supports jumbo frames in SR-IOV mode. Allow configuration of jumbo frames either in the PF driver or on behalf of a VF. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 1d2c27f94142e4ee9248dac1c93e001b707f3b74 Author: Mark Brown Date: Tue Feb 22 12:42:35 2011 -0800 ASoC: Pass the jack to jack notifiers We're currently not passing anything and this will make the card and so on more discoverable. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1aa924e21eec9dbb2c5fae90a71451a700db4414 Merge: 786c51f ebbd224 Author: Takashi Iwai Date: Thu Feb 24 10:05:01 2011 +0100 Merge branch 'fix/hda' into topic/hda commit 786c51f9168cfd2d49250c6e5e60035cbb2fd5a1 Author: Åukasz WojniÅ‚owicz Date: Thu Feb 24 10:03:31 2011 +0100 ALSA: hda - 4930g add internal lfe slider Lately I sent patch that switched lfe with side in mixer for acer-aspire-4930g. Then I connected 5.1 speaker system and noticed that lfe slider wasn't working and that old lfe slider worked. What I'm doing now is: - reverting old patch - adding internal lfe slider - removing side as it is superfluous (ALC888S-VC is 7.1 but in fact laptop can only do 5.1 and it is so in drivers for MS Windows) Signed-off-by: Åukasz WojniÅ‚owicz Signed-off-by: Takashi Iwai commit 33765d06033cc4ba4d9ae6d3d606ef3f28773c1b Author: David S. Miller Date: Thu Feb 24 01:55:45 2011 -0500 xfrm: Const'ify xfrm_address_t args to xfrm_state_find. This required a const'ification in xfrm_init_tempstate() too. Signed-off-by: David S. Miller commit 1f673c5fe2eca9007e60d82186473aa94090ea4c Author: David S. Miller Date: Thu Feb 24 01:53:13 2011 -0500 xfrm: Remove unused 'saddr' and 'daddr' args to xfrm_state_look_at. Signed-off-by: David S. Miller commit 9aa600889be2f6a6a5fed85a33d4530920662965 Author: David S. Miller Date: Thu Feb 24 01:51:36 2011 -0500 xfrm: Const'ify xfrm_address_t args to __xfrm_state_lookup{,_byaddr}. Signed-off-by: David S. Miller commit 046860138e3f244d19e59c4fb1ef637803f3abbf Author: David S. Miller Date: Thu Feb 24 01:50:12 2011 -0500 xfrm: Const'ify xfrm_tmpl arg to xfrm_init_tempstate. Signed-off-by: David S. Miller commit 2ab38503d0dff932cb657d8ef6055f28910ac0ef Author: David S. Miller Date: Thu Feb 24 01:47:16 2011 -0500 xfrm: Const'ify xfrm_address_t args to xfrm_*_hash. Signed-off-by: David S. Miller commit 9a7386ec999ae226890faea2661b4c7d494bcbb8 Author: David S. Miller Date: Thu Feb 24 01:44:12 2011 -0500 xfrm: Const'ify sec_path arg to secpath_has_nontransport. Signed-off-by: David S. Miller commit 22cccb7e03125155624d0893b86a151155f1048e Author: David S. Miller Date: Thu Feb 24 01:43:33 2011 -0500 xfrm: Const'ify ptr args to xfrm_policy_ok. Signed-off-by: David S. Miller commit 7db454b9125100877b6aa15009cf9a73c68ac755 Author: David S. Miller Date: Thu Feb 24 01:43:01 2011 -0500 xfrm: Const'ify ptr args to xfrm_state_ok. Signed-off-by: David S. Miller commit f8848067caff97ce03ee9beef8b6dd5c70f7e736 Author: David S. Miller Date: Thu Feb 24 01:42:28 2011 -0500 xfrm: Const'ify ptr args to xfrm_state_*_check and xfrm_state_kern. Signed-off-by: David S. Miller commit 21eddb5c1e972727fadec57d8c340dcf814d7902 Author: David S. Miller Date: Thu Feb 24 01:35:16 2011 -0500 xfrm: Const'ify xfrm_tmpl and xfrm_state args to xfrm_state_addr_cmp. Signed-off-by: David S. Miller commit 1786b3891c5d72803e48b990ebad4ac1b6fd9700 Author: David S. Miller Date: Thu Feb 24 01:32:54 2011 -0500 xfrm: Const'ify selector arg to xfrm_dst_update_parent. Signed-off-by: David S. Miller commit d3e40a9f5ed53894bc0ba8cf010844f1028afe29 Author: David S. Miller Date: Thu Feb 24 01:25:41 2011 -0500 xfrm: Const'ify policy arg to clone_policy. Signed-off-by: David S. Miller commit 63eb23f5d80d7158fa575aaca240cb8497e2c06f Author: David S. Miller Date: Thu Feb 24 01:25:19 2011 -0500 xfrm: Const'ify policy arg to xp_net. Signed-off-by: David S. Miller commit f299d557cb7fca4219020b19dab28ed26738c3ee Author: David S. Miller Date: Thu Feb 24 01:23:30 2011 -0500 xfrm: Const'ify policy arg and local selector in xfrm_policy_match. Signed-off-by: David S. Miller commit 0b597e7edfd865cce7b18e71989a992ad0ca898e Author: David S. Miller Date: Thu Feb 24 01:22:48 2011 -0500 xfrm: Const'ify local xfrm_address_t pointers in xfrm_policy_lookup_bytype. Signed-off-by: David S. Miller commit b4b7c0b389131c34b6c3a6bf3f3c4d17fe59155f Author: David S. Miller Date: Thu Feb 24 00:35:06 2011 -0500 xfrm: Const'ify selector args in xfrm_migrate paths. Signed-off-by: David S. Miller commit 5f803b58cd8528a93fbb72fa7b011547e7b1a310 Author: David S. Miller Date: Thu Feb 24 00:33:19 2011 -0500 xfrm: Const'ify address args to hash helpers. Signed-off-by: David S. Miller commit 183cad12785ffc036571c4b789dc084ec61a1bad Author: David S. Miller Date: Thu Feb 24 00:28:01 2011 -0500 xfrm: Const'ify pointer args to km_migrate() and implementations. Signed-off-by: David S. Miller commit dd701754e7d230330adc0e212b94106bbfd34841 Author: David S. Miller Date: Thu Feb 24 00:21:08 2011 -0500 xfrm: Const'ify pointer args to migrate_tmpl_match and xfrm_migrate_check Signed-off-by: David S. Miller commit 6cc329610f2a1698576a2a8a94dbad8f82a66363 Author: David S. Miller Date: Thu Feb 24 00:19:59 2011 -0500 xfrm: Const'ify address argument to xfrm_addr_any() Signed-off-by: David S. Miller commit ff6acd16825d59de3964b036183a5d214213b9a6 Author: David S. Miller Date: Thu Feb 24 00:19:13 2011 -0500 xfrm: Const'ify address arguments to xfrm_addr_cmp() Signed-off-by: David S. Miller commit 6418c4e07991a7b405d86bd4579c670b50fec99d Author: David S. Miller Date: Thu Feb 24 00:16:53 2011 -0500 xfrm: Const'ify address arguments to __xfrm_dst_lookup() Signed-off-by: David S. Miller commit 5e6b930f21b0a442f9d5db97c8314b4d91be1c27 Author: David S. Miller Date: Thu Feb 24 00:14:45 2011 -0500 xfrm: Const'ify address arguments to ->dst_lookup() Signed-off-by: David S. Miller commit 200ce96e5601391a6d97c87067edf21fa94fb74e Author: David S. Miller Date: Thu Feb 24 00:12:25 2011 -0500 xfrm: Const'ify selector argument to xfrm_selector_match() Signed-off-by: David S. Miller commit 19bd62441c36279ab33e311faebd357ef04ba344 Author: David S. Miller Date: Thu Feb 24 00:07:20 2011 -0500 xfrm: Const'ify tmpl and address arguments to ->init_temprop() Signed-off-by: David S. Miller commit 214e005bc32c7045b8554f9f0fb07b3fcce2cd42 Author: David S. Miller Date: Thu Feb 24 00:02:38 2011 -0500 xfrm: Pass km_event pointers around as const when possible. Signed-off-by: David S. Miller commit 5f62615ef5e50b0ad6c125fe1e38f2ac675012e2 Author: HeungJun Kim Date: Wed Feb 23 21:42:49 2011 -0800 Input: mcs_touchkey - add shutdown handler The MCS50XX series has a HW bug that requires explicit chip power down. If chip is not powered down before shutting the system down the control pins (powerup, interrupt) are pulled up and residue current continues flowing into the chips making them continue consuming power. Signed-off-by: Heungjun Kim Signed-off-by: Kyungmin Park Signed-off-by: Dmitry Torokhov commit adf779c1ee1d5556ebd83e39a7189022d4ebce3a Author: Heungjun Kim Date: Wed Feb 23 21:40:11 2011 -0800 Input: mcs_touchkey - add support for suspend/resume This adds support for system-level suspend/resume to the driver. Signed-off-by: Heungjun Kim Signed-off-by: Kyungmin Park Signed-off-by: Dmitry Torokhov commit 5ad567ffbaf208bd35bff4341906346c1a1d4574 Author: Abraham Arce Date: Tue Feb 22 22:25:59 2011 -0800 Input: omap4-keypad - wire up runtime PM handling Enable Runtime PM functionality in OMAP4 driver based on the following assumptions: - keyboard controller in wakeup domain so it is always on and power impact is minimal; - in OMAP4 the device control is at module/device level and ick/fclk level control is difficult so cutting of clocks will prevent interrupts. Signed-off-by: Abraham Arce Signed-off-by: Shubhrajyoti D Signed-off-by: Dmitry Torokhov commit 55ae22d08fc9b531bc8a88b7306004e7053bb425 Merge: d12b0d9 bf781ec Author: David S. Miller Date: Wed Feb 23 20:47:56 2011 -0800 Merge branch 'tipc-Feb23-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6 commit 1d017fee97da8e291f521537c49a324ad3becd61 Author: Marek Szyprowski Date: Thu Feb 24 10:06:25 2011 +0900 ARM: S5PV210: Add power consumers for hsotg for GONI board This patch adds definitions for power consumers for s3c-hsotg driver on Goni board. The consumers are defined as arrays, because later more entries for MIPI and ADC will be defined. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 9b8306c6f5dc4c1dcf78f25f622720944a1fb736 Author: Marek Szyprowski Date: Thu Feb 24 10:03:54 2011 +0900 ARM: S5PV210: Disable unused power regulators on GONI board A lot of power regulator has been enabled by default causing the board to consume a lot of power. This patch fixes this issue. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 17a8f8e3734920cf2f030f2fa521a0b940ef6f90 Author: Changli Gao Date: Thu Feb 24 08:19:57 2011 +0800 ipvs: use enum to instead of magic numbers Signed-off-by: Changli Gao Signed-off-by: Simon Horman commit bf781ecfc6d6ecc4f66762a870f9c1fc76b9c8d5 Author: Allan Stephens Date: Tue Jan 25 16:12:39 2011 -0500 tipc: Avoid reliable broadcast preparation for NACK messages Enhance TIPC to skip unnecessary (and, in some cases, redundant) preparation work when sending a broadcast link NACK message, since this preparation is only required for broadcast messages that are sent in a reliable manner. This change also fixes a bug that caused NACK messages to be improperly counted as "TX packets" in TIPC's broadcast link statistics. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 2e07dda1659095115e5e36a2fed0fddc1e3ea1c8 Author: Allan Stephens Date: Tue Jan 25 14:39:59 2011 -0500 tipc: Remove unused message header field for requested number of links Eliminates support for the "number of requested links" field in a neighbor discovery message. This field was never used and has been removed from the TIPC 2.0 protocol specification. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 741de3e9ff6e07e908e1cad2eb03e29677fde093 Author: Allan Stephens Date: Tue Jan 25 13:33:31 2011 -0500 tipc: Remove support for per-connection message sequence numbering Eliminates TIPC's prototype support for message sequence numbering on routable connections (i.e. connections requiring more than one hop). This capability isn't currently used, and can be removed since TIPC only supports systems in which all inter-node communication can be achieved in a single hop. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 214dda4a36329fdd631e3aac0fee6e6fa369db62 Author: Allan Stephens Date: Mon Jan 24 16:22:43 2011 -0500 tipc: Add in missing lock during link initialization Ensure that the routine that starts up processing on a newly created link endpoint takes the spinlock of the node object that owns the link, to prevent possible conflicts with processing involving other links owned by that node object. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit cb7ce91448c01724e18c1759aa5aba86e5f1c69b Author: Allan Stephens Date: Mon Jan 24 15:02:14 2011 -0500 tipc: Fix port counter handling to correct congestion control Modifies TIPC's congestion control between a connected port and its peer so that it works as documented. The following changes have been made: 1) The counter of the number of messages sent by a port now starts at zero, rather than one. This prevents the port from reporting port congestion one message earlier than it was supposed to. 2) The counter of the number of messages sent by a port is now incremented only if a non-empty message is sent successfully. This prevents the port from becoming permanently congested if too many send attempts are unsuccessful because of congestion (or other reasons). It also removes the risk that empty hand- shaking messages used during connection setup might cause the port to report congestion earlier than it was supposed to. 3) The counter of the number of unacknowledged messages received by a port controlled by an internal TIPC service is now incremented only if the message is non-empty, in order to be consistent with the aforementioned changes. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 69218fc426569739d2bb68e15ac4905948409642 Author: Allan Stephens Date: Fri Jan 21 09:45:33 2011 -0500 tipc: Minor optimization to topology service connection establishment Eliminates a local iovec structure containing no data, which was previously used during the establishment of a topology service connection, since the same effect can be achieved by passing in a NULL pointer and an iovec length of zero. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit f23d9bf2b7ba22fe49b65d344b3651049cecc51d Author: Allan Stephens Date: Tue Jan 18 15:15:34 2011 -0500 tipc: Set unused probe field of link protocol messages to defined value Ensures that a link reset or activate message has a "probe" field of zero. (This field is currently unused in these messages, but this could potentially change in future versions of TIPC.) Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 9bd80b60827fe8d84c0e594895acb8a44f2b98b1 Author: Allan Stephens Date: Tue Jan 18 15:02:50 2011 -0500 tipc: Improve accuracy of link transmit queue maximum size statistic Enhances TIPC's unicast and broadcast link code to update the transmit queue maximum size counter in a single place, namely the routine that adds messages to the queue. This ensures that the maximum size statistic reported for unicast links is completely accurate, rather than being partially based on statistical sampling. The changes to link.h are just documenting the roles of the variables. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 9f54b545bd62a42ec354727d90eacadc5846406b Author: Allan Stephens Date: Tue Jan 18 13:58:27 2011 -0500 tipc: Eliminate unnecessary locking when starting topology service Modifies the initialization code for TIPC's topology service to avoid taking the spinlock protecting the subscriber list, since there is no need to do this. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 01d83eddc55c138cbb24a5917d5271c0b24956a1 Author: Allan Stephens Date: Tue Jan 18 13:53:16 2011 -0500 tipc: Clean up tracking of node requesting a broadcast retransmit Allows the broadcast link to track the node that is requesting a retransmit in a new field dedicated to that purpose. This replaces the existing mechanism that (ab)uses an existing node structure linked list field to do the tracking. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 77c81e0bb8af3f1a0e5d84dd0346fe57dfe3da27 Author: Allan Stephens Date: Tue Jan 18 13:37:09 2011 -0500 tipc: Clean out all remaining instances of #if 0'd unused code Remove all instances of legacy or proposed-but-not-implemented code that lives within an #if 0 ... #endif block. If some of it is needed in the future it can recovered out of history, but there is no need for it to clutter up the active code base. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit c8a61b52ebac3645b4e3c5b03c2073e6c8c119a8 Author: Allan Stephens Date: Tue Jan 18 13:31:32 2011 -0500 tipc: Fix print statements that assume pointers are 32-bit values Corrects print statements that use %x to print pointer values to use %p instead, so that 64-bit pointer values are displayed correctly. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 5413b4c6c07b659e52c84a4e40d897b32b89834f Author: Allan Stephens Date: Tue Jan 18 13:24:55 2011 -0500 tipc: Improve handling of invalid link tolerance values Enhances TIPC link code to ignore an invalid link tolerance value contained in an incoming LINK_PROTOCOL message, rather than processing the value and potentially causing a divide-by-zero error. Also add a compile-time check that catches attempts to redefine TIPC's minimum link tolerance value in a manner that might result in the same divide-by-zero error at run-time. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 3f8dd9446e66f2a982ddcff38e4705cfe93eeec6 Author: Allan Stephens Date: Tue Jan 18 13:09:29 2011 -0500 tipc: Prevent invalid memory access when sending to configuration service Reject TIPC configuration service messages without a full message header. Previously, an application that sent a message to the configuration service that was too short could cause the validation code to access an uninitialized field in the msghdr structure, resulting in a memory access exception. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 4132facae1df653b5a78e0e32956218199026812 Author: Allan Stephens Date: Fri Jan 7 13:12:12 2011 -0500 tipc: Remove unused global variable tipc_user_count Eliminates a global variable that was previously used by TIPC's user registry to track the number of distinct applications using TIPC. Due to the recent elimination of the user registry this variable no longer serves any purpose and can be removed. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 2d627b92fd1e39d83c3ee0b9d410403f98cb3981 Author: Allan Stephens Date: Fri Jan 7 13:00:11 2011 -0500 tipc: Combine bearer structure with tipc_bearer structure Combines two distinct structures containing information about a TIPC bearer into a single structure. The structures were previously kept separate so that public information about a bearer could be made available to plug-in media types using TIPC's native API, while the remaining information was kept private for use by TIPC itself. However, now that the native API has been removed there is no longer any need for this arrangement. Since one of the structures was already embedded within the other, the change largely involves replacing instances of "publ.foo" with "foo". The changes do not otherwise alter the operation of TIPC bearers. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit 23dd4cce387124ec3ea06ca30d17854ae4d9b772 Author: Allan Stephens Date: Fri Jan 7 11:43:40 2011 -0500 tipc: Combine port structure with tipc_port structure Merge two distinct structures containing information about a TIPC port into a single structure. The structures were previously kept separate so that public information about a port could be made available to applications using TIPC's native API, while the remaining information was kept private for use by TIPC itself. However, now that the native API has been removed there is no longer any need for this somewhat confusing arrangement. Since one of the structures was already embedded within the other, the change largely involves replacing instances of "publ.foo" with "foo". The changes do not otherwise alter the operation of TIPC ports. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker commit ea6633369458992241599c9d9ebadffaeddec164 Author: Eric Sandeen Date: Wed Feb 23 17:51:51 2011 -0500 ext4: enable acls and user_xattr by default There's no good reason to require the extra step of providing a mount option for acl or user_xattr once the feature is configured on; no other filesystem that I know of requires this. Userspace patches have set these options in default mount options, and this patch makes them default in the kernel. At some point we can start to deprecate the options, perhaps. For now I've removed default mount option checks in show_options() to be explicit about what's set, since it's changing the default, but I'm open to alternatives if desired. Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" commit 5c2ed62fd447e2c696e222dcf71d1322bbbc58d4 Author: Lukas Czerner Date: Wed Feb 23 17:49:51 2011 -0500 ext4: Adjust minlen with discard_granularity in the FITRIM ioctl Discard granularity tells us the minimum size of extent that can be discarded by the device. If the user supplies a minimum extent that should be discarded (range.minlen) which is smaller than the discard granularity, increase minlen to the discard granularity, since there's no point submitting trim requests that the device will reject anyway. Signed-off-by: Lukas Czerner Signed-off-by: "Theodore Ts'o" commit da1bbd1d85ca4b68c58986f997f859327fd7f648 Author: Manohar Vanga Date: Wed Feb 23 14:25:28 2011 +0100 staging: vme: fix loop condition Fix loop condition in vme_register_bridge that results in an infinite loop in the event that device_register fails. Signed-off-by: Manohar Vanga Acked-by: Martyn Welch Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 6012795b13cd15b1e2216dc8558461ce99aecc30 Author: Manohar Vanga Date: Wed Feb 23 14:25:27 2011 +0100 staging: vme: remove unreachable code Removed some unreachable code from vme_register_bridge Signed-off-by: Manohar Vanga Acked-by: Martyn Welch Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit ea5dbf96dbbfa4cf29925e82af3a0a613079b1bd Author: Michael Hennerich Date: Wed Feb 23 12:33:12 2011 +0100 staging: IIO: trigger: New Blackfin specific trigger driver iio-trig-bfin-timer This driver allows any Blackfin system timer to be used as IIO trigger. It supports trigger rates from 0 to 100kHz in Hz resolution. Changes since V1: IIO: trigger: Apply review feedback Add comment explaining Blackfin hardware timer configurations Fix frequency_store, don't return -EINVAL for frequency set to 0 Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 0772268aa98fce8a5931f8a39049658465319f3e Author: Michael Hennerich Date: Wed Feb 23 10:45:47 2011 +0100 staging: IIO: DAC: Add support for the AD5543/AD5553 Add support for the AD5543/AD5553 SPI 16-/14-Bit DACs Fix typo in kconfig description Changes since V1: reorder Kconfig help text Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit b9618c0cacd7cf56cc3d073c1e9e9a8a3a12864e Author: Michael Hennerich Date: Tue Feb 22 21:46:18 2011 +0100 staging: IIO: ADC: New driver for AD7606/AD7606-6/AD7606-4 This patch adds support for the: AD7606/AD7606-6/AD7606-4 8/6/4-Channel Data Acquisition system (DAS) with 16-Bit, Bipolar, Simultaneous Sampling ADC. Changes since V1: IIO: ADC: New driver for AD7606/AD7606-6/AD7606-4: Apply review feedback Rename sysfs node oversampling to oversampling_ratio. Kconfig: Add GPIOLIB dependency. Use range in mV to better match HWMON. Rename ad7606_check_oversampling. Fix various comments and style. Reorder is_visible cases. Use new gpio_request_one/array and friends. Drop check for SPI max_speed_hz. Changes since V2: IIO: ADC: New driver for AD7606/AD7606-6/AD7606-4: Apply review feedback Documentation: specify unit Avoid raise condition in ad7606_scan_direct() Check return value of bus ops read_block() Changes since V3: IIO: ADC: New driver for AD7606/AD7606-6/AD7606-4: Add missing include file Add linux/sched.h Changes since V4: IIO: ADC: New driver for AD7606/AD7606-6/AD7606-4: Fix kconfig declaration consistently use tristate to avoid configuration mismatches Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 363907af85816adac5e60d48d3d84bba8f7201df Author: Pavan Savoy Date: Sun Feb 20 22:41:16 2011 -0600 Bluetooth: btwilink driver This is the bluetooth protocol driver for the TI WiLink7 chipsets. Texas Instrument's WiLink chipsets combine wireless technologies like BT, FM, GPS and WLAN onto a single chip. This Bluetooth driver works on top of the TI_ST shared transport line discipline driver which also allows other drivers like FM V4L2 and GPS character driver to make use of the same UART interface. Kconfig and Makefile modifications to enable the Bluetooth driver for Texas Instrument's WiLink 7 chipset. Signed-off-by: Pavan Savoy Acked-by: Gustavo F. Padovan Signed-off-by: Greg Kroah-Hartman commit 6a3a81e7ca9b1ddaaf8d644b4102aff0fe2a7c40 Author: Randy Dunlap Date: Mon Feb 21 14:39:08 2011 -0800 staging: fix olpc_dcon kconfig and build errors drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c:106: error: 'acpi_gbl_FADT' undeclared (first use in this function) Fixing that one gives: ERROR: "backlight_device_register" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "lock_fb_info" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "backlight_device_unregister" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "num_registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! ERROR: "fb_blank" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined! Signed-off-by: Randy Dunlap Cc: Chris Ball Cc: Jon Nettleton Acked-By: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 87be424a9a4be41df26b25b3360969211cedd5d1 Author: Christopher Brannon Date: Mon Feb 21 14:07:10 2011 +0000 Staging: speakup: fix an out-of-bounds error. The cur_item variable from keyhelp.c is an index into a table of messages. The following condition should always hold: MSG_FUNCNAMES_START + cur_item <= MSG_FUNCNAMES_END. The check in keyhelp.c was wrong. It allowed cur_item to be incremented to an out-of-bounds value. Signed-off-by: Christopher Brannon Signed-off-by: Greg Kroah-Hartman commit 1af4791552e462b37d0174407dc3173917e35ea0 Author: Marcin Slusarz Date: Sun Feb 20 20:03:34 2011 +0100 staging/et131x: fix et131x_rx_dma_disable halt_status usage Commit 1bd751c1abc1029e8a0ae63ef4f19357c735a2a3 ("Staging: et131x: Clean up rxdma_csr") changed csr from bitfield to u32, but failed to convert 2 uses of halt_status bit. It did: - if (csr.bits.halt_status != 1) + if ((csr & 0x00020000) != 1) which is wrong, because second version is always true. Fix it. This bug was found by coccinelle (http://coccinelle.lip6.fr/). Signed-off-by: Marcin Slusarz Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit d12b0d9adc46888e3bb0224886105bf3b188553b Author: Rajesh Borundia Date: Wed Feb 23 03:21:25 2011 +0000 qlcnic: Remove validation for max tx and max rx queues Max rx queues and tx queues are governed by fimware. So driver should not validate these values. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 9ce13ca8fc43f6fbb7ee55a283d44ff2f4ba1c06 Author: amit salecha Date: Wed Feb 23 03:21:24 2011 +0000 qlcnic: fix checks for auto_fw_reset o Remove checks of 1 for auto_fw_reset module parameter. auto_fw_reset is of type int and can have value > 1. o Remove unnecessary #define for 1 Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 39fc0ce5710c53bad14aaba1a789eec810c556f9 Author: MichaÅ‚ MirosÅ‚aw Date: Tue Feb 22 16:52:29 2011 +0000 net: Implement SFEATURES compatibility for not updated drivers Use discrete setting ops for not updated drivers. This will not make them conform to full G/SFEATURES semantics, though. Signed-off-by: MichaÅ‚ MirosÅ‚aw Signed-off-by: David S. Miller commit 4e4db200541d49404ff39ac482efee072dd72144 Author: MichaÅ‚ MirosÅ‚aw Date: Tue Feb 22 16:52:28 2011 +0000 net: Fix ETHTOOL_GFEATURES compatibility Implement getting rx checksum state for not updated drivers. Signed-off-by: MichaÅ‚ MirosÅ‚aw Signed-off-by: David S. Miller commit 14d1232f490c1c696582909fb3b69e67a8d38a34 Author: MichaÅ‚ MirosÅ‚aw Date: Tue Feb 22 16:52:28 2011 +0000 net: avoid initial "Features changed" message Avoid "Features changed" message and ndo_set_features call on device registration caused by automatic enabling of GSO and GRO. Driver should have enabled hardware offloads it set in features, so the ndo_set_features() is not needed at registration time. Signed-off-by: MichaÅ‚ MirosÅ‚aw Signed-off-by: David S. Miller commit 8e9b59b219e520cfc2f80af471c6b0e67ad9dd75 Author: MichaÅ‚ MirosÅ‚aw Date: Tue Feb 22 16:52:28 2011 +0000 Fix "(unregistered net_device): Features changed" message Fix netdev_update_features() messages on register time by moving the call further in register_netdevice(). When netdev->reg_state != NETREG_REGISTERED, netdev_name() returns "(unregistered netdevice)" even if the dev's name is already filled. Signed-off-by: MichaÅ‚ MirosÅ‚aw Signed-off-by: David S. Miller commit a9a6fb374547044088ca37a30d4c3ca581cec80d Author: Florian Fainelli Date: Wed Feb 23 04:32:37 2011 +0000 r6040: bump to version 0.27 and date 23Feb2011 Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 193cfca5cc754b2a9b178a37f70fbb78d1731333 Author: Shawn Lin Date: Wed Feb 23 04:32:34 2011 +0000 r6040: fix multicast operations The original code does not work well when the number of mulitcast address to handle is greater than MCAST_MAX. It only enable promiscous mode instead of multicast hash table mode, so the hash table function will not be activated and all multicast frames will be recieved in this condition. This patch fixes the following issues with the r6040 NIC operating in multicast: 1) When the IFF_ALLMULTI flag is set, we should write 0xffff to the NIC hash table registers to make it process multicast traffic. 2) When the number of multicast address to handle is smaller than MCAST_MAX, we should use the NIC multicast registers MID1_{L,M,H}. 3) The hashing of the address was not correct, due to an invalid substraction (15 - (crc & 0x0f)) instead of (crc & 0x0f) and an incorrect crc algorithm (ether_crc_le) instead of (ether_crc). 4) If necessary, we should set HASH_EN flag in MCR0 to enable multicast hash table function. Reported-by: Marc Leclerc Tested-by: Marc Leclerc Signed-off-by: Shawn Lin Signed-off-by: Albert Chen Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 3f60554cb121b951d250639b01c828cf41aa09da Author: Aaro Koskinen Date: Tue Feb 22 00:14:26 2011 +0200 staging: xgifb: delete redundant XGIhw_ext fields pSR and pCR fields can be deleted with no changes in the functionality. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 7bc5e8374f22c46e6326ab219c45e75867dc9acd Author: Aaro Koskinen Date: Tue Feb 22 00:14:25 2011 +0200 staging: xgifb: delete dead code for skipping the video memory sizing Delete dead code for skipping the video memory sizing. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit da1545c0f2e5be5702ca37ad6fcddb3fa0d5094e Author: Javier Martinez Canillas Date: Mon Feb 21 18:44:35 2011 +0100 Staging: xgifb: Remove unused function fbcon_XGI_sync Due a cleanup in earlier patches, the function fbcon_XGI_sync now does nothing so it has to be removed. This patches removes the unused function. Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 522f1f63cfca29a14ff5efacac9c2cce69d8508b Author: Javier Martinez Canillas Date: Mon Feb 21 18:16:44 2011 +0100 Staging: xgifb: Remove unused spinlock in struct video_info xgifb framebuffer driver had an option to use an accelerator engine that never got used (XGIfb_accel was always 0). An earlier patchset removed the code relevant to the accelerator. Since this spinlock was used only for that code, it can be deleted as well. Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 0089bf1fb1e524fba4f86e98a9af7f03a0a8c932 Author: Javier Martinez Canillas Date: Mon Feb 21 18:16:43 2011 +0100 Staging: xgifb: Remove all the references to XGIfb_accel xgifb framebuffer driver has an option to use an accelerator engine that never get used (XGIfb_accel is always 0). An earlier patchset remove the code that depends on the accelerator being activated. This patch removes all the references to XGIfb_accel. Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit c73d0d55069b94630338bfeeae6d8149770e0451 Author: Javier Martinez Canillas Date: Mon Feb 21 10:09:07 2011 +0100 Staging: xgifb: Remove unused spinlock conditional compilation logic xgifb staging driver for XG20, XG21, XG40, XG42 frame buffer device has a accelerator engine that never get used (XGIfb_accel is always 0). Also the driver has a set of defines that hides the synchronization mechanism used to access critical sections and a way to disable spinlocks use at compile time. In a earlier patch all the code that depends on the accelerator being active was deleted because it was dead code. Since the only usage of this synchronization defines were in that dead code, this patch removes all the now unused spinlock conditional compilation logic. Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 898fcb98066cfcd6051d61638e7e3a305de34c85 Author: Javier Martinez Canillas Date: Mon Feb 21 10:09:06 2011 +0100 Staging: xgifb: Remove unused functions Earlier patch removed code that never got executed because it depended on XGIfb_accel variable value to de distinct than 0. But this variable is always 0 in current driver. That dead code used a set of functions that not remains unused. This patch removes these unused functions. Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit cfd6ea0b731d048037ba00b8dd3777a91b9675e0 Author: Javier Martinez Canillas Date: Mon Feb 21 10:09:05 2011 +0100 Staging: xgifb: Removes dead code xgifb staging driver has code that dependens on XGIfb_accel != 0. But as Dan Carpenter noticed, XGIfb_accel value is always 0 in current driver. So there is code that never gets executed. This patch removes this dead code. Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit fc3cc2caa07568de92cc84780b89b5cf9fbf28b7 Author: Tomas Winkler Date: Mon Feb 21 16:09:55 2011 +0200 staging/easycap: use USB_SUBCLASS_AUDIOSTREAMING instead of 0x02 use USB_SUBCLASS_AUDIOSTREAMING constant from usb/audio.h instead of 0x02 Cc: Mike Thomas Cc: Dan Carpenter Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit dfcce7bf0913cc81d57a41d8da3175b201ec1664 Author: Tomas Winkler Date: Mon Feb 21 13:23:27 2011 +0200 staging/easycap: easycap_usb_probe: more indentation cleanups Cc: Mike Thomas Signed-off-by: Tomas Winkler Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit b4a5916e6bdbd5585a961179799a59871d8722cc Author: Tomas Winkler Date: Mon Feb 21 13:23:26 2011 +0200 staging/easycap: revamp inputset population code make inputset population to be more compact and readable Cc: Mike Thomas Signed-off-by: Tomas Winkler Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit e03da5e2b77dee7d0535c036a09e9f613dce7c48 Author: Tomas Winkler Date: Mon Feb 21 13:23:25 2011 +0200 staging/easycap: fix style issues in easycap_usb_probe function fix some code styles and drop too verbose printouts and non relevant code Cc: Mike Thomas Signed-off-by: Tomas Winkler Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit ecc1058aecd986b9f00ba0b4b6ff3681dfb3ab47 Author: Greg Kroah-Hartman Date: Wed Feb 23 14:12:25 2011 -0800 Revert "staging: iio: ak8975: add platform data." This reverts commit f2f1794835f1d8900d2b15d114c54e70c849809b. It should not be putting code into the include/input/ directory, and lots of other people have complained about it. Cc: Tony SIM Cc: Andrew Chew Cc: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit e0c563101a3f90ce4f4fa3df5ac803f5c50ebcc5 Author: stephen hemminger Date: Wed Feb 23 09:06:52 2011 +0000 em_meta: fix sparse warning gfp_t needs to be cast to integer. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ea18fd950e3210ec6d616e2e669550dd86f74d94 Author: stephen hemminger Date: Wed Feb 23 09:06:51 2011 +0000 mqprio: cleanups * make qdisc_ops local * add sparse annotation about expected unlock/unlock in dump_class_stats * fix indentation Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ada440e3b5c3c155c2a4d73c433b3462086dbb4a Author: stephen hemminger Date: Wed Feb 23 09:06:50 2011 +0000 afkey: add sparse annotation about rcu Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 81b504b81437457614ce44ce0dac48038d35f859 Author: stephen hemminger Date: Wed Feb 23 09:06:49 2011 +0000 atl1[ce]: fix sparse warnings The dmaw_block is an enum and max_pay_load is u32. Therefore sparse gives warning about comparison of unsigned and signed value. Resolve by using min_t to force cast. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c3f52ae6a378398127acb845087ddb9e8b67493b Author: stephen hemminger Date: Wed Feb 23 09:06:48 2011 +0000 socket: suppress sparse warnings Use __force to quiet sparse warnings for cases where the code is simulating user space pointers. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ae9f66da3d7e2f4ffa1bb6b07e62cddcb7614fa6 Author: Mike McCormack Date: Mon Feb 21 00:05:19 2011 +0900 staging: rtl8192e: Remove struct member irq_mask Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 703fdcc39856a73800df8d749930c8d7bbf21571 Author: Mike McCormack Date: Mon Feb 21 00:04:54 2011 +0900 staging: rtl8192e: Make RT_TRACE use consistent Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 9f17b076387f2fdb507578efe8651bb4786de2a4 Author: Mike McCormack Date: Mon Feb 21 00:04:21 2011 +0900 staging: rtl8192e: Make functions static Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 9c100d50fc7d9f0f3e5309c704da044ece2da5c6 Author: Mike McCormack Date: Mon Feb 21 00:04:02 2011 +0900 staging: rtl8192e: Delete dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 09e4f231fcea4e4fa2d01b851ada488fa9cc395a Author: Mike McCormack Date: Mon Feb 21 00:03:36 2011 +0900 staging: rtl8192e: Remove externs, redundant comments Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 51de57ef21fd9fda1586d0c0a3e77e0dfdcb131a Author: Mike McCormack Date: Mon Feb 21 00:03:20 2011 +0900 staging: rtl8192e: Remove USB related code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 668c711bfd80e96c0ee92c2c098b81de62bbf7d3 Author: Mike McCormack Date: Mon Feb 21 00:03:08 2011 +0900 staging: rtl8192e: Remove useless usermode callback Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 2d57aa7bb708ada6e902c200e103d1ece380fb9c Author: Roland Vossen Date: Wed Feb 23 12:48:53 2011 +0100 staging: brcm80211: added locks in wl_mac80211.c Increasing robustness of the code, although no problem has been reported in the field. Several code paths were unshielded for multi thread access. Several lock acquisitions have been added to wl_mac80211.c Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit e34870f828f8d9b7e2205c632cbc135a76f7dde6 Author: Roland Vossen Date: Wed Feb 23 12:48:52 2011 +0100 staging: brcm80211: removed locks around Mac80211 calls A spinlock was acquired prior to calling the Mac80211 functions ieee80211_wake_queues() and ieee80211_stop_queues() and Cfg80211 functions wiphy_rfkill_set_hw_state() and wiphy_rfkill_start_polling(). This is not required and could even lead to instability. Therefore the locks were removed. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 55182a10063c40eda4dc5afecff712e5c3617ffc Author: Roland Vossen Date: Wed Feb 23 12:48:51 2011 +0100 staging: brcm80211: cosmetic changes Code cleanup. Added lock related comments to wl_mac80211.c. Also removed a redundant function definition. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit ce774bdcfed03a8dbc892d9fa06ee3fb2be628ee Author: Arend van Spriel Date: Tue Feb 22 11:12:10 2011 +0100 staging: brcm80211: remove some bsscfg attribute that are redundant In the struct wlc_bsscfg a couple of attribute were held under a preprocessor definition, but these are not needed in the mac80211 driver context. Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit eff1b99a6fc8eb25913fab7cd30eaeb6ca91349a Author: Arend van Spriel Date: Tue Feb 22 11:12:09 2011 +0100 staging: brcm80211: allow changing channel by mac80211 when associated When associated on 5G the driver receives a probe request for 2G with a 2G rate specified. The driver asserts as the operating band is still 5G when the probe request packet is given. Root cause was that ioctl function did fail upon setting the channel as requested by mac80211 when we are associated. Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit f317154929f87d2fe799179761d1b639af33de74 Author: Stanislav Fomichev Date: Mon Feb 21 10:35:26 2011 +0300 staging: brcm80211: remove the rest of broadcom specific byte swapping routines - move ltoh16_buf/htol16_buf util/bcmsrom.c - replace ltoh16_buf in brcmsmac/wlc_mac80211.c with several le16_to_cpu's Signed-off-by: Stanislav Fomichev Signed-off-by: Greg Kroah-Hartman commit 29750b90b51ba58b0611718072991bbf7a2b8062 Author: Stanislav Fomichev Date: Sun Feb 20 21:43:35 2011 +0300 staging: brcm80211: replace htod/dtoh broadcom defines htod32 -> cpu_to_le32 htod16 -> cpu_to_le16 dtoh32 -> le32_to_cpu dtoh16 -> le16_to_cpu For brcmfmac/dhd_common.c just removed defines. Signed-off-by: Stanislav Fomichev Signed-off-by: Greg Kroah-Hartman commit 458b2e4df48ea3d09f3cca952379cbf98668c0b3 Author: Stanislav Fomichev Date: Sun Feb 20 21:43:34 2011 +0300 staging: brcm80211: remove unused broadcom byte swapping macroses - BCMSWAP32 - bcmswap32 - BCMSWAP32BY16 - bcmswap32by16 Signed-off-by: Stanislav Fomichev Signed-off-by: Greg Kroah-Hartman commit 56dfe3c71b3c982b8c23e38a04bc68d6e57b482e Author: Stanislav Fomichev Date: Sun Feb 20 21:43:33 2011 +0300 staging: brcm80211: replace broadcom specific unaligned byte swapping routines htol16_ua_store -> put_unaligned_le16 htol32_ua_store -> put_unaligned_le32 hton16_ua_store -> put_unaligned_be16 hton32_ua_store -> put_unaligned_be32 ltoh16_ua -> get_unaligned_le16 ltoh32_ua -> get_unaligned_le32 ntoh16_ua -> get_unaligned_be16 ntoh32_ua -> get_unaligned_be32 removed unused: - load32_ua - load16_ua - store32_ua - store16_ua - ltoh_ua - ntoh_au Signed-off-by: Stanislav Fomichev Signed-off-by: Greg Kroah-Hartman commit 628f10ba81ed26e61c25cd6b79a3edb9041610ef Author: Stanislav Fomichev Date: Sun Feb 20 21:43:32 2011 +0300 staging: brcm80211: replace broadcom specific byte swapping routines HTON16/hton16 -> cpu_to_be16 (htons for networking code) HTON32/hton32 -> cpu_to_be32 (htonl for networking code) NTOH16/ntoh32 -> be16_to_cpu (ntohs for networking code) NTOH32/ntoh32 -> be32_to_cpu (ntohl for networking code) LTOH16/ltoh16 -> le16_to_cpu LTOH32/ltoh32 -> le32_to_cpu HTOL16/htol16 -> cpu_to_le16 HTOL32/htol32 -> cpu_to_le32 Signed-off-by: Stanislav Fomichev Signed-off-by: Greg Kroah-Hartman commit ccac05152e7c6a8103b9e7a801bc995180a800fc Author: Stephen Warren Date: Wed Feb 23 14:49:30 2011 -0700 ARM: Tegra: DMA: Fail safe if initialization fails tegra_dma_init currently simply bails out early if any initialization fails. This skips various data-structure initialization. In turn, this means that tegra_dma_allocate_channel can still hand out channels. In this case, when tegra_dma_free_channel is called, which calls tegra_dma_cancel, the walking on ch->list will OOPS since the list's next/prev pointers may still be NULL. To solve this, add an explicit "initialized" flag, only set this once _init has fully completed successfully, and have _allocate_channel refuse to hand out channels if this is not set. While at it, simplify _init: * Remove redundant memsets * Use bitmap_fill to mark all channels as in-use up-front, and remove some now-redundant bitmap initialization loops. * Only mark a channel as free once all channel-related initialization has completed. Finally, the successful exit path from _init always has ret==0, so just hard-code that return. The error path still returns ret. Signed-off-by: Stephen Warren Signed-off-by: Colin Cross commit 1005f085743362129396d5c5e68d7c385392dafb Author: Roland Vossen Date: Mon Feb 21 09:07:12 2011 +0100 staging: brcm80211: bugfix for crash on heavy transmit traffic With heavy transmit traffic, once in a while (range 15mins-1hr) a tx packet was added to a full transmit queue. Under certain conditions an other packet in the queue gets bumped to make room for the new packet. This is not considered an error condition, but normal operation. Despite that, there was an ASSERT(0) that caused the driver to oops. The ASSERT(0) has been removed. Driver was tested afterwards. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit e13e02a3c68d899169c78d9a18689bd73491d59a Author: Eric Dumazet Date: Wed Feb 23 10:56:17 2011 +0000 net_sched: SFB flow scheduler This is the Stochastic Fair Blue scheduler, based on work from : W. Feng, D. Kandlur, D. Saha, K. Shin. Blue: A New Class of Active Queue Management Algorithms. U. Michigan CSE-TR-387-99, April 1999. http://www.thefengs.com/wuchang/blue/CSE-TR-387-99.pdf This implementation is based on work done by Juliusz Chroboczek General SFB algorithm can be found in figure 14, page 15: B[l][n] : L x N array of bins (L levels, N bins per level) enqueue() Calculate hash function values h{0}, h{1}, .. h{L-1} Update bins at each level for i = 0 to L - 1 if (B[i][h{i}].qlen > bin_size) B[i][h{i}].p_mark += p_increment; else if (B[i][h{i}].qlen == 0) B[i][h{i}].p_mark -= p_decrement; p_min = min(B[0][h{0}].p_mark ... B[L-1][h{L-1}].p_mark); if (p_min == 1.0) ratelimit(); else mark/drop with probabilty p_min; I did the adaptation of Juliusz code to meet current kernel standards, and various changes to address previous comments : http://thread.gmane.org/gmane.linux.network/90225 http://thread.gmane.org/gmane.linux.network/90375 Default flow classifier is the rxhash introduced by RPS in 2.6.35, but we can use an external flow classifier if wanted. tc qdisc add dev $DEV parent 1:11 handle 11: \ est 0.5sec 2sec sfb limit 128 tc filter add dev $DEV protocol ip parent 11: handle 3 \ flow hash keys dst divisor 1024 Notes: 1) SFB default child qdisc is pfifo_fast. It can be changed by another qdisc but a child qdisc MUST not drop a packet previously queued. This is because SFB needs to handle a dequeued packet in order to maintain its virtual queue states. pfifo_head_drop or CHOKe should not be used. 2) ECN is enabled by default, unlike RED/CHOKe/GRED With help from Patrick McHardy & Andi Kleen Signed-off-by: Eric Dumazet CC: Juliusz Chroboczek CC: Stephen Hemminger CC: Patrick McHardy CC: Andi Kleen CC: John W. Linville Signed-off-by: David S. Miller commit 3c8bb7aab9ad84bce7d81878fda64d631089a88d Author: Nitin Gupta Date: Fri Feb 18 17:33:18 2011 -0500 staging: Allow sharing xvmalloc for zram and zcache Both zram and zcache use xvmalloc allocator. If xvmalloc is compiled separately for both of them, we will get linker error if they are both selected as "built-in". We can also get linker error regarding missing xvmalloc symbols if zram is not built. So, we now compile xvmalloc separately and export its symbols which are then used by both of zram and zcache. Signed-off-by: Nitin Gupta Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 5caf8fca2da11e368a2284f4c4f5c2cbbe1b3ec8 Author: Vipin Mehta Date: Sun Feb 20 07:00:38 2011 -0800 staging: ath6kl: Eliminate cfg80211 warnings Cancel the pending scan operation once the interface is going down to avoid warnings from the cfg80211 module. Once the interface is down, cfg80211 checks for any pending scan requests and dumps a warning if it finds one. It expects the driver to abort any ongoing scan operation once the driver detects that the interface is going down. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 5b6567ee84d6e8f7015eaa7d7c4926b4fd81746e Author: Dan Carpenter Date: Sun Feb 20 15:49:53 2011 +0300 staging: ath6kl: buffer overflow in SEND_FRAME ioctl We should check that optTxFrmCmd.optIEDataLen isn't too large before we copy it into the data buffer. Signed-off-by: Dan Carpenter Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit ddb7d5d80edb58e8235f1bc6c350eac40bfe85d1 Author: Stephen Warren Date: Wed Feb 23 11:58:50 2011 -0700 ARM: Tegra: Rename clk_dev1/2 to cdev1/2 The ASoC machine driver was written assuming my previous patch to add complete support for these clocks, which named them cdev1/2. Rename the clocks to match that, to avoid churn in the ASoC driver. This rename also makes the clocks more consistent with other Tegra clocks irrespective of any of that. Signed-off-by: Stephen Warren Signed-off-by: Colin Cross commit 3c106bf5b3e59e1fc8e0dfcd7a620cfed7a98430 Author: Stephen Warren Date: Wed Feb 23 11:58:49 2011 -0700 ARM: Tegra: Rename I2S clocks to match driver name The driver is tegra-i2s not just i2s. Rename the clocks to match, so that clk_get_sys can look up by driver name. Signed-off-by: Stephen Warren Signed-off-by: Colin Cross commit dc54c23bb0e29de1bcaa40dbeffbc6cac641fb22 Author: Stephen Warren Date: Wed Feb 23 10:41:29 2011 -0700 ARM: Tegra: Make tegra_dma_init a postcore_initcall The following commit makes the Tegra APB DMA engine fail to initialize correctly: 0cf6230af909a86f81907455eca2a5c9b8f68fe6 ARM: tegra: Move tegra_common_init to tegra_init_early The reason is that tegra_init_early_ calls tegra_dma_init which calls request_threaded_irq, which fails since the IRQ hasn't yet been marked valid; that only happens in tegra_init_irq, which gets called after tegra_init_early. This used to work OK, since tegra_init_early was tegra_common_init, which got called after tegra_init_irq, basically from the beginning of tegra_harmony_init. Solve this by converting tegra_dma_init to a postcore_initcall. This makes it execute late enough that IRQs are marked valid, and avoids having to add it back to every machine's init function. Signed-off-by: Stephen Warren Signed-off-by: Colin Cross commit 253804a25b45aad7bf4f63483f7c7b1d14ab49e2 Author: Dan Carpenter Date: Sun Feb 20 15:49:08 2011 +0300 staging: ath6kl: cleanup in SEND_FRAME ioctl The original code was written in a funny way where every statement was part of else if blocks. I broke them up into separate statements by adding breaks on failure conditions. Signed-off-by: Dan Carpenter Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 108160db3fb0479edf89d1b74b267360d8a5fa65 Author: Luis R. Rodriguez Date: Sun Feb 20 21:11:41 2011 -0800 staging: ath6kl: update TODO file / maintainers This updates the TODO file to reflect new changes on development. Cc: Joe Perches Cc: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 48e5114d6f4cade466b127c6aad09769a574b557 Merge: 3837686 d9a51fe Author: Colin Cross Date: Wed Feb 23 13:58:00 2011 -0800 Merge branch 'boards-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra-2.6 into for-next commit 5352161fc449d7a7573b2e13bd02162aae7aeb69 Author: Greg Kroah-Hartman Date: Wed Feb 23 13:50:42 2011 -0800 Staging: gma500: fix up trailing whitespace errors Lots of little ones all through the driver, mostly all in a cut-and-paste header comment. Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8997fd21bb47a27661429be52707331cd8b2351d Author: Greg Kroah-Hartman Date: Wed Feb 23 13:47:57 2011 -0800 Staging: gma500: remove psb_gfx.mod.c The mod.c file should not be part of the repo. Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1adace9bb04a5f4a4dea9e642089102661bb0ceb Author: Mimi Zohar Date: Tue Feb 22 10:19:43 2011 -0500 ima: remove unnecessary call to ima_must_measure The original ima_must_measure() function based its results on cached iint information, which required an iint be allocated for all files. Currently, an iint is allocated only for files in policy. As a result, for those files in policy, ima_must_measure() is now called twice: once to determine if the inode is in the measurement policy and, the second time, to determine if it needs to be measured/re-measured. The second call to ima_must_measure() unnecessarily checks to see if the file is in policy. As we already know the file is in policy, this patch removes the second unnecessary call to ima_must_measure(), removes the vestige iint parameter, and just checks the iint directly to determine if the inode has been measured or needs to be measured/re-measured. Signed-off-by: Mimi Zohar Acked-by: Eric Paris commit 0867b42113ec4eb8646eb361b15cbcfb741ddf5b Author: Alan Cox Date: Tue Feb 22 14:27:58 2011 +0000 staging: gma500: Intel GMA500 staging driver This is an initial staging driver for the GMA500. It's been stripped out of the PVR drivers and crunched together from various bits of code and different kernels. Currently it's unaccelerated but still pretty snappy even compositing with the frame buffer X server. Lots of work is needed to rework the ttm and bo interfaces from being ripped out and then 2D acceleration wants putting back for framebuffer and somehow eventually via DRM. There is no support for the parts without open source userspace (video accelerators, 3D) as per kernel policy. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1472d3a87586eb7529d1d85f7c888055650b7208 Author: Larry Finger Date: Wed Feb 23 10:24:58 2011 -0600 rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig build As noted by Stephan Rothwell, an allyesconfig build fails since rtl8192cu was merged with failures such as: drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_sw_chnl': (.opd+0xf30): multiple definition of `rtl92c_phy_sw_chnl' drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0xb70): first defined here drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_h2c_cmd': (.opd+0x288): multiple definition of `rtl92c_fill_h2c_cmd' drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0x288): first defined here These are caused because the code shared between rtl8192ce and rtl8192cu is included in both drivers. This has been fixed by creating a new modue that contains the shared code. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 3bcbaf6e08d8d82cde781997bd2c56dda87049b5 Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:46 2011 +0100 rtc: cmos: Add OF bindings This allows to load the OF driver based informations from the device tree. Systems without BIOS may need to perform some initialization. PowerPC creates a PNP device from the OF information and performs this kind of initialization in their private PCI quirk. This looks more generic. This patch also avoids registering the platform RTC driver on X86 if we have a device tree blob. Otherwise we would setup the device based on the hardcoded information in arch/x86 rather than the device tree based one. [ tglx: Changed "int of_have_populated_dt()" to bool as recommended by Grant ] Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org Cc: rtc-linux@googlegroups.com Cc: Alessandro Zummo LKML-Reference: <1298405266-1624-12-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit 1fa4163bdc199a0b80f9e333d718b3f65e901593 Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:45 2011 +0100 x86: ce4100: Use OF to setup devices Use device tree information to setup IO_APIC configuration, interrupt routing, HPET and everything else which cannot be enumerated by other means. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org LKML-Reference: <1298405266-1624-11-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit bcc7c1244fcfd852b9f4590935491057e1cab9dd Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:44 2011 +0100 x86: ioapic: Add OF bindings for IO_APIC ioapic_xlate provides a translation from the information in device tree to ioapic related informations. This includes - obtaining hw irq which is the vector number "=> pin number + gsi" - obtaining type (level/edge/..) - programming this information into ioapic ioapic_add_ofnode adds an irq_domain based on informations from the device tree. This information (irq_domain) is required in order to map a device to its proper interrupt controller. [ tglx: Adapted to the io_apic changes, which let us move that whole code to devicetree.c ] Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org LKML-Reference: <1298405266-1624-10-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit 9079b35364e75ce6b968a179f861d2f819f33e61 Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:43 2011 +0100 x86: dtb: Add generic bus probe For now we probe these busses and we change this to board dependent probes once we have to. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org LKML-Reference: <1298405266-1624-9-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit 96e0a0797eba35b5420c710b928f19094b2d5c45 Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:42 2011 +0100 x86: dtb: Add support for PCI devices backed by dtb nodes x86_of_pci_init() does two things: - it provides a generic irq enable and disable function. enable queries the device tree for the interrupt information, calls ->xlate on the irq host and updates the pci->irq information for the device. - it walks through PCI bus(es) in the device tree and adds its children (device) nodes to appropriate pci_dev nodes in kernel. So the dtb node information is available at probe time of the PCI device. Adding a PCI bus based on the information in the device tree is currently not supported. Right now direct access via ioports is used. Signed-off-by: Sebastian Andrzej Siewior Tested-by: Dirk Brandewie Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org LKML-Reference: <1298405266-1624-8-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit ffb9fc68dff38f811eeb24c15aba0418b6a8ee53 Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:41 2011 +0100 x86: dtb: Add device tree support for HPET Set hpet_address based on information provied form DTB Signed-off-by: Sebastian Andrzej Siewior Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org Cc: Dirk Brandewie LKML-Reference: <1298405266-1624-7-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit 3879a6f32948330782889cebc4d74c4f2316c676 Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:40 2011 +0100 x86: dtb: Add early parsing of IO_APIC APIC and IO_APIC have to be added to the system early because native_init_IRQ() requires it. In order to obtain the address of the ioapic the device tree has to be unflattened so of_address_to_resource() works. The device tree is relocated to ensure it is always covered by the kernel mapping. That way the boot loader does not have to make any assumptions about kernel's memory layout. Signed-off-by: Sebastian Andrzej Siewior Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org Cc: Dirk Brandewie LKML-Reference: <1298405266-1624-6-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit 19c4f5f7f7e9c5db89a91627af2a426cfb5568de Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:39 2011 +0100 x86: dtb: Add irq domain abstraction The here introduced irq_domain abstraction represents a generic irq controller. It is a subset of powerpc's irq_host which is going to be renamed to irq_domain and then become generic. This implementation will be removed once it is generic. The xlate callback is resposible to parse irq informations like irq type and number and returns the hardware irq number which is reported by the hardware as active. Signed-off-by: Sebastian Andrzej Siewior Tested-by: Dirk Brandewie Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org LKML-Reference: <1298405266-1624-5-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit df2634f43f5106947f3735a0b61a6527a4b278cd Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:38 2011 +0100 x86: dtb: Add a device tree for CE4100 History: v1..v2: - dropped device_type except for cpu & pci. I have the compatible string for pci so I can drop the device_type once it is possible - I lowercased all compatible types. I will need to resend some patches which have upper case intel - The cpu had the same compatible string as the soc node. So I added to the soc node -immr for internel memory mapped registers. - I added generic names for all parts. - I reworked the i2c bars matching the way you suggested. I added a compatible node for the PCI device which only the PCI ids in its compatible string. The bars (each represents a complete i2c controller) have a "intel,ce4100-i2c-controller" compatible node. It is not used by the driver. The driver is probed via PCI ids (by the pci subsystem not OF) and matches the bar address against the ressource in the child node. Once there is a hit the node is attached. - The SPI driver is also probed via pci. However I also attached a compatible property based on PCI ids v2..v3: - intel,ce4100-immr become intel,ce4100-cp. cp stands for core peripherals. The Atom data sheet talks here about ACPI devices. Since we don't have ACPI this does not apply here. - The interrupt map is gone. There are now plenty of device nodes. - The "unit address string" got fixed, it uses not DD,V format. v3..v4: - added descriptions for compatible nodes introduced here: - intel,ce4100-ioapic - intel,ce4100-lapic - intel,ce4100-hpet - intel,ce4100 - intel,ce4100-cp - intel,ce4100-pci - added a description about I2C controller magic. - Added gpio-controller and gpio-cells property to gpio devices. Those properties are not (yet) used. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org LKML-Reference: <1298405266-1624-4-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit da6b737b9ab768dd06bb4b0395131d10e524cf83 Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:37 2011 +0100 x86: Add device tree support This patch adds minimal support for device tree on x86. The device tree blob is passed to the kernel via setup_data which requires at least boot protocol 2.09. Memory size, restricted memory regions, boot arguments are gathered the traditional way so things like cmd_line are just here to let the code compile. The current plan is use the device tree as an extension and to gather information which can not be enumerated and would have to be hardcoded otherwise. This includes things like - which devices are on this I2C/SPI bus? - how are the interrupts wired to IO APIC? - where could my hpet be? Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Acked-by: Grant Likely Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org LKML-Reference: <1298405266-1624-3-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit f1c2b357148ec27fcc6ce0992211209a0ea20d8f Author: Sebastian Andrzej Siewior Date: Tue Feb 22 21:07:36 2011 +0100 x86: e820: Remove conditional early mapping in parse_e820_ext This patch ensures that the memory passed from parse_setup_data() is large enough to cover the complete data structure. That means that the conditional mapping in parse_e820_ext() can go. While here, I also attempt not to map two pages if the address is not aligned to a page boundary. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie Cc: sodaville@linutronix.de Cc: devicetree-discuss@lists.ozlabs.org LKML-Reference: <1298405266-1624-2-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit 8c6113cd03c7e927f5ee5f6ad98e155ef2d27177 Author: Willy Tarreau Date: Sun Feb 20 11:43:36 2011 +0100 rtlwifi: Eliminate udelay calls with too large values On ARM, compilation of rtlwifi/efuse.c fails with the message: ERROR: "__bad_udelay" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined! On inspection, the faulty calls are in routine efuse_reset_loader(), a routine that is never used, and the faulty routine is deleted. Signed-off-by: Willy Tarreau Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 892c05c093858086d808aeb366b2e11106dd96c6 Author: Willy Tarreau Date: Sun Feb 20 11:43:07 2011 +0100 rtlwifi: Let rtlwifi build when PCI is not enabled On systems where PCI does not exist, a build of rtlwifi will fail. Apply the same fix in case there are systems with PCI but not USB. Signed-off-by: Willy Tarreau Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 4c0f13f3e7b8c6cbdaddc04579d05ea2bf1145a8 Author: Willy Tarreau Date: Sun Feb 20 11:35:48 2011 +0100 rtl8192cu: fix build error (vmalloc/vfree undefined) On the ARM system, a build fails due to missing include. Signed-off-by: Willy Tarreau Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 9d17e80de8b86be9a51ed5abe93e51fe22d0beb3 Author: Willy Tarreau Date: Sun Feb 20 11:35:26 2011 +0100 rtlwifi: Fix build when RTL8192CU is selected, but RTL8192CE is not The wireless Makefile does not build rtlwifi for rtl8192cu unless rtl8192ce is selected. Signed-off-by: Willy Tarreau Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 6ebacbb79d2d05978ba50a24d8cbe2a76ff2014c Author: Johannes Berg Date: Wed Feb 23 15:06:08 2011 +0100 mac80211: rename RX_FLAG_TSFT The flag isn't very descriptive -- the intention is that the driver provides a TSF timestamp at the beginning of the MPDU -- make that clearer by renaming the flag to RX_FLAG_MACTIME_MPDU. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f3e85b9edeaf8ad0446a37a40c873f3f8898c57d Author: Vivek Natarajan Date: Wed Feb 23 13:04:32 2011 +0530 mac80211: Fix a race on enabling power save. There is a race on sending a data frame before the tx completion of nullfunc frame for enabling power save. As the data quickly follows the nullfunc frame, the AP thinks that the station is out of power save and continues to send the frames. Whereas in the station, the nullfunc ack will be processed after the tx completion of data frame and mac80211 goes to powersave. Thus the power save state mismatch between the station and the AP causes some data loss and some applications fail because of that. This patch fixes this issue. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 05db8c5729fac2788f45bf327d168f2ea397f6a1 Author: RafaÅ‚ MiÅ‚ecki Date: Mon Feb 21 19:45:35 2011 +0100 b43: N-PHY: rev1: restore PHY state after RSSI operations Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit 8e60b04479ba94ce82e88804b45438533bef4ef9 Author: RafaÅ‚ MiÅ‚ecki Date: Mon Feb 21 19:45:34 2011 +0100 b43: N-PHY: rev1: enable some gain ctl workarounds Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit 9c1f992c777d350b8c3b3e5c524decc131bcda28 Author: RafaÅ‚ MiÅ‚ecki Date: Mon Feb 21 19:38:58 2011 +0100 b43: N-PHY: fix 0x2055 radio workaround condition Signed-off-by: RafaÅ‚ MiÅ‚ecki Signed-off-by: John W. Linville commit 512c044a299f133c8dc86dd5fa6378d745489286 Author: Sujith Manoharan Date: Mon Feb 21 07:50:38 2011 +0530 ath9k_htc: Fix error path in URB allocation ath9k_hif_usb_alloc_urbs() takes care of freeing all the allocated URBs for the various endpoints when an error occurs. Calling ath9k_hif_usb_dealloc_urbs() would cause a panic since the URBs have already been freed. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 3e3f1d197f5a432b961fadb35604dba92583945e Author: Sujith Manoharan Date: Mon Feb 21 07:50:30 2011 +0530 ath9k_htc: Add debug code to print endpoint mapping Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 4825f54a44fc7280bf02c6d48c83d7a3df864e17 Author: Sujith Manoharan Date: Mon Feb 21 07:50:23 2011 +0530 ath9k_htc: Fix RX filters Add ATH9K_RX_FILTER_UNCOMP_BA_BAR and ATH9K_RX_FILTER_PSPOLL when mac80211 requires it. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 88427c65f0f1c98729fd35b458ca402c36ff619d Author: Sujith Manoharan Date: Mon Feb 21 07:50:15 2011 +0530 ath9k_htc: Fix host RX initialization There is no need to set the BSSID mask or opmode when initializing RX, they would be set correctly in the HW reset routine. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 200be651f77f8407086873520436bf55a4468e26 Author: Sujith Manoharan Date: Mon Feb 21 07:50:01 2011 +0530 ath9k_htc: Fix TBTT calculation for IBSS mode The target beacon transmission time has to be synced with the HW TSF when configuring beacon timers in Adhoc mode. Failing to do this would cause erroneous beacon transmission, for example, on completion of a scan run to check for IBSS merges. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit a5fae37d118bb633708b2787e53871e38bf3b15e Author: Sujith Manoharan Date: Mon Feb 21 07:49:53 2011 +0530 ath9k_htc: Configure beacon timers in AP mode Handle multi-interface situations by checking if AP interfaces are already present. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit a236254c35f04a4d47c701ed3ec4a0b5dcb097b0 Author: Sujith Manoharan Date: Mon Feb 21 07:49:38 2011 +0530 ath9k_htc: Add ANI for AP mode The time granularity for the ANI task is different for AP and station mode. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit ffbe7c83cb4a9d05ff49cdc8e2b02b88ccbae826 Author: Sujith Manoharan Date: Mon Feb 21 07:49:31 2011 +0530 ath9k_htc: Calculate and set the HW opmode Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit da8d9d937b34cf5d82e01420d015d8ee14f76467 Author: Sujith Manoharan Date: Mon Feb 21 07:49:23 2011 +0530 ath9k_htc: Allow AP interface to be created Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 0df8359a88f40ab3b0d38156a5f41ee856178aa3 Author: Sujith Manoharan Date: Mon Feb 21 07:49:15 2011 +0530 ath9k_htc: Maintain individual counters for interfaces This is required for allowing only one IBSS interface to be configured. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 87df89579a4a3e6c767603acb762115159655745 Author: Sujith Manoharan Date: Mon Feb 21 07:49:08 2011 +0530 ath9k_htc: Protect ampdu_action with a mutex This is required when issuing commands to the firmware. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 2299423bd0e32ccef78bbf1d4075617e3fd6cfd3 Author: Sujith Manoharan Date: Mon Feb 21 07:49:00 2011 +0530 ath9k_htc: Use VIF from the packet's control data There is no need to use a locally stored reference. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 9a3d025be11a1da625f8a71636b55a3bd3718574 Author: Sujith Manoharan Date: Mon Feb 21 07:48:53 2011 +0530 ath9k_htc: Make sequence number calculation per-VIF Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 585895cdfc683a067d803fead83267cee309ffd0 Author: Sujith Manoharan Date: Mon Feb 21 07:48:46 2011 +0530 ath9k_htc: Set the BSSID mask for multiple interfaces Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 7c277349ecbd66e19fad3d949fa6ef6c131a3b62 Author: Sujith Manoharan Date: Mon Feb 21 07:48:39 2011 +0530 ath9k_htc: Remove OP_ASSOCIATED variable mac80211 stores the association state in ieee80211_bss_conf. Use this and remove the local state, which is incorrect anyway since it is stored globally and not on a per-VIF basis. Restarting ANI and reconfiguration of HW beacon timers when a scan run ends requires more work. This is handled by iterating over the active interfaces. Finally, remove the useless check for associated status in RX processing. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 9304c82d8f3b40eb31c2d04f5849fbd9802c06ef Author: Sujith Manoharan Date: Mon Feb 21 07:48:31 2011 +0530 ath9k_htc: Remove OP_PROTECT_ENABLE CTS protection can be obtained from mac80211 directly. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit cf04e77286da4e6625f66133fcab5ecda9e24159 Author: Sujith Manoharan Date: Mon Feb 21 07:48:24 2011 +0530 ath9k_htc: Remove OP_PREAMBLE_SHORT mac80211's BSS info can be used for this. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit ab77c70a15cdff106704a34254341c9a3a11dbc4 Author: Sujith Manoharan Date: Mon Feb 21 07:48:16 2011 +0530 ath9k_htc: Fix error handling in add_interface Addition of a station might fail - handle this error properly by removing the VAP on the target. Also, bail out immediately if the max. no of interfaces has been reached. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 1057b7503908e351b399caeeca38f9ef5fcc766c Author: Sujith Manoharan Date: Mon Feb 21 07:48:09 2011 +0530 ath9k_htc: Unify target capability updating Update capabilites on the target once, when start() is called, there is no need for redundant updating on adding an interface. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit a97b478c92c14255d375ed9ceb7a882083523593 Author: Sujith Manoharan Date: Mon Feb 21 07:48:00 2011 +0530 ath9k_htc: Allow upto two simultaneous interfaces Multiple interfaces can be configured if a slot is free on the target. Monitor mode also requires a slot. The maximum number of stations that can be handled in the firmware is 8, manage the station slots accordingly. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 36bcce430657e6fece0e8dd91557f35dbb69ec67 Author: Sujith Manoharan Date: Mon Feb 21 07:47:52 2011 +0530 ath9k_htc: Handle storage devices Some AR7010 based devices are recognized as storage media. Sending a CD-EJECT command to the device will 'convert' it into a WLAN device. Do this within the driver itself, removing the dependancy on an external program (usb_modeswitch). Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 85c9205c79c794a6eea0c7217db93b4c637f136e Author: Nishant Sarmukadam Date: Thu Feb 17 14:45:18 2011 -0800 mwl8k: Invert tx queues for set_hw_spec and set_edca_params mac80211 and mwl8k FW tx queue priorities map inversely to each other. Fix this. Signed-off-by: Pradeep Nemavat Signed-off-by: Lennert Buytenhek Tested-by: Pradeep Nemavat Signed-off-by: John W. Linville commit 0bf22c3751d19f9be20205c0e7112723618a4858 Author: Nishant Sarmukadam Date: Thu Feb 17 14:45:17 2011 -0800 mwl8k: Tell mac80211 we have rate adaptation in FW All mwl8k parts perform rate control in firmware. Make this known to mac80211 so that it does not launch minstrel. Also, because actual tx rate information is not available from the firmware, invalidate the rate status before returning the skb to mac80211. Signed-off-by: Nishant Sarmukadam Signed-off-by: Thomas Pedersen Signed-off-by: John W. Linville commit da62b761769f60e5d476ad882c5ba40fb5d61664 Author: Nishant Sarmukadam Date: Thu Feb 17 14:45:16 2011 -0800 mwl8k: fix rf_antenna rx argument for AP When configuring rx antennas using CMD_RF_ANTENNA, the argument input is the number of antennas to be enabled. For AP, we support 3 rx antennas and hence set the field to 3. For tx antennas, value is a bitmap, so 0x7 enables all three. Signed-off-by: Nishant Sarmukadam Signed-off-by: Pradeep Nemavat Signed-off-by: Thomas Pedersen Signed-off-by: John W. Linville commit 427749861d74bc1a6f9e5dc523cf0ea2e42e8eed Merge: 9077f218 b622d99 Author: John W. Linville Date: Wed Feb 23 16:23:00 2011 -0500 Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx commit 9077f2189e54215a690048ab14ad6f7d8b5a5af7 Merge: 320d6c1 be663ab Author: John W. Linville Date: Wed Feb 23 16:22:36 2011 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 008536e8458613ce569595e43b0e71afa8b48ae8 Author: Joe Perches Date: Sat Feb 19 15:45:29 2011 -0800 connector: Convert char *name to const char *name Allow more const declarations. Signed-off-by: Joe Perches Acked-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 31acaa50c6c61bfb486dacaa2ec62950a42de233 Author: Haiyang Zhang Date: Fri Feb 18 15:05:53 2011 -0800 staging: hv: Fix the WARN_ON condition in free_net_device() In a previous commit, 7a09876d, ASSERT was changed to WARN_ON, but the condition wasn't updated. This patch fixed this error. Signed-off-by: Haiyang Zhang Signed-off-by: K. Y. Srinivasan Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 6fbb47859faa88e7fca458497d9688e928e587e1 Author: Haiyang Zhang Date: Fri Feb 18 15:05:52 2011 -0800 staging: hv: Remove unnecessary ASSERTs in netvsc_initialize() These fields have been assigned in netvsc_drv_init() before calling netvsc_initialize(), so there is no need to check them. The ASSERTs were already commented out, and this patch removes them. Signed-off-by: Haiyang Zhang Signed-off-by: K. Y. Srinivasan Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit deb4b003eb33e63af23cd887ded04ad77ab3dcbb Author: Thomas Gleixner Date: Sun Feb 6 23:04:44 2011 +0000 tile: Select GENERIC_HARDIRQS_NO_DEPRECATED irq chip converted and proper accessor functions used. Signed-off-by: Thomas Gleixner Signed-off-by: Chris Metcalf commit 14536076dfa382a4b302709ffd3041ae10107144 Author: Thomas Gleixner Date: Sun Feb 6 23:04:42 2011 +0000 tile: Use proper accessor functions in show_interrupt() Signed-off-by: Thomas Gleixner Signed-off-by: Chris Metcalf commit f5b42c93d891cc9e6528b4e1ab11160ce670e67d Author: Thomas Gleixner Date: Sun Feb 6 23:04:40 2011 +0000 tile: Convert irq_chip to new functions Signed-off-by: Thomas Gleixner Signed-off-by: Chris Metcalf commit 342d87ef21cef81b5af973c52bc1ab4e70c8b877 Author: Peter Zijlstra Date: Tue Jan 25 18:31:12 2011 +0100 tile: Fix __pte_free_tlb Tile's __pte_free_tlb() implementation makes assumptions about the generic mmu_gather implementation, cure this ;-) Signed-off-by: Peter Zijlstra Signed-off-by: Chris Metcalf commit 7cab8713b1ed0dab08ad6458f92a40b7ff4be619 Merge: c3bbcf5 d5e1322 Author: Tony Lindgren Date: Wed Feb 23 12:06:28 2011 -0800 Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus Conflicts: arch/arm/mach-omap2/board-3430sdp.c commit c3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5 Merge: 04aa67d adc5430 e49c4d2 7715db5 c497dd5 Author: Tony Lindgren Date: Wed Feb 23 11:43:15 2011 -0800 Merge branches 'devel-cleanup', 'devel-omap4', 'devel-board' and 'devel-nand' into omap-for-linus commit cb4cfd568c1181501419b89d916e8523107c0106 Merge: 939d578 abb0052 Author: Thomas Gleixner Date: Wed Feb 23 20:00:55 2011 +0100 Merge branch 'x86/apic' into x86/platform Reason: Devicetree based ioapic setup depends on the apic changes. Signed-off-by: Thomas Gleixner commit abb0052289e58140d933b29491f59e4be0a19727 Author: Thomas Gleixner Date: Wed Feb 23 19:54:53 2011 +0100 x86: ioapic: Move trigger defines to io_apic.h Required for devicetree based io_apic configuration. Signed-off-by: Thomas Gleixner commit 710dcda64369e3f3704a0eee502ce27dbf9fedc1 Author: Thomas Gleixner Date: Wed Feb 23 17:47:41 2011 +0100 x86: ioapic: Implement and use io_apic_setup_irq_pin_once() io_apic_set_pci_routing() and mp_save_irq() check the pin_programmed bit before calling io_apic_setup_irq_pin() and set the bit when the pin was setup. Move that duplicated code into a separate function and use it. Signed-off-by: Thomas Gleixner commit 07787a85c0c664d434b522c8bdf7cdc636a16e75 Author: Santosh Shilimkar Date: Tue Feb 22 09:57:47 2011 +0100 ARM: 6753/1: omap4: Enable ARM local timers with OMAP4430 es1.0 exception On OMAP4430 ES1.0 the local timers are gated by security. Enable the CONFIG_LOCAL_TIMERS for omap2plus build and handle the OMAP4430 es1.0 exception case. This patch has dependency on the first patch in this series. ARM: smp: Select local timers vs dummy timer support runtime Signed-off-by: Santosh Shilimkar Acked-by: Tony Lindgren Signed-off-by: Russell King commit af90f10d3826525306c96d423df240210640cb72 Author: Santosh Shilimkar Date: Wed Feb 23 18:53:15 2011 +0100 ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime The current code support of dummy timers in absence of local timer is compile time. This is an attempt to convert it to runtime so that on few SOC version if the local timers aren't supported kernel can switch to dummy timers. OMAP4430 ES1.0 does suffer from this limitation. This patch should not have any functional impact on affected files. Cc: Daniel Walker Cc: Bryan Huntsman Cc: Tony Lindgren Cc: Kukjin Kim Cc: Paul Mundt Cc: Magnus Damm Cc: Colin Cross Cc: Erik Gilling Cc: Srinidhi Kasagar Cc: Linus Walleij Signed-off-by: Santosh Shilimkar Acked-by: David Brown Signed-off-by: Russell King commit 4143179218960a70d821a425e3c23ce44aa93dee Author: Lukas Czerner Date: Wed Feb 23 12:42:32 2011 -0500 ext4: check if device support discard in FITRIM ioctl For a device that does not support discard, the FITRIM ioctl returns -EOPNOTSUPP when blkdev_issue_discard() returns this error code, which is how the user is informed that the device does not support discard. If there are no suitable free extents to be trimmed, then FITRIM will return success even though the device does not support discard, which could confuse the user. So check explicitly if the device supports discard and return an error code at the beginning of the FITRIM ioctl processing. Signed-off-by: Lukas Czerner Signed-off-by: "Theodore Ts'o" commit 6d7d0ae51574943bf571d269da3243257a2d15db Author: Nicolas Pitre Date: Mon Feb 21 07:06:45 2011 +0100 ARM: 6750/1: improvements to compressed/head.S In the case of a conflict between the memory used by the compressed kernel with its decompressor code and the memory used for the decompressed kernel, we currently store the later after the former and relocate it afterwards. This would be more efficient to do this the other way around i.e. relocate the compressed data up front instead, resulting in a smaller copy. That also has the advantage of making the code smaller and more straight forward. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 425fc47adb5bb69f76285be77a09a3341a30799e Author: Will Deacon Date: Mon Feb 14 14:31:09 2011 +0100 ARM: 6668/1: ptrace: remove single-step emulation code PTRACE_SINGLESTEP is a ptrace request designed to offer single-stepping support to userspace when the underlying architecture has hardware support for this operation. On ARM, we set arch_has_single_step() to 1 and attempt to emulate hardware single-stepping by disassembling the current instruction to determine the next pc and placing a software breakpoint on that location. Unfortunately this has the following problems: 1.) Only a subset of ARMv7 instructions are supported 2.) Thumb-2 is unsupported 3.) The code is not SMP safe We could try to fix this code, but it turns out that because of the above issues it is rarely used in practice. GDB, for example, uses PTRACE_POKETEXT and PTRACE_PEEKTEXT to manage breakpoints itself and does not require any kernel assistance. This patch removes the single-step emulation code from ptrace meaning that the PTRACE_SINGLESTEP request will return -EIO on ARM. Portable code must check the return value from a ptrace call and handle the failure gracefully. Acked-by: Nicolas Pitre Signed-off-by: Will Deacon Signed-off-by: Russell King commit 5637a126482026b37d426d76e1b18f748f309aaa Author: Russell King Date: Mon Feb 14 15:55:45 2011 +0000 ARM: move L1_CACHE_SHIFT_6 to mm/Kconfig Move L1_CACHE_SHIFT related options together, rather than spreading them across two separate Kconfig files. Signed-off-by: Russell King commit b11fe38883d1de76f2f847943e085a808f83f189 Author: Nicolas Pitre Date: Sat Feb 12 22:25:27 2011 +0100 ARM: 6663/1: make Thumb2 kernel entry point more similar to the ARM one Some installers would binary patch the kernel zImage to replace the first few nops with custom instructions. This breaks the Thumb2 kernel as the mode switch is right at the beginning. Let's move it towards the end of the nop sequence instead. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 74c25beeb30fa32badf575a908902cbdef4d4eb4 Author: Russell King Date: Mon Jan 31 14:43:25 2011 +0000 ARM: vfp: improve commentry for hotplug events Improve the documentation for the VFP hotplug notifier handler, so that people better understand what's going on there and what has been done for them. Signed-off-by: Russell King commit aaa50048f6ce44af66ce0389d4cc6a8348333271 Author: Nicolas Pitre Date: Tue Jan 25 21:35:38 2011 +0100 ARM: 6639/1: allow highmem on SMP platforms without h/w TLB ops broadcast In commit e616c591405c168f6dc3dfd1221e105adfe49b8d, highmem support was deactivated for SMP platforms without hardware TLB ops broadcast because usage of kmap_high_get() requires that IRQs be disabled when kmap_lock is locked which is incompatible with the IPI mechanism used by the software TLB ops broadcast invoked through flush_all_zero_pkmaps(). The reason for kmap_high_get() is to ensure that the currently kmap'd page usage count does not decrease to zero while we're using its existing virtual mapping in an atomic context. With a VIVT cache this is essential to do due to cache coherency issues, but with a VIPT cache this is only an optimization so not to pay the price of establishing a second mapping if an existing one can be used. However, on VIPT platforms without hardware TLB maintenance we can give up on that optimization in order to be able to use highmem. From ARMv7 onwards the TLB ops are broadcasted in hardware, so let's disable ARCH_NEEDS_KMAP_HIGH_GET only when CONFIG_SMP and CONFIG_CPU_TLB_V6 are defined. Signed-off-by: Nicolas Pitre Tested-by: Saeed Bishara Signed-off-by: Russell King commit c191789c787f488fdb74de0ee55258f71a427704 Author: Russell King Date: Sun Jan 23 12:12:01 2011 +0000 ARM: irq migration: update GIC migration code This cleans up after the conversion to irq_data. Rename the function to match the method, and remove the now useless lookup of the irq descriptor which is never used. Move the bitmask calculation out of the irq_controller_lock region. Signed-off-by: Russell King commit 617912440bf20497d23d01ab58076998aced3f15 Author: Russell King Date: Sun Jan 23 12:09:36 2011 +0000 ARM: irq migration: ensure migration is handled safely Ensure appropriate locks are taken to ensure that IRQ migration off the current CPU is race-free. We may have a concurrent set_affinity via procfs running on another CPU in parallel with the IRQ migration, resulting in unpredictable results. Signed-off-by: Russell King commit 1dbfa187dad57d3e17207328ec8bd2d90b4177d2 Author: Russell King Date: Sun Jan 23 12:08:16 2011 +0000 ARM: irq migration: force migration off CPU going down The force argument to irq_set_affinity really should be 'true' as moving IRQs off a CPU which is going down isn't optional. Acked-by: Thomas Gleixner Signed-off-by: Russell King commit a9f43c113d7435441fb024d265aecacc4f623f5e Author: Colin Tuckley Date: Thu Jan 6 11:16:49 2011 +0100 ARM: 6608/1: enable bridges in pci_common_init. Add a missing call to pci_enable_bridges() so that devices behind bridges get found by the pci bus scan. Signed-off-by: Chris Partington Acked-by: Catalin Marinas Signed-off-by: Russell King commit 68e6fad488ef21335529c65ca6c88c38be50cd3a Author: Russell King Date: Tue Jan 11 19:57:14 2011 +0000 ARM: improve module relocation fixup diagnostics Current diagnostics are rather poor when things go wrong: ipv6: relocation out of range, section 2 reloc 0 sym 'snmp_mib_free' Let's include a little more information about the problem: ipv6: section 2 reloc 0 sym 'snmp_mib_free': relocation 28 out of range (0xbf0000a4 -> 0xc11b4858) so that we show exactly what the problem is - not only what type of relocation but also the offending address range too. Signed-off-by: Russell King commit a65d29225ed884456f3d34dcefd3a18df24af03b Author: Russell King Date: Sat Jan 8 16:18:51 2011 +0000 ARM: add 'uinstall' target for installing uboot kernels We have 'install' and 'zinstall' for installing Image and zImage kernels, so add 'uinstall' to complete the set. This allows developers to have a ~/bin/installkernel script which (eg) copies the kernel to the tftp server automatically once the kernel has built, resulting in a better workflow. Signed-off-by: Russell King commit 2bbd7e9b74271b2d6a14b4840fc44afbea83774d Author: Russell King Date: Sat Jan 8 12:05:09 2011 +0000 ARM: fix some sparse errors in generic ARM code arch/arm/kernel/return_address.c:37:6: warning: symbol 'return_address' was not declared. Should it be static? arch/arm/kernel/setup.c:76:14: warning: symbol 'processor_id' was not declared. Should it be static? arch/arm/kernel/traps.c:259:1: warning: symbol 'die_lock' was not declared. Should it be static? arch/arm/vfp/vfpmodule.c:156:6: warning: symbol 'vfp_raise_sigfpe' was not declared. Should it be static? Signed-off-by: Russell King commit 459c1517f9873b198af7dcded8d8cc84749bbb69 Author: Russell King Date: Sat Jan 8 11:49:20 2011 +0000 ARM: DMA: top-down allocation in DMA coherent region Achieve better usage of the DMA coherent region by doing top-down allocation rather than bottom up. If we ask for a 128kB allocation, this will be aligned to 128kB and satisfied from the very bottom address. If we then ask for a 600kB allocation, this will be aligned to 1MB, and we will have a 896kB hole. Performing top-down allocation resolves this by allocating the 128kB at the very top, and then the 600kB can come in below it without any unnecessary wastage. This problem was reported by Janusz Krzysztofik, who had 2 x 128kB + 1 x 640kB allocations which wouldn't fit into 1MB. Tested-by: Janusz Krzysztofik Signed-off-by: Russell King commit 0b75a840120b1e647e32342e9cc46631410088d5 Author: Lukas Czerner Date: Wed Feb 23 12:22:49 2011 -0500 ext4: mark file-local functions and variables as static Signed-off-by: Lukas Czerner Signed-off-by: "Theodore Ts'o" commit b77cf6a8609a8450786c572bc8af6ad068022dbe Author: Thomas Gleixner Date: Wed Feb 23 17:33:53 2011 +0100 x86: ioapic: Remove useless inlines There is no point to have irq_trigger() and irq_polarity() as wrappers around the MPBIOS_* camel case functions. Get rid of both the inlines and the ugly camel case. Signed-off-by: Thomas Gleixner commit cddb5de0531738b1adcebca8186e7078fd8c33fd Author: Tracey Dent Date: Wed Nov 24 06:56:36 2010 -0500 Readme: Add architecture Add Tilera Tile architecture to the list of the architectures that Linux at least runs on. Signed-off-by: Tracey Dent Signed-off-by: Chris Metcalf commit 41098ffe050c4befe5fc21a5cedd42ebbd6f7469 Author: Thomas Gleixner Date: Wed Feb 23 16:08:03 2011 +0100 x86: ioapic: Make a few functions static No users outside of io_apic.c. Mark bad_ioapic() __init while at it. Signed-off-by: Thomas Gleixner commit da1ad9d7b2477594e8ff43706644ba8a375ad62a Author: Thomas Gleixner Date: Wed Feb 23 14:52:16 2011 +0100 x86: ioapic: Use setup function in setup_IO_APIC_irq_extra() Another version of the same thing. Only set the pin programmed, when the setup function succeeds. Signed-off-by: Thomas Gleixner commit 2d57e37dbf648fd6547752b8954f4104a85f4b15 Author: Thomas Gleixner Date: Wed Feb 23 14:40:35 2011 +0100 x86: ioapic: Use setup function in __io_apic_setup_irqs() Replace the duplicated code. Signed-off-by: Thomas Gleixner commit e0799c04b2080e0832538a911361f962c93fb744 Author: Thomas Gleixner Date: Wed Feb 23 14:10:54 2011 +0100 x86: ioapic: Use setup function in __io_apic_set_pci_routing() The only difference here is that we did not call __add_pin_to_irq_node() for the legacy irqs, but that's not worth 30 lines of extra code. Signed-off-by: Thomas Gleixner commit f880ec78fabebc58180778d223600e9be7b48502 Author: Thomas Gleixner Date: Wed Feb 23 13:07:54 2011 +0100 x86: ioapic: Use new setup function in pre_init_apic_IRQ0() Remove the duplicated code and call the function. It does not matter whether we allocated the cfg before calling setup_local_APIC() and we can set the irq chip and handler after that as well. Signed-off-by: Thomas Gleixner commit ff973d041e5ab9ada9e49f4e93ef3a699c511463 Author: Thomas Gleixner Date: Wed Feb 23 13:00:56 2011 +0100 x86: ioapic: Add io_apic_setup_irq_pin() There are about four places in the ioapic code which do exactly the same setup sequence. Also the OF based ioapic setup needs that function to avoid putting the OF specific code into ioapic.c Signed-off-by: Thomas Gleixner commit ed972ccf434a9881a5881915ae04602af2776bad Author: Thomas Gleixner Date: Wed Feb 23 14:31:36 2011 +0100 x86: ioapic: Split out the nested loop in setup_IO_APIC_irqs() Two consecutive for(...) for(...) lines to avoid an extra indentation are just horrible to read. I had to look more than once to figure out what the code is doing. Split out the inner loop into a separate function. Signed-off-by: Thomas Gleixner commit c8d6b8fe72216ca47e399204b58c8be0448d4083 Author: Thomas Gleixner Date: Wed Feb 23 14:29:34 2011 +0100 x86: ioapic: Remove silly debug bloat in setup_IOAPIC_irqs() This is debug code and it does not matter at all whether we print each not connected pin in an extra line or try to be extra clever. Signed-off-by: Thomas Gleixner commit ba74ec7f6b2bf9e1b5d0f2c5cef08766944cb2c8 Author: Rabin Vincent Date: Wed Feb 23 04:33:17 2011 +0100 ARM: 6758/1: amba: support pm ops Support pm_ops in the AMBA bus, required to allow drivers to use runtime pm. The implementation of AMBA bus pm ops is based on the platform bus implementation. Acked-by: Rafael J. Wysocki Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 2d00880fa842e7dd34f5bb5eb3b5f8337b068be5 Author: Russell King Date: Sat Feb 19 15:55:48 2011 +0000 ARM: amba: make amba_driver id_table const Now that the bus level code deals with a const id table, we can also make the ID table in the amba_driver structure also const. Signed-off-by: Russell King commit c862aab0bc14060bfa8351ff1e93cbce9669abcf Author: Russell King Date: Sat Feb 19 15:55:26 2011 +0000 ARM: amba: make internal ID table handling const As all probe() functions now take a const pointer, we can make the bus level code deal with const pointers too. Signed-off-by: Russell King commit aa25afad2ca60d19457849ea75e9c31236f4e174 Author: Russell King Date: Sat Feb 19 15:55:00 2011 +0000 ARM: amba: make probe() functions take const id tables Make Primecell driver probe functions take a const pointer to their ID tables. Drivers should never modify their ID tables in their probe handler. Signed-off-by: Russell King commit 394d5aefcdecb51bbf7d6df757e73559c9692a08 Author: Rob Herring Date: Sat Feb 12 15:58:25 2011 +0100 ARM: 6662/1: amba: make amba_bustype non-static Export amba_bustype struct so it can be used for things like registering bus notifiers. Signed-off-by: Rob Herring Signed-off-by: Russell King commit bf0c11183fc3a2acce56d2b53f2a117322bd3c3b Author: Uwe Kleine-König Date: Fri Feb 18 21:31:41 2011 +0100 ARM: 6744/1: mxs: irq_data conversion Signed-off-by: Uwe Kleine-König Acked-by: Lennert Buytenhek Acked-by: Sascha Hauer Signed-off-by: Russell King commit 3572bea8cbc57f0bef1e0f4580c01717df7026d8 Author: Nicolas Pitre Date: Mon Feb 21 06:57:33 2011 +0100 ARM: 6748/1: ignore mdesc->boot_params if out of range The initial MMU table created in head.S contains a 1 MB mapping at the start of memory to let the early kernel boot code access the boot params specified by mdesc->boot_params. When using CONFIG_ARM_PATCH_PHYS_VIRT it is possible for the kernel to have a different idea of where the start of memory is at run time, making the compile-time determined mdesc->boot_params pointing to a memory area which is not mapped. Any access to the boot params in that case will fault and silently hang the kernel at that point. It is therefore a better idea to simply ignore mdesc->boot_params in that case and give the kernel a chance to print some diagnostic on the console later. If the bootloader provides a valid pointer in r2 to the kernel then this is used instead of mdesc->boot_params, and an explicit mapping is already created in the initial MMU table for it. It is therefore a good idea to use that facility when using a relocated kernel. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit dce72dd08c976c9e5e1367bf994b306b15ae87fe Author: Nicolas Pitre Date: Mon Feb 21 07:00:32 2011 +0100 ARM: 6749/1: fold lookup_machine_type() into setup_machine() Since commit 6fc31d54 there is no callers for lookup_machine_type() other than setup_machine(). And if the former fails it won't return, therefore the error path in the later is dead code. Let's clean things up by merging them together. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 170ae6bc24e1d7f9bd921a484ec9ea2825497970 Author: Arnaldo Carvalho de Melo Date: Wed Feb 23 11:08:59 2011 -0300 perf annotate: Show better message when no vmlinux is found In both --tui and --stdio, in 'annotate', 'top', 'report' when trying to annotate a kernel symbol having just access to a kallsyms file, that doesn't have the DWARF info needed for annotation. Suggested-by: Ingo Molnar Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit f4ee4af447b67135de7eb8a6615811c13ce938e2 Author: Daniel De Graaf Date: Wed Feb 23 08:11:36 2011 -0500 xen-gntdev: Add cast to pointer Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit 77c35acb7c81cd94c6b30a3bef488dd2d8145131 Author: Daniel De Graaf Date: Wed Feb 23 08:11:35 2011 -0500 xen-gntdev: Fix incorrect use of zero handle The handle with numeric value 0 is a valid map handle, so it cannot be used to indicate that a page has not been mapped. Use -1 instead. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit 9848caf26dafefcec7881f0e3c35fc81c454ba59 Merge: 768a06e 9826e83 Author: Ingo Molnar Date: Wed Feb 23 15:50:13 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit a7edbd5bf944c50d3d2db18b7c5b4e7b22c1a643 Author: Adrian Knoth Date: Wed Feb 23 11:43:15 2011 +0100 ALSA: hdspm - Fix lock/sync reporting on MADI and AES32 Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 4ab69a2b3b84415085d261bcf848b7a95c010c9d Author: Adrian Knoth Date: Wed Feb 23 11:43:14 2011 +0100 ALSA: hdspm - prevent reading unitialized stack memory Original patch by Dan Rosenberg under commit e68d3b316ab7b02a074edc4f770e6a746390cb7d. I'm copying his text here: The SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO ioctl in hdspm.c allow unprivileged users to read uninitialized kernel stack memory, because several fields of the hdspm_config struct declared on the stack are not altered or zeroed before being copied back to the user. This patch takes care of it. Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 7c4a95b5ec484244fc615be7b9f56c267c51ade6 Author: Adrian Knoth Date: Wed Feb 23 11:43:13 2011 +0100 ALSA: hdspm - fix sync check on AES32 Fredrik Lingvall has discovered wrong frequency and sync detection on AES32. According to him, the provided patch fixes these issues. Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit f6ea805f524207f125f1d245152a16e3a8094243 Author: Adrian Knoth Date: Wed Feb 23 11:43:12 2011 +0100 ALSA: hdspm - Remove input selector on MADIface In contrast to the RME MADI card, coax/optical selection on the MADIface is done via a physical switch located at the breakout box. Obviously, the driver cannot switch ports in software. Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 01e9607815755f748eb8722c3c3d8f308b7b4470 Author: Adrian Knoth Date: Wed Feb 23 11:43:11 2011 +0100 ALSA: hdspm - Fix DS/QS output channel mappings on RME MADI/MADIface Caused by two typos, no output channel mappings were assigned for MADI/MADIface at double/quad speed. The channel mapping is indeed identical to the single speed mapping, the cards will simply use the first N channels. Signed-off-by: Florian Faber Signed-off-by: Fredrik Lingvall Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 88fabbfcc6d347555f9be04e3fe89e7a9c9a2a2d Author: Adrian Knoth Date: Wed Feb 23 11:43:10 2011 +0100 ALSA: hdspm - Restrict channel count on RME AES/AES32 Without calling an appropriate rule, AES/AES32 cards would announce a theoretical channel count of 64 (HDSPM_MAX_CHANNELS), leading to the already known bug: [37422.640481] ------------[ cut here ]------------ [37422.640487] WARNING: at sound/pci/rme9652/hdspm.c:5449 snd_hdspm_ioctl+0x18f/0x202 [snd_hdspm]() [37422.640489] Hardware name: PRIMERGY RX100 S6 [37422.640490] BUG? (info->channel >= hdspm->max_channels_in) [37422.640492] Modules linked in: snd_hdspm snd_seq_midi ipmi_watchdog ipmi_poweroff ipmi_si ipmi_devintf ipmi_msghandler i2c_i801 e1000e snd_rawmidi power_meter [last unloaded: snd_hdspm] [37422.640501] Pid: 22231, comm: jackd Tainted: G D W 2.6.36-gentoo-r5 #5 [37422.640502] Call Trace: [37422.640508] [] warn_slowpath_common+0x80/0x98 [37422.640511] [] warn_slowpath_fmt+0x41/0x43 [37422.640514] [] ? get_parent_ip+0x11/0x42 [37422.640518] [] snd_hdspm_ioctl+0x18f/0x202 [snd_hdspm] [37422.640522] [] snd_pcm_channel_info+0x73/0x7c [37422.640525] [] snd_pcm_common_ioctl1+0x326/0xb01 [37422.640527] [] ? get_parent_ip+0x11/0x42 [37422.640531] [] ? __srcu_read_unlock+0x3b/0x59 [37422.640533] [] snd_pcm_capture_ioctl1+0x20a/0x227 [37422.640537] [] ? file_has_perm+0x90/0x9e [37422.640540] [] snd_pcm_capture_ioctl+0x2a/0x2e [37422.640543] [] do_vfs_ioctl+0x404/0x453 [37422.640546] [] sys_ioctl+0x51/0x74 [37422.640549] [] system_call_fastpath+0x16/0x1b [37422.640552] ---[ end trace 0cd919cd68118082 ]--- We already have all the right values in place, we simply have to inform the upper layers about this restriction. Note that snd_hdspm_hw_rule_rate_out_channels and snd_hdspm_hw_rule_rate_in_channels must not be called on AES32, because the channel count is always 16, no matter of the samplerate in use. Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 483cee77d2be6c22ef67ac8c6711e757d138a538 Author: Adrian Knoth Date: Wed Feb 23 11:43:09 2011 +0100 ALSA: hdspm - Fix buffer handling on RME MADI/MADIface/AES(32) Only RayDAT and AIO provide sane buffer pointers that can be used with HDSPM_BufferPositionMask, on all other cards, this would result in a wrong HW pointer leading to xruns and these messages: [260808.916788] BUG: pcmC0D0p:0, pos = 2976, buffer size = 1024, period size = 512 [260808.961124] BUG: pcmC0D0c:0, pos = 4944, buffer size = 1024, period size = 512 Signed-off-by: Adrian Knoth Signed-off-by: Takashi Iwai commit 432d2500ac11ca88532e08716813b189a27f74a9 Author: Adrian Knoth Date: Wed Feb 23 11:43:08 2011 +0100 ALSA: hpdsm - RME AES(32): Fix missing channel mappings On RME AES and AES(32), none of the required information (max_channels_in, max_channels_out, channel mappings, port names) was set, leading to the BUG below. This patch adds the missing bits, thus fixing the bug. 125.058768] ------------[ cut here ]------------ [ 125.058773] WARNING: at sound/pci/rme9652/hdspm.c:5389 snd_hdspm_ioctl+0x10c/0x1d8 [snd_hdspm]() [ 125.058775] Hardware name: PRIMERGY RX100 S6 [ 125.058777] BUG? (info->channel >= hdspm->max_channels_out) [ 125.058778] Modules linked in: ipmi_watchdog ipmi_poweroff ipmi_si ipmi_devintf ipmi_msghandler snd_hdspm power_meter e1000e snd_rawmidi i2c_i801 [ 125.058787] Pid: 3652, comm: audacity Tainted: G W 2.6.36-gentoo-r5 #5 [ 125.058788] Call Trace: [ 125.058792] [] warn_slowpath_common+0x80/0x98 [ 125.058796] [] warn_slowpath_fmt+0x41/0x43 [ 125.058800] [] snd_hdspm_ioctl+0x10c/0x1d8 [snd_hdspm] [ 125.058803] [] snd_pcm_channel_info+0x73/0x7c [ 125.058806] [] snd_pcm_common_ioctl1+0x326/0xb01 [ 125.058809] [] ? __do_fault+0x361/0x3a6 [ 125.058812] [] snd_pcm_playback_ioctl1+0x20a/0x227 [ 125.058815] [] ? file_has_perm+0x90/0x9e [ 125.058818] [] snd_pcm_playback_ioctl+0x2a/0x2e [ 125.058821] [] do_vfs_ioctl+0x404/0x453 [ 125.058824] [] sys_ioctl+0x51/0x74 [ 125.058827] [] system_call_fastpath+0x16/0x1b [ 125.058830] ---[ end trace 5bddb08e5d4cbeb1 ]--- Signed-off-by: Adrian Knoth Signed-off-by: Florian Faber Signed-off-by: Fredrik Lingvall Signed-off-by: Takashi Iwai commit 939d578ecc62b07efeb186576ab190fe0b766501 Author: Thomas Gleixner Date: Wed Feb 23 11:46:01 2011 +0100 x86: OLPC: Make OLPC=n build again Stupid me missed the functions called from setup.c. Add the stubs back for OLPC=n Signed-off-by: Thomas Gleixner commit 1444e0c9daf0d3472677efc15588b192fc2db761 Author: Henrik Kretzschmar Date: Tue Feb 22 15:38:07 2011 +0100 x86: Fix deps of X86_UP_IOAPIC Since commit 7cd92366a593246650cc7d6198e2c7d3af8c1d8a lAPIC enabled accidently the IOAPIC, which now gets fixed. Signed-off-by: Henrik Kretzschmar LKML-Reference: <1298385487-4708-5-git-send-email-henne@nachtwindheim.de> Signed-off-by: Ingo Molnar commit 7d0f1926131cf79aa5998d463bf1582156e7b41e Author: Henrik Kretzschmar Date: Tue Feb 22 15:38:06 2011 +0100 x86: Add dummy functions for compiling without IOAPIC This patch adds IOAPIC dummy functions for compilation with local APIC, but without IOAPIC. The local variable ioapic_entries in enable_IR_x2apic() does not need initialization anymore, since the dummy returns NULL. Signed-off-by: Henrik Kretzschmar LKML-Reference: <1298385487-4708-4-git-send-email-henne@nachtwindheim.de> Signed-off-by: Ingo Molnar commit 7167d08e780a722fa79ea414fc4e72bc00751392 Author: Henrik Kretzschmar Date: Tue Feb 22 15:38:05 2011 +0100 x86: Rework arch_disable_smp_support() for x86 Currently arch_disable_smp_support() on x86 disables only the support for the IOAPIC and is also compiled in if SMP-support is not. Therefore this function is renamed to disable_ioapic_support(), which meets its purpose and is only compiled in the kernel when IOAPIC support is also. A new arch_disable_smp_support() is created in smpboot.c, which calls disable_ioapic_support() and gets only compiled in the kernel when SMP support is also. Signed-off-by: Henrik Kretzschmar LKML-Reference: <1298385487-4708-3-git-send-email-henne@nachtwindheim.de> Signed-off-by: Ingo Molnar commit b6a1432da81fa387d76215108dc9f6ea6d343aed Author: Henrik Kretzschmar Date: Tue Feb 22 15:38:04 2011 +0100 x86: Add dummy mp_save_irq() This is a dummy function, used when no IOAPIC is compiled in. Signed-off-by: Henrik Kretzschmar LKML-Reference: <1298385487-4708-2-git-send-email-henne@nachtwindheim.de> Signed-off-by: Ingo Molnar commit 4e034b245133adfd006ade5d7a809c9cac4beef9 Author: Henrik Kretzschmar Date: Tue Feb 22 15:38:03 2011 +0100 x86: Move ioapic_irq_destination_types to apicdef.h This enum is used by non IOAPIC code, so apicdef.h is the best place for it. Signed-off-by: Henrik Kretzschmar LKML-Reference: <1298385487-4708-1-git-send-email-henne@nachtwindheim.de> Signed-off-by: Ingo Molnar commit 768a06e2ca49cdf72389208cfc056a36cf8bc5e3 Author: Peter Zijlstra Date: Tue Feb 22 16:52:24 2011 +0100 perf: Simplify task_clock_event_read() There is no point in us having different code paths for nmi and !nmi here, so remove the !nmi one. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Ingo Molnar commit 3f7cce3c18188a067d463749168bdda5abc5b0f7 Author: Stephane Eranian Date: Fri Feb 18 14:40:01 2011 +0200 perf_events: Fix rcu and locking issues with cgroup support This patches ensures that we do not end up calling perf_cgroup_from_task() when there is no cgroup event. This avoids potential RCU and locking issues. The change in perf_cgroup_set_timestamp() ensures we check against ctx->nr_cgroups. It also avoids calling perf_clock() tiwce in a row. It also ensures we do need to grab ctx->lock before calling the function. We drop update_cgrp_time() from task_clock_event_read() because it is not needed. This also avoids having to deal with perf_cgroup_from_task(). Thanks to Peter Zijlstra for his help on this. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4d5e76b8.815bdf0a.7ac3.774f@mx.google.com> Signed-off-by: Ingo Molnar commit 511f67a5997c4967c69a3961e2fc9f04d8d244ac Author: Mike Galbraith Date: Tue Feb 22 15:02:00 2011 +0100 sched, autogroup: Stop claiming ownership of the root task group Disown it, and only display autogroup association if one exists. Signed-off-by: Mike Galbraith Reviewed-by: Yong Zhang Signed-off-by: Peter Zijlstra LKML-Reference: <1298383320.8036.5.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 800d4d30c8f20bd728e5741a3b77c4859a613f7c Author: Yong Zhang Date: Sun Feb 20 15:08:14 2011 +0800 sched, autogroup: Stop going ahead if autogroup is disabled when autogroup is disable from the beginning, sched_autogroup_create_attach() autogroup_move_group() <== 1 sched_move_task() <== 2 task_move_group_fair() set_task_rq() task_group() autogroup_task_group() We go the whole path without doing anything useful. Then stop going further if autogroup is disabled. But there will be a race window between 1 and 2, in which sysctl_sched_autogroup_enabled is enabled. This issue will be toke by following patch. Signed-off-by: Yong Zhang Signed-off-by: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <1298185696-4403-4-git-send-email-yong.zhang0@gmail.com> Signed-off-by: Ingo Molnar commit 1747b21fecbfb63fbf6b9624e8b92707960d5a97 Author: Yong Zhang Date: Sun Feb 20 15:08:12 2011 +0800 sched, autogroup, sysctl: Use proc_dointvec_minmax() instead sched_autogroup_enabled has min/max value, proc_dointvec_minmax() is be used for this case. Signed-off-by: Yong Zhang Cc: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1298185696-4403-2-git-send-email-yong.zhang0@gmail.com> Signed-off-by: Ingo Molnar commit 866ab43efd325fae8889ea77a744d03f2b957e38 Author: Peter Zijlstra Date: Mon Feb 21 18:56:47 2011 +0100 sched: Fix the group_imb logic On a 2*6*2 machine something like: taskset -c 3-11 bash -c 'for ((i=0;i<9;i++)) do while :; do :; done & done' _should_ result in 9 busy CPUs, each running 1 task. However it didn't quite work reliably, most of the time one cpu of the second socket (6-11) would be idle and one cpu of the first socket (0-5) would have two tasks on it. The group_imb logic is supposed to deal with this and detect when a particular group is imbalanced (like in our case, 0-2 are idle but 3-5 will have 4 tasks on it). The detection phase needed a bit of a tweak as it was too weak and required more than 2 avg weight tasks difference between idle and busy cpus in the group which won't trigger for our test-case. So cure that to be one or more avg task weight difference between cpus. Once the detection phase worked, it was then defeated by the f_b_g() tests trying to avoid ping-pongs. In particular, this_load >= max_load triggered because the pulling cpu (the (first) idle cpu in on the second socket, say 6) would find this_load to be 5 and max_load to be 4 (there'd be 5 tasks running on our socket and only 4 on the other socket). Signed-off-by: Peter Zijlstra Cc: Nikhil Rao Cc: Venkatesh Pallipadi Cc: Suresh Siddha Cc: Mike Galbraith LKML-Reference: Signed-off-by: Ingo Molnar commit cc57aa8f4b3bece8c26c7929728edcc5fa6b5aed Author: Peter Zijlstra Date: Mon Feb 21 18:55:32 2011 +0100 sched: Clean up some f_b_g() comments The existing comment tends to grow state (as it already has), split it up and place it near the actual tests. Signed-off-by: Peter Zijlstra Cc: Nikhil Rao Cc: Venkatesh Pallipadi Cc: Suresh Siddha Cc: Mike Galbraith LKML-Reference: Signed-off-by: Ingo Molnar commit c186fafe9aba87c1a93df8c7120a6ae01fe435ad Author: Peter Zijlstra Date: Mon Feb 21 18:52:53 2011 +0100 sched: Clean up remnants of sd_idle With the wholesale removal of the sd_idle SMT logic we can clean up some more. Signed-off-by: Peter Zijlstra Cc: Nikhil Rao Cc: Venkatesh Pallipadi Cc: Suresh Siddha Cc: Mike Galbraith LKML-Reference: Signed-off-by: Ingo Molnar commit d927dc937910ad8c7350266cac70e42a5f0b48cf Merge: 46e49b3 f5412be Author: Ingo Molnar Date: Wed Feb 23 11:31:34 2011 +0100 Merge commit 'v2.6.38-rc6' into sched/core Merge reason: Pick up the latest fixes before queueing up new changes. Signed-off-by: Ingo Molnar commit 9826e8329bc160e4cc58b83019f3f056965e42d0 Author: Marcin Slusarz Date: Tue Feb 22 21:53:12 2011 +0100 perf lock: Document valid sort keys Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <20110222205312.GA18474@joi.lan> Signed-off-by: Marcin Slusarz Signed-off-by: Arnaldo Carvalho de Melo commit 6435a5e39d3e01a1a73a925ed53ee18619b0a368 Author: Arnaldo Carvalho de Melo Date: Wed Feb 23 07:25:02 2011 -0300 perf top browser: Adjust the browser indexes when refreshing This is not a problem when we're not at the bottom of the active symbols list, so was not noticed, but at the end of the screen it falls apart. Fix it by adjusting the ui_browser indexes according to the new number of entries in the rb_tree and by seeking from the start of the rb_tree to find the new symbol at the top of the screen. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6f644e5f97cc8dcb8dc7133562159cc20d27c38f Author: Dirk Behme Date: Tue Feb 22 14:04:19 2011 -0500 UDF: Fix compiler warning Fix compiler warning fs/udf/balloc.c: In function 'udf_bitmap_new_block': fs/udf/balloc.c:273: warning: passing argument 1 of '_find_next_bit_le' from incompatible pointer type fs/udf/balloc.c:285: warning: passing argument 1 of '_find_next_bit_le' from incompatible pointer type fs/udf/balloc.c:311: warning: passing argument 1 of '_find_next_bit_le' from incompatible pointer type fs/udf/balloc.c:325: warning: passing argument 1 of '_find_next_bit_le' from incompatible pointer type The main fix is to add a cast in ext2_find_next_bit(). As all other usage locations of udf_find_next_one_bit() directly use bh->b_data (which is a char *), the useless (char *) cast in line 311 can be removed, too. Signed-off-by: Dirk Behme Signed-off-by: George G. Davis Signed-off-by: Jan Kara commit 7e49b6f2480cb9a9e7322a91592e56a5c85361f5 Author: Jan Kara Date: Fri Oct 22 00:30:26 2010 +0200 udf: Convert UDF to new truncate calling sequence Use new truncation sequence in UDF and fix up error handling in the code. Signed-off-by: Jan Kara commit b3d41885d9cd0d9db31c8f49e362bae02c96fa3f Author: Eric Dumazet Date: Mon Feb 14 18:35:22 2011 +0100 slub: fix kmemcheck calls to match ksize() hints Recent use of ksize() in network stack (commit ca44ac38 : net: don't reallocate skb->head unless the current one hasn't the needed extra size or is shared) triggers kmemcheck warnings, because ksize() can return more space than kmemcheck is aware of. Pekka Enberg noticed SLAB+kmemcheck is doing the right thing, while SLUB +kmemcheck doesnt. Bugzilla reference #27212 Reported-by: Christian Casteyde Suggested-by: Pekka Enberg Signed-off-by: Eric Dumazet Acked-by: David S. Miller Acked-by: David Rientjes Acked-by: Christoph Lameter CC: Changli Gao CC: Andrew Morton Signed-off-by: Pekka Enberg commit c2a941fadb57d157d59eec424674bd0c3a28788c Author: Thomas Gleixner Date: Wed Feb 23 10:32:42 2011 +0100 x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection OLPC_OPENFIRMWARE_DT is just there to be selected by OLPC and selects OF_PROMTREE. So let OLPC select OF_PROMTREE and remove that extra config indirection. Fixup code and Makefile and use CONFIG_OF_PROMTREE instead. Signed-off-by: Thomas Gleixner Cc: Andres Salomon commit dc3119e700216a70e82fe07a79f1618852058354 Author: Thomas Gleixner Date: Wed Feb 23 10:08:31 2011 +0100 x86: OLPC: Cleanup config maze completely Neither CONFIG_OLPC_OPENFIRMWARE nor CONFIG_OLPC_OPENFIRMWARE_DT are really necessary. OLPC selects OLPC_OPENFIRMWARE unconditionally, so move the "select OF" part under OLPC config option and fixup the dependencies in Makefiles and code. Signed-off-by: Thomas Gleixner Cc: Andres Salomon commit fe239545a1eed57a60c5d4063f0b56f6cd1811ff Author: Thomas Gleixner Date: Wed Feb 23 10:05:53 2011 +0100 x86: OLPC: Hide OLPC_OPENFIRMWARE config switch OLPC selects OLPC_OPENFIRMWARE unconditionally. If OLPC=n then the OLPC_OPENFIRMWARE functionality is pointless. Signed-off-by: Thomas Gleixner Cc: Andres Salomon commit 540089798d2ae115fc9bff7ed3823c8c32249607 Author: Thomas Gleixner Date: Wed Feb 23 09:50:15 2011 +0100 x86: OLPC: Remove redundant !X64_64 config dependency OLPC is under if X86_32 already. Signed-off-by: Thomas Gleixner Cc: Andres Salomon commit b622d992c21a85ce590afe2c18977ed28b457e0e Author: Arik Nemtsov Date: Wed Feb 23 00:22:31 2011 +0200 wl12xx: AP-mode - management of links in PS-mode Update the PS mode of each link according to a bitmap polled from fw_status. Manually notify mac80211 about PS mode changes in connected stations. mac80211 will only be notified about PS start when the station is in PS and there is a small number of TX blocks from this link ready in HW. This is required for waking up the remote station since the TIM is updated entirely by FW. When a station enters mac80211-PS-mode, we drop all the skbs in the low-level TX queues belonging to this sta with STAT_TX_FILTERED to keep our queues clean. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 09039f42a24084c10e7761ab28ef22932c62a46f Author: Arik Nemtsov Date: Wed Feb 23 00:22:30 2011 +0200 wl12xx: AP-mode - count free FW TX blocks per link Count the number of FW TX blocks allocated per link. We add blocks to a link counter when allocated for a TX descriptor. We remove blocks according to counters in fw_status indicating the number of freed blocks in FW. These counters are polled after each IRQ. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 409622ecc2a3b618b31b1894ed6360fbdca95d62 Author: Arik Nemtsov Date: Wed Feb 23 00:22:29 2011 +0200 wl12xx: AP mode - fix bug in cleanup of wl1271_op_sta_add() Remove an active hlid when chip wakeup fails. In addition rename the involved functions. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit ba7c082a139178da239a65e6e6cc6bd1c8515d97 Author: Arik Nemtsov Date: Wed Feb 23 00:22:28 2011 +0200 wl12xx: AP-mode - support HW based link PS monitoring When operating in AP mode the wl1271 hardware filters out null-data packets as well as management packets. This makes it impossible for mac80211 to monitor the PS mode by using the PM bit of incoming frames. Disable mac80211 automatic link PS-mode handling by supporting IEEE80211_HW_AP_LINK_PS in HW flags. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 1d36cd892c130a5a781acb282e083b94127f1c50 Author: Arik Nemtsov Date: Wed Feb 23 00:22:27 2011 +0200 wl12xx: report invalid TX rate when returning non-TX-ed skbs Report a TX rate idx of -1 and count 0 when returning untransmitted skbs to mac80211 using ieee80211_tx_status(). Otherwise mac80211 tries to use the returned (essentially garbage) status. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit a8c0ddb5ba2889e1e11a033ccbadfc600f236a91 Author: Arik Nemtsov Date: Wed Feb 23 00:22:26 2011 +0200 wl12xx: AP-mode - TX queue per link in AC When operating in AP-mode we require a per link tx-queue. This allows us to implement HW assisted PS mode for links, as well as regulate per-link FW TX blocks consumption. Split each link into ACs to support future QoS for AP-mode. AC queues are emptied in priority and per-link queues are scheduled in a simple round-robin fashion. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 99a2775d02a7accf4cc661a65c76fd7b379d1c7a Author: Arik Nemtsov Date: Wed Feb 23 00:22:25 2011 +0200 wl12xx: AP-mode - fix race condition on sta connection If a sta starts transmitting immediately after authentication, sometimes the FW deauthenticates it. Fix this by marking the sta "in-connection" in FW before sending the autentication response. The "in-connection" entry is automatically removed when connection succeeds or after a timeout. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit f4d08ddd3e60c79a141be36a5f3a7294c619291d Author: Arik Nemtsov Date: Wed Feb 23 00:22:24 2011 +0200 wl12xx: fix potential race condition with TX queue watermark Check the conditions for the high/low TX queue watermarks when the spin-lock is taken. This prevents race conditions as tx_queue_count and the flag checked are only modified when the spin-lock is taken. The following race was in mind: - Queues are almost full and wl1271_op_tx() will stop the queues, but it doesn't get the spin-lock yet. - (on another CPU) tx_work_locked() dequeues 15 skbs from this queue and tx_queue_count is updated to reflect this - wl1271_op_tx() does not check tx_queue_count after taking the spin-lock and incorrectly stops the queue. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 6dc9fb3c78a78982f6418b6cf457140f7afa658d Author: Eliad Peller Date: Wed Feb 23 00:27:07 2011 +0200 wl12xx: always set mac_address when configuring ht caps The mac_address should be set also when ht caps are disabled. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 02ad2d9080266e6d999c00b78610ef6a45be45ea Author: Eliad Peller Date: Wed Feb 23 00:27:06 2011 +0200 wl12xx: use standard ALIGN() macro Use the standard ALIGN() macro instead of redefining similar macros. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902 Merge: 695884f f5412be Author: Thomas Gleixner Date: Wed Feb 23 09:21:41 2011 +0100 Merge branch 'linus' into x86/platform Reason: Import mainline device tree changes on which further patches depend on or conflict. Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c Signed-off-by: Thomas Gleixner commit d5e13227c32f12de3afb2e26a86bc9f3e5aaf7b6 Author: Senthilvadivu Guruswamy Date: Tue Feb 22 11:24:50 2011 +0200 OMAP2, 3: DSS2: board files: replace platform_device_register with omap_display_init() This patch updated board files to replace platform_device_register or platform_add_devices of DSS with omap_display_init(). This moves away registration of DSS from board files into a common place. Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Sumit Semwal Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Tomi Valkeinen commit b7ee79abcc1bd549eadf5a9852657058e6ecca47 Author: Sumit Semwal Date: Mon Jan 24 06:21:54 2011 +0000 OMAP2, 3: DSS2: Create new file display.c for central dss driver registration. A new file display.c is introduced for display driver init, which adds a function omap_display_init to do the DSS driver registration. This is the first step in moving away registration of DSS from board files into a common place. Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit 1dde9732d543f30d4297e8b74329c5ce797b5d16 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:21:53 2011 +0000 OMAP2, 3: DSS2: Use Regulator init with driver name Use driver name in regulator inits needed for display instead of using device structure name. Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal Signed-off-by: Tomi Valkeinen commit e04d9e1e4825cb3f6cfc238d7357ef084952eab1 Author: Senthilvadivu Guruswamy Date: Mon Jan 24 06:21:51 2011 +0000 OMAP3: hwmod data: add DSS DISPC RFBI DSI VENC Hwmod needs database of all IPs in a system. This patch generates the hwmod database for Display Sub System applicable for OMAP3430 and OMAP36xx. DSS is also considered as an IP as DISPC, RFBI and named as dss_core. For all the IP modules in DSS, same clock is needed for enabling. Hwmod sees DSS IPs as independent IPs, so same clock has to be repeated for .main_clk in each IP. This patch defines separate hwmod databases for OMAP3430ES1 and (OMAP3430ES2 and OMAP36xx) as OMAP3430ES1 does not have IDLEST bit to poll on for dss IP, and also the firewall regions are different between 3430es1 and later. Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Sumit Semwal Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Tomi Valkeinen commit de56dbb6c1f8de1f54b09111eb50d8f9b8b073b2 Author: Senthilvadivu Guruswamy Date: Tue Feb 22 09:51:15 2011 +0200 OMAP2430: hwmod data: add DSS DISPC RFBI VENC Hwmod needs database of all IPs in a system. This patch generates the hwmod database for OMAP2430 Display Sub System. Since DSS is also considered as an IP as DISPC, RFBI, name it as dss_core. Acked-by: Benoit Cousson Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Sumit Semwal Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Tomi Valkeinen commit 996746ca127d722c279325552cdcc48b20079a61 Author: Senthilvadivu Guruswamy Date: Tue Feb 22 09:50:36 2011 +0200 OMAP2420: hwmod data: add DSS DISPC RFBI VENC Hwmod needs database of all IPs in a system. This patch generates the hwmod database for OMAP2420 Display Sub System,. Since DSS is also considered as an IP as DISPC, RFBI, name it as dss_core. Acked-by: Benoit Cousson Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Sumit Semwal Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Tomi Valkeinen commit a2c06ee2fe5b48a71e697bae00c6e7195fc016b6 Author: Dave Airlie Date: Wed Feb 23 14:24:01 2011 +1000 Revert "ttm: Include the 'struct dev' when using the DMA API." This reverts commit 5a893fc28f0393adb7c885a871b8c59e623fd528. This causes a use after free in the ttm free alloc pages path, when it tries to get the be after the be has been destroyed. Signed-off-by: Dave Airlie commit dee9f4bceb5fd9dbfcc1567148fccdbf16d6a38a Author: David S. Miller Date: Tue Feb 22 18:44:31 2011 -0800 net: Make flow cache paths use a const struct flowi. Signed-off-by: David S. Miller commit 4ca2e685114c55e6777022a46849795d2aa1d31a Author: David S. Miller Date: Tue Feb 22 18:38:51 2011 -0800 xfrm: Mark flowi arg to xfrm_resolve_and_create_bundle() const. Signed-off-by: David S. Miller commit 3f0e18fb0e33784525322e51cbfa10369cebd912 Author: David S. Miller Date: Tue Feb 22 18:38:14 2011 -0800 xfrm: Mark flowi arg to xfrm_dst_{alloc_copy,update_origin}() const. Signed-off-by: David S. Miller commit 98313adaac2bdaeab0b60fb3c6bfc94dd6704d6f Author: David S. Miller Date: Tue Feb 22 18:36:50 2011 -0800 xfrm: Mark flowi arg to xfrm_bundle_create() const. Signed-off-by: David S. Miller commit a6c2e611152fcdc67047aaa56b75b9cfc592ce71 Author: David S. Miller Date: Tue Feb 22 18:35:39 2011 -0800 xfrm: Mark flowi arg to xfrm_tmpl_resolve{,_one}() const. Signed-off-by: David S. Miller commit 73ff93cd0249e822c4fee367e1fd4ad4a45a5515 Author: David S. Miller Date: Tue Feb 22 18:33:42 2011 -0800 xfrm: Mark flowi arg to xfrm_expand_policies() const. Signed-off-by: David S. Miller commit 20ad9ea9becd34a3c16252ca9d815f2c74f8f30f Author: Christoph Hellwig Date: Sun Feb 13 12:06:34 2011 +0000 xfs: enable delaylog by default Signed-off-by: Christoph Hellwig Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit ec3ba85f4083d10e32fe58b46db02d78ef71f6b8 Author: Christoph Hellwig Date: Sun Feb 13 13:26:42 2011 +0000 xfs: more sensible inode refcounting for ialloc Currently we return iodes from xfs_ialloc with just a single reference held. But we need two references, as one is dropped during transaction commit and the second needs to be transfered to the VFS. Change xfs_ialloc to use xfs_iget plus xfs_trans_ijoin_ref to grab two references to the inode, and remove the now superflous IHOLD calls from all callers. This also greatly simplifies the error handling in xfs_create and also allow to remove xfs_trans_iget as no other callers are left. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 062cdb43b8a8de888a6e2abd31228163cc5d8ee1 Author: David S. Miller Date: Tue Feb 22 18:31:08 2011 -0800 xfrm: Mark flowi arg to xfrm_policy_{lookup_by_type,match}() const. Signed-off-by: David S. Miller commit 1050c71e2925ab0cb025e4c89e08b15529a1ee36 Author: Christoph Hellwig Date: Sun Feb 13 13:25:31 2011 +0000 xfs: stop using xfs_trans_iget in the RT allocator During mount we establish references to the RT inodes, which we keep for the lifetime of the filesystem. Instead of using xfs_trans_iget to grab additional references when adding RT inodes to transactions use the combination of xfs_ilock and xfs_trans_ijoin_ref, which archives the same end result with less overhead. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 47209abd7925acb3f61ae59884247b612b8904c8 Author: David S. Miller Date: Tue Feb 22 18:29:20 2011 -0800 xfrm: Kill strict arg to xfrm_bundle_ok(). Always set to "0". Signed-off-by: David S. Miller commit 0730b9a1504cb76f80c97d90ff82f8daeb1243a3 Author: David S. Miller Date: Tue Feb 22 18:27:22 2011 -0800 net: Mark flowi arg to flow_cache_uli_match() const. Signed-off-by: David S. Miller commit b520e9f616f4f29c8d2557ba704b74ce6d79ff07 Author: David S. Miller Date: Tue Feb 22 18:24:19 2011 -0800 xfrm: Mark flowi arg to xfrm_state_find() const. Signed-off-by: David S. Miller commit 1a898592b2bde7b109e121ccb7498d40396fb5c7 Author: David S. Miller Date: Tue Feb 22 18:22:34 2011 -0800 xfrm: Mark flowi arg to xfrm_init_tempstate() const. Signed-off-by: David S. Miller commit 4a08ab0fe424925352729f1c99b39b1ed876fb14 Author: David S. Miller Date: Tue Feb 22 18:21:31 2011 -0800 xfrm: Mark flowi arg to xfrm_state_look_at() const. Signed-off-by: David S. Miller commit e33f770426674a565a188042caf3f974f8b3722d Author: David S. Miller Date: Tue Feb 22 18:13:15 2011 -0800 xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const. Signed-off-by: David S. Miller commit e1ad2ab2cf0cabcd81861e2c61870fc27bb27ded Author: David S. Miller Date: Tue Feb 22 18:07:39 2011 -0800 xfrm: Mark flowi arg to xfrm_selector_match() const. Signed-off-by: David S. Miller commit 63871f89d158e3f3e469dde00dd15763d474cb3c Merge: de1e7cd 4546b2c Author: Dave Airlie Date: Wed Feb 23 12:07:27 2011 +1000 Merge branch 'drm-mm-cleanup' into drm-next * drm-mm-cleanup: radeon: move blit functions to radeon_asic.h radeon: kill decls for inline functions radeon: consolidate asic-specific function decls for r600 & later drm/radeon: kill radeon_bo->gobj pointer drm/radeon: introduce gem_to_radeon_bo helper drm/radeon: embed struct drm_gem_object drm: mm: add helper to unwind scan state drm: mm: add api for embedding struct drm_mm_node drm: mm: extract node insert helper functions drm: mm: track free areas implicitly drm/nouveau: don't munge in drm_mm internals commit de1e7cd63a8ec26a3bd3740708cfd72dd76509e2 Merge: 7811bdd 5a893fc Author: Dave Airlie Date: Wed Feb 23 12:06:39 2011 +1000 Merge branch 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into drm-next * 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: ttm: Include the 'struct dev' when using the DMA API. nouveau/ttm/PCIe: Use dma_addr if TTM has set it. radeon/ttm/PCIe: Use dma_addr if TTM has set it. ttm: Expand (*populate) to support an array of DMA addresses. ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set. ttm: Introduce a placeholder for DMA (bus) addresses. commit 1744a8fe09e5db7315a57da52fa7c1afa779cfa0 Author: David S. Miller Date: Tue Feb 22 18:02:12 2011 -0800 xfrm: Mark token args to addr_match() const. Also, make it return a real bool. Signed-off-by: David S. Miller commit 8f029de281b26ec9fd5cd77294db1d35d9876f1a Author: David S. Miller Date: Tue Feb 22 17:59:59 2011 -0800 xfrm: Mark flowi arg to xfrm_type->reject() const. Signed-off-by: David S. Miller commit 73e5ebb20f2809e2eb0b904448481e010c2599d7 Author: David S. Miller Date: Tue Feb 22 17:51:44 2011 -0800 xfrm: Mark flowi arg to ->init_tempsel() const. Signed-off-by: David S. Miller commit 0c7b3eefb4ab8df245e94feb0d83c1c3450a3d87 Author: David S. Miller Date: Tue Feb 22 17:48:57 2011 -0800 xfrm: Mark flowi arg to ->fill_dst() const. Signed-off-by: David S. Miller commit 05d8402576c9c1b85bfc9e4f9d6a21c27ccbd5b1 Author: David S. Miller Date: Tue Feb 22 17:47:10 2011 -0800 xfrm: Mark flowi arg to ->get_tos() const. Signed-off-by: David S. Miller commit e8a4e37716dbc964e1cd18bca1a62fbd11805c1d Author: David S. Miller Date: Tue Feb 22 17:42:56 2011 -0800 xfrm: Mark flowi arg const in key extraction helpers. Signed-off-by: David S. Miller commit d9a51fe75da73084b6c38f7f4450ad4c1bef8224 Author: Olof Johansson Date: Sat Feb 19 17:25:32 2011 -0800 ARM: tegra: add seaboard, wario and kaen boards This adds board support for the Seaboard eval platform and some of the derivatives that are very similar. Since they only differ in some very minor ways, most of the code is shared. Signed-off-by: Olof Johansson Acked-by: Colin Cross commit 8c396604d5de26a48a390cf442dd3b04a20f13b1 Author: Olof Johansson Date: Sun Feb 20 16:20:26 2011 -0800 ARM: tegra: harmony: fix pinmux for MMC slot Turns out MMC2 (the bayonet 4-lane port) wasn't enabled in the original pinmux. Fix that. Signed-off-by: Olof Johansson Acked-by: Colin Cross commit 875d4af6a3bdf548ebf069c1f4254c6ae1edae93 Author: Olof Johansson Date: Sat Feb 19 16:39:37 2011 -0800 ARM: tegra: harmony: register sdhci devices Add the 3 sdhci devices that are available on Harmony as platform devices. Two go to slots (one 4-lane, one 8-lane), and one goes to onboard wifi. Signed-off-by: Olof Johansson Acked-by: Colin Cross commit ec243a071d32af0350449c220d1de7c437088879 Author: Olof Johansson Date: Sat Feb 19 21:01:46 2011 -0800 ARM: tegra: remove stale nvidia atag handler Remove dead atag handling code for nvidia-specific tags. Signed-off-by: Olof Johansson Acked-by: Colin Cross commit 85940b4a1761aa5ab8d0ac1557756953788af155 Author: Olof Johansson Date: Sat Feb 19 16:26:18 2011 -0800 ARM: tegra: common device resources Add a common location to register resources for used on-chip devices that are commonly configured on boards. Devices will be added to this file as more drivers are added that can make use of them. This is based on work contributed by several people, most of it from Colin Cross and Erik Gilling. Signed-off-by: Olof Johansson Acked-by: Colin Cross commit 0ec1b606c0b13f33816847507f9d72be30abacd1 Author: Olof Johansson Date: Tue Feb 22 11:29:23 2011 -0800 ARM: tegra: harmony: move over to tegra_gpio_config Move harmony over to use the new gpio config table instead of having separate settings in various parts of the code. (The tegra sdhci driver should have the tegra_gpio_* ops removed, but that will be done separately from this change.) Signed-off-by: Olof Johansson Acked-by: Erik Gilling commit 632095ea15db51d73d3d084ee18620d3ac1cb040 Author: Olof Johansson Date: Sun Feb 13 19:12:27 2011 -0800 ARM: tegra: add tegra_gpio_table and tegra_gpio_config To give one place to setup the pins that are used as GPIOs instead of as their pinmuxed functions. Specifying enabled as false explicitly disables the gpio mode of that pin (if left on by firmware). This should remove the need for calling these from specific drivers and thus reduce tegra-specific code from them. Signed-off-by: Olof Johansson Acked-by: Erik Gilling commit fec38d1752c01ad72789bac9f1a128f7e933735d Author: Tomoya MORINAGA Date: Wed Feb 23 10:03:19 2011 +0900 pch_uart: Fix DMA channel miss-setting issue. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit 60d1031e114a3e96e4420421e34ddc0dcd10cbae Author: Tomoya MORINAGA Date: Wed Feb 23 10:03:18 2011 +0900 pch_uart: fix exclusive access issue Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit 9af7155bb03675ba2d4d68428a4345e0511ce8dd Author: Tomoya MORINAGA Date: Wed Feb 23 10:03:17 2011 +0900 pch_uart: fix auto flow control miss-setting issue Currently, auto-flow control setting processing is not set correctly. This patch fixes the issue. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit aac6c0b0fd6458f166651fc102695fb8836a4d95 Author: Tomoya MORINAGA Date: Wed Feb 23 10:03:16 2011 +0900 pch_uart: fix uart clock setting issue Currently, uart clock is not set correctly. This patch fixes the issue. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit 23877fdc6df3306037d81d2ac71c2d6e26ec08f4 Author: Tomoya MORINAGA Date: Wed Feb 23 10:03:15 2011 +0900 pch_uart : Use dev_xxx not pr_xxx For easy to understad which port the message is out, replace pr_xxx with dev_xxx. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit 1822076cf324dde1eb9678ae2174dc8b4662417c Author: Tomoya MORINAGA Date: Wed Feb 23 10:03:14 2011 +0900 pch_uart : Reduce memcpy Reduce memcpy for performance improvement. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit 7e4613296576c843643ceb97091d98da1e8caab8 Author: Tomoya MORINAGA Date: Wed Feb 23 10:03:13 2011 +0900 pch_uart: add spin_lock_init Currently, spin_lock is not initialized. Thus, add spin_lock_init(). Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit da3564ee027e788a5ff8e520fb2d2b00a78b2464 Author: Tomoya MORINAGA Date: Wed Feb 23 10:03:12 2011 +0900 pch_uart: add multi-scatter processing Currently, this driver can handle only single scatterlist. Thus, it can't send data beyond FIFO size. This patch enables this driver can handle multiple scatter list. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit 7811bddb6654337fd85837ef14c1a96a0c264745 Author: Chris Wilson Date: Wed Jan 26 18:33:25 2011 +0000 drm: Remove unused members from struct drm_open_hash Signed-off-by: Chris Wilson Signed-off-by: Dave Airlie commit 4cb81ac2028a18f3f872f56fb7527afe5f5d0278 Author: Chris Wilson Date: Wed Jan 12 21:11:33 2011 +0000 drm: Trim the GEM mmap offset hashtab Using an order 19 drm_ht for the mmap offsets is a little obscene. That means that will a fully populated GTT with every single object mmaped at least once in its lifetime, there will be exactly one object in each bucket. Typically systems only have at most a few thousand objects, though you may see a KDE desktop hit 50000. And most of those should never be mapped... On my systems, just using an order 10 ht would still have an average occupancy less than 1, so apply a small safety factor and use an order 12 ht, like the other mmap offset ht. Signed-off-by: Chris Wilson Signed-off-by: Dave Airlie commit b1f559ecdc6026ef783ccadc62a61e7da906fcb4 Author: Chris Wilson Date: Wed Jan 26 09:49:47 2011 +0000 drm: Mark constant arrays of drm_display_mode const ... and fixup some methods to accept the constant argument. Now that constant module arrays are loaded into read-only memory, using const appropriately has some benefits beyond warning the programmer about likely mistakes. Signed-off-by: Chris Wilson Signed-off-by: Dave Airlie commit 60b212f8ddcdbbfa8595f40300756b9ea8dd387e Author: Dave Airlie Date: Fri Feb 18 05:51:58 2011 +0000 drm/radeon: overhaul texture checking. (v3) the texture checking code didn't work for block formats like s3tc, this overhauls it to work for all types. v2: add texture array support. v3: add subsampled formats Signed-off-by: Dave Airlie commit 4c37705877e74c02c968735c2eee0f84914cf557 Author: Greg Kroah-Hartman Date: Tue Feb 22 17:09:33 2011 -0800 tty: move obsolete and broken generic_serial drivers to drivers/staging/generic_serial/ As planned by Arnd Bergmann, this moves the following drivers to the drivers/staging/generic_serial directory where they will be removed after 2.6.41 if no one steps up to claim them. generic_serial rio ser_a2232 sx vme_scc Cc: Arnd Bergmann Cc: Alan Cox Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman commit 82ef594efb16d1747c55dc449a8eeb38ea97ef80 Author: Ben Skeggs Date: Wed Feb 2 00:27:10 2011 +0000 drm/ttm: call driver move_notify() when doing system->tt bo moves Nouveau doesn't have enough information at ttm_backend_func.bind() time to implement things like tiled GART, or to keep a buffer at a constant address in the GPU virtual address space no matter where in physical memory it's placed. To resolve this, nouveau will handle binding of all buffers to the GPU itself from the move_notify() hook. This commit ensures it's called for all buffer moves. Talked to Dave about the impact on radeon, which uses move_notify, it doesn't look like anything should break there. Signed-off-by: Ben Skeggs Reviewed-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 9da12b6aeb8bde8cc3aecba12b0ec1114d6dcfea Author: Rob Clark Date: Wed Feb 16 02:45:51 2011 +0000 drm: psuedocolor support for ARGB modes If there is an alpha channel, need to mask in 1's in the alpha channel to prevent the fb from being completely transparent. Signed-off-by: Rob Clark Signed-off-by: Dave Airlie commit a8da7fecb6010222fe495cc2b4330b99bca20c61 Author: Wolfram Sang Date: Wed Feb 16 13:39:16 2011 +0100 i2c: add driver for Freescale i.MX28 Currently only supporting the PIOQUEUE-mode, because DMA-support for this platform is not yet in mainline. When it becomes available and support has been added to this driver, it will also be suitable for i.MX23 and STMP3xxx. Signed-off-by: Wolfram Sang Cc: Ben Dooks Cc: Shawn Guo Signed-off-by: Ben Dooks commit 4a6514e6d096716fb7bedf238efaaca877e2a7e8 Author: Greg Kroah-Hartman Date: Tue Feb 22 16:57:21 2011 -0800 tty: move obsolete and broken tty drivers to drivers/staging/tty/ As planned by Arnd Bergmann, this moves the following drivers to the drivers/staging/tty/ directory where they will be removed after 2.6.41 if no one steps up to claim them. epca epca ip2 istallion riscom8 serial167 specialix stallion Cc: Arnd Bergmann Cc: Alan Cox Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman commit cc7fb05946fb1cd2fd0582f9e39f759e20dfeefa Author: Mitko Haralanov Date: Tue Feb 22 16:56:37 2011 -0800 IB/qib: Return correct MAD when setting link width to 255 Fix a bug which causes the driver to return incorrect MADs as a response to Set(PortInfo) which sets the link width to 0xFF or link speed to 0xF. Signed-off-by: Mitko Haralanov Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit db811ca0f48578f9940f49f284ac81e336b264ad Author: Colin Cross Date: Sun Feb 20 17:14:21 2011 -0800 i2c: tegra: Add i2c support Adds I2C bus driver for nVidia Tegra SoCs. Tegra includes 4 I2C controllers, one of which is inside the Dynamic Voltage Controller and has a slightly different register map. Signed-off-by: Colin Cross Signed-off-by: Ben Dooks commit 4546b2c1d6e256c716e5240f5d6198a078fd7a22 Author: Daniel Vetter Date: Fri Feb 18 17:59:21 2011 +0100 radeon: move blit functions to radeon_asic.h Reviewed-by: Alex Deucher Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 053688ce03fb3ce0648aac8c604b12552e27fdb0 Author: Daniel Vetter Date: Fri Feb 18 17:59:20 2011 +0100 radeon: kill decls for inline functions Reviewed-by: Alex Deucher Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 3574dda4851d2058841ae9e6b583e54cf52c71fa Author: Daniel Vetter Date: Fri Feb 18 17:59:19 2011 +0100 radeon: consolidate asic-specific function decls for r600 & later Now all the asic specific stuff ist mostly hid in radeon_asic.* Reviewed-by: Alex Deucher Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 31c3603d83a774df4acdfe3a89ce64719d0db0d8 Author: Daniel Vetter Date: Fri Feb 18 17:59:18 2011 +0100 drm/radeon: kill radeon_bo->gobj pointer Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 7e4d15d90afe46d34b510f3c70217d3469a7dd70 Author: Daniel Vetter Date: Fri Feb 18 17:59:17 2011 +0100 drm/radeon: introduce gem_to_radeon_bo helper ... and switch it to container_of upcasting. v2: converted new pageflip code-paths. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 441921d5309cfe098747d9840fd71bdc6ca2a93b Author: Daniel Vetter Date: Fri Feb 18 17:59:16 2011 +0100 drm/radeon: embed struct drm_gem_object Unconditionally initialize the drm gem object - it's not worth the trouble not to for the few kernel objects. This patch only changes the place of the drm gem object, access is still done via pointers. v2: Uncoditionally align the size in radeon_bo_create. At least the r600/evergreen blit code didn't to this, angering the paranoid gem code. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit ae0cec2880a4dc6d90c7f8392bdc6705988389ca Author: Daniel Vetter Date: Fri Feb 18 17:59:15 2011 +0100 drm: mm: add helper to unwind scan state With the switch to implicit free space accounting one pointer got unused when scanning. Use it to create a single-linked list to ensure correct unwinding of the scan state. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit b0b7af1884b7d807a3504804f9825d472de78708 Author: Daniel Vetter Date: Fri Feb 18 17:59:14 2011 +0100 drm: mm: add api for embedding struct drm_mm_node The old api has a two-step process: First search for a suitable free hole, then allocate from that specific hole. No user used this to do anything clever. So drop it for the embeddable variant of the drm_mm api (the old one retains this ability, for the time being). With struct drm_mm_node embedded, we cannot track allocations anymore by checking for a NULL pointer. So keep track of this and add a small helper drm_mm_node_allocated. Also add a function to move allocations between different struct drm_mm_node. v2: Implement suggestions by Chris Wilson. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 9fc935debb33d90bf302ba42f7234b78e322f195 Author: Daniel Vetter Date: Fri Feb 18 17:59:13 2011 +0100 drm: mm: extract node insert helper functions Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c Author: Daniel Vetter Date: Fri Feb 18 17:59:12 2011 +0100 drm: mm: track free areas implicitly The idea is to track free holes implicitly by marking the allocation immediatly preceeding a hole. To avoid an ugly corner case add a dummy head_node to struct drm_mm to track the hole that spans to complete allocation area when the memory manager is empty. To guarantee that there's always a preceeding/following node (that might be marked as hole_follows == 1), move the mm->node_list list_head to the head_node. The main allocator and fair-lru scan code actually becomes simpler. Only the debug code slightly suffers because free areas are no longer explicit. Also add drm_mm_for_each_node (which will be much more useful when struct drm_mm_node is embeddable). Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit 282361a046edd9d58a134f358a3f65a7cb8655d9 Author: Greg Kroah-Hartman Date: Tue Feb 22 16:23:22 2011 -0800 tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/ As planned by Arnd Bergmann, this moves the ipwireless driver to the drivers/tty/ directory as that's where it really belongs. Cc: Arnd Bergmann Cc: Alan Cox Cc: Jiri Slaby Cc: David Sterba Signed-off-by: Greg Kroah-Hartman commit 31a5b8ce8f3bf20799eb68da9602de2bee58fdd3 Author: Daniel Vetter Date: Fri Feb 18 17:59:11 2011 +0100 drm/nouveau: don't munge in drm_mm internals Nouveau was checking drm_mm internals on teardown to see whether the memory manager was initialized. Hide these internals in a small inline helper function. Acked-by: Ben Skeggs Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit a6afd9f3e819de4795fcd356e5bfad446e4323f2 Author: Greg Kroah-Hartman Date: Tue Feb 22 16:14:56 2011 -0800 tty: move a number of tty drivers from drivers/char/ to drivers/tty/ As planned by Arnd Bergmann, this moves the following drivers from drivers/char/ to drivers/tty/ as that's where they really belong: amiserial nozomi synclink rocket cyclades moxa mxser isicom bfin_jtag_comm Cc: Arnd Bergmann Cc: Alan Cox Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman commit 44ed76b78e158d852f640d533b7acc08b91f2132 Author: Tobias Klauser Date: Fri Feb 18 16:38:40 2011 +0100 tty: serial: altera_jtaguart: Fixup type usage of port flags port->flags is of type upf_t, which corresponds to UPF_* flags. Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 72af4762ee640b717a30761e27fc55126c686568 Author: Tobias Klauser Date: Fri Feb 18 16:38:39 2011 +0100 tty: serial: altera_jtaguart: Support getting mapbase and IRQ from resources This will make it easier to get the driver to support device tree. The old platform data method is still supported though. Also change the driver to use only one platform device per port. Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 3231f075070ac61ab7174a9a82bdc6d7b1de10bb Author: Tobias Klauser Date: Fri Feb 18 16:38:38 2011 +0100 tty: serial: altera_jtaguart: Remove unused function early_altera_jtaguart_setup This is not even used in nios2 arch code anymore. Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 2314a0f667352748a48753bf903f8c50fd2a756d Author: Tobias Klauser Date: Fri Feb 18 16:38:37 2011 +0100 tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer This fixes a sparse warning. Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit f023eab379821365bf265a0240f30c00cecaef7c Author: Feng Tang Date: Tue Feb 22 15:28:12 2011 +0800 serial: mfd: add a module parameter for setting each port's working mode The three identical uart ports can work either in DMA or PIO mode. Adding such a module parameter "hsu_dma_enable" will enable user to chose working modes for each port. If the mfd driver is built in kernel, adding a "mfd.hsu_dma_enable=x" in kernel command line has the same effect. Signed-off-by: Feng Tang Signed-off-by: Greg Kroah-Hartman commit 085a4f758f0cf95e1865b63892bf4304a149f0ca Author: Feng Tang Date: Tue Feb 22 15:28:10 2011 +0800 serial: mfd: remove the TX full-empty interrupts workaround In A0 stepping, TX half-empty interrupt is not working, so have to use the full-empty interrupts whose performance will be 15% lower. Now re-enable the half-empty interrrupt after it is enabled in silicon. Signed-off-by: Feng Tang Signed-off-by: Greg Kroah-Hartman commit 10e82f6ce76351425644bccc56f8e2c2ad596ce6 Author: Luck, Tony Date: Tue Feb 22 11:47:04 2011 -0800 tty: simserial: now phase out the ioctl file pointer for good Alan missed the ia64 simulator serial driver (because it was hidden in arch/... rather than located under drivers/... where one might expect to find a driver). Drop the "file *" argument from rs_ioctl() in arch/ia64/hp/sim/simserial.c Signed-off-by: Tony Luck Cc: Alan Cox , Signed-off-by: Greg Kroah-Hartman commit bdcffc5a1a28b566a38a4b0d5bcefc78a97f4ecb Author: Greg Kroah-Hartman Date: Tue Feb 22 15:41:47 2011 -0800 tty: move Kconfig entries into drivers/tty from drivers/char The Kconfig options for the drivers/tty/ files still were hanging around in the "big" drivers/char/Kconfig file, so move them to the proper location under drivers/tty and drivers/tty/hvc/ Signed-off-by: Greg Kroah-Hartman commit 38376866a1fe5b1e6d9510ec4913c2b461f456f3 Author: Mark Brown Date: Tue Feb 22 20:35:24 2011 +0000 ARM: tegra: Hide EMC scaling config behind ARCH_TEGRA The option isn't terribly useful on other ARM platforms. Signed-off-by: Mark Brown Acked-by: Olof Johansson Signed-off-by: Colin Cross commit e19e881fcbd08bac0e6c9187ade8e3802d8334df Author: Stephen Warren Date: Sat Feb 19 20:38:54 2011 -0700 ARM: tegra: Fix typo in TEGRA_IRQ_TO_GPIO Signed-off-by: Stephen Warren Signed-off-by: Colin Cross commit cd51d0edecc37f1061a5091450e6c7e2a8a16d68 Author: Colin Cross Date: Mon Feb 21 17:05:36 2011 -0800 ARM: tegra: common: Enable core clocks Enable the cpu, emc (memory controller) and csite (debug and trace controller) clocks during init to prevent them from being disabled by the bootloader clock disabling code. Signed-off-by: Colin Cross Acked-by: Olof Johansson commit 62248ae826f51ac2e3d3902c0a657043d95b731c Author: Colin Cross Date: Mon Feb 21 17:04:37 2011 -0800 ARM: tegra: timer: Enable timer and rtc clocks Enable the timer and rtc clocks to prevent them being turned off by the bootloader clock disabling code. Signed-off-by: Colin Cross Acked-by: Olof Johansson commit c43766707ce26947934ae6bc4497ca5c16bc344f Author: Linus Walleij Date: Wed Feb 16 09:40:26 2011 +0100 spi/pl022: rid dangling labels Remove a compilation error regarding unused labels that came about when simplifying the DMA code. Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit 5c05dd0750402f174302cf2b8cdf4111be080dcb Author: Yoshihiro Shimoda Date: Tue Feb 15 10:30:32 2011 +0900 spi: add support for SuperH SPI The SH7757 has SPI0 module. This patch supports it. Signed-off-by: Yoshihiro Shimoda [grant.likely@secretlab.ca: fixed Makefile ordering, added __dev{init,exit} annotations, removed DRIVER_VERSION (this is mainline, the version == the kernel version) and tidied some indentation & style stuff] Signed-off-by: Grant Likely commit 0ff56cd85a2c5104a36d84662b9180c219e8604e Author: Thomas Gleixner Date: Mon Feb 14 18:08:51 2011 +0100 gpio/sx150x: Do not access I2C from mask/unmask functions irq_chip->irq_mask/unmask are called with interrupts disabled and irq_desc->lock held. So we cannot access i2c from this context. That's what irq_bus_sync_unlock() is for. Store the masked information in the chip data structure and update the i2c bus from the irq_bus_sync_unlock() callback. This does not need a while(pending) loop because the update to this is always serialized via the bus lock, so we never have more than one pin update pending. Signed-off-by: Thomas Gleixner Cc: Andrew Morton Cc: Gregory Bean Cc: Jean Delvare Cc: Lennert Buytenhek Signed-off-by: Grant Likely commit 0b782531c038d4a4bded3fc1069c961b1f14f0de Author: Thomas Chou Date: Mon Feb 14 10:10:43 2011 +0800 spi: New driver for Altera SPI This patch adds a new SPI driver to support the Altera SOPC Builder SPI component. It uses the bitbanging library. Signed-off-by: Thomas Chou Signed-off-by: Grant Likely commit ce792580ea2ce6f7259b45124e9ccc4574c31606 Author: Thomas Chou Date: Mon Feb 14 10:20:39 2011 +0800 spi: add OpenCores tiny SPI driver This patch adds support of OpenCores tiny SPI driver. http://opencores.org/project,tiny_spi Signed-off-by: Thomas Chou Signed-off-by: Grant Likely commit 9bde36afcaf0ec2ad9f03974da41875c759a4fe8 Merge: f020c39 c9e358d Author: Grant Likely Date: Tue Feb 22 14:56:50 2011 -0700 Merge branch 'devicetree/next' into spi/next To pick up removal of #ifdef around .of_match_table commit fd4afaf33313d94f548cb09129ecba3dbab62931 Author: Jan Beulich Date: Thu Feb 17 13:39:05 2011 +0000 genirq: Streamline kernel/irq/Kconfig "def_bool n" without prompt is pointless, these should be just "bool". [ tglx: Adapted to latest changes ] Signed-off-by: Jan Beulich LKML-Reference: <4D5D3309020000780003264A@vpn.id2.novell.com> Signed-off-by: Thomas Gleixner commit dbebbfbb1605f0179e7c0d900d941cc9c45de569 Author: Thomas Gleixner Date: Tue Feb 22 21:46:25 2011 +0100 rtmutex: tester: Remove the remaining BKL leftovers We just leave the numbers assinged as commemoration and in case that someone was crazy enough to reimplement the test stuff out of tree. Signed-off-by: Thomas Gleixner commit 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce Merge: db62983 320d6c1 Author: John W. Linville Date: Tue Feb 22 15:10:22 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 0cf6230af909a86f81907455eca2a5c9b8f68fe6 Author: Colin Cross Date: Mon Feb 21 17:10:14 2011 -0800 ARM: tegra: Move tegra_common_init to tegra_init_early Move tegra_common_init to tegra_init_early, and set it as the init_early entry in the machine struct. Initializes the clocks earlier so that timers can enable their clocks. Also reorders the members in the Harmony and Trimslice boards' machine structs to match the order they are called in. Signed-off-by: Colin Cross Acked-by: Olof Johansson commit 1be3d0537516fa42825406b4bc1291b77ed62614 Author: Colin Cross Date: Mon Feb 21 16:44:07 2011 -0800 ARM: tegra: clock: prevent accidental disables of cpu clock Peripheral clocks that have no clock enable bit in the enable registers have their clk_num set to 0. Bit 0 in the clock enable registers is the CPU clock. Prevent disables on these peripheral clocks from accidentally disabling the CPU clock. Signed-off-by: Colin Cross Acked-by: Olof Johansson commit 421186e71000c067c2687baeffde62954a80cdcc Author: Colin Cross Date: Sat Feb 12 18:21:47 2011 -0800 ARM: tegra: clock: Round rate before setting rate Call the clock's round_rate op, if it exists, before calling the set_rate op. This will help later when dvfs is added, dvfs needs to know what the final rate will be before the frequency changes. Also requires fixes to the round rate functions to ensure calling round rate and then set rate will not cause the frequency to be rounded down twice. When picking clock divider values, the clock framework picks the closest frequency that is lower than the requested frequency. If the new frequency calculated from the divider value is rounded down, and then passed to set_rate, it will get rounded down again, possibly resulting in a frequency two steps lower than the original requested frequency. Fix the problem by rounding up when calculating the frequency coming out of a clock divider, so if that frequency is requested again, the same divider value will be picked. Signed-off-by: Colin Cross Acked-by: Olof Johansson commit 86fce3ba1e731cf6d97a4157a192ffa60dc7ec0b Author: stephen hemminger Date: Sun Feb 20 16:14:23 2011 +0000 cls_u32: fix sparse warnings The variable _data is used in asm-generic to define sections which causes sparse warnings, so just rename the variable. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 78f379b574dcbe656fa21ea72e95f8dff232e233 Author: Colin Cross Date: Wed Oct 20 19:19:58 2010 -0700 ARM: tegra: clock: Refcount periph clock enables Some peripheral clocks share enable bits. Refcount the enables so that calling clk_disable on one clock will not turn off another clock. Signed-off-by: Colin Cross Acked-by: Olof Johansson commit db62983a1e4b2af9e79c97af768f0c8b80bd93f0 Merge: 9e1453c f6d7f2c Author: David S. Miller Date: Tue Feb 22 11:15:29 2011 -0800 Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6 commit 04aa67dec63b61c1a8b9b6d001262250f1a92130 Merge: 3b03b58 18a2689 Author: Tony Lindgren Date: Tue Feb 22 10:54:12 2011 -0800 Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus Conflicts: arch/arm/mach-omap2/omap_hwmod_2430_data.c arch/arm/mach-omap2/omap_hwmod_3xxx_data.c commit 864c4bd2487619564acd75fdcf1a4349992e9090 Author: Mark Brown Date: Mon Feb 21 20:51:13 2011 -0800 ASoC: Simplify default WM8958 jack detection code The default WM8958 jack detection handler implements a full set of buttons and also support for video detection. Support for multi-button jacks is fairly system specific and will usually require some tuning for headsets so simplify the implementation to only report a simple short to ground button, leaving multi-button headsets to be handled by system specific code. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 48e028eccabc9c246bfad175262582a1ce34a316 Author: Mark Brown Date: Mon Feb 21 17:11:59 2011 -0800 ASoC: Support configuration of WM8958 microphone bias analogue parameters The WM8958 has a different microphone bias architecture to WM8994 so needs different configuration to WM8994. Support this in platform data. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 9b7c525dfaa9a1b5f01db1f3a1edc50bbb6eb739 Author: Mark Brown Date: Thu Feb 17 20:05:44 2011 -0800 ASoC: Support WM8958 direct microphone detection IRQ Allow direct routing of the WM8958 microphone detection signal to a GPIO to be used, saving the need to demux the interrupt. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 7d700ac8d91f63f25cb58edeba06caddc65d85b0 Author: Mark Brown Date: Fri Feb 18 16:57:22 2011 -0800 ASoC: Mark WM8958 microphone bias registers as readable Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 9d0624a740b773d961fe0dc454d748c60d892b71 Author: Mark Brown Date: Fri Feb 18 11:49:43 2011 -0800 ASoC: Run bias level changes for all DAPM contexts in parallel As bias level changes can be quite time consuming and the bias changes for multiple devices aren't strongly tied to each other (if anything it can be advantageous to bring different devices up together) we can improve the state transition time for multi-component systems by running the bias level changes for all the devices in parallel. This is very simple to achieve using the kernel async functionality so use that to schedule the work. This should have no practical effect for the overwhelming majority of systems which have a single DAPM context - we'll bounce into another thread to do the bias level change but otherwise everything will happen in exactly the same order as it did before. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ed5a4c472346e4bc1de37f84bb8d2aca26e59538 Author: Mark Brown Date: Fri Feb 18 11:12:42 2011 -0800 ASoC: Remove card from snd_soc_dapm_set_bias_level() We can get the card from the DAPM context so don't bother passing it as an argument. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 4c090edfbbe3f8e63ec9fb7abaab17e0191646a1 Merge: 4baafdd cea2bc5 Author: Mark Brown Date: Tue Feb 22 10:38:13 2011 -0800 Merge branch 'for-2.6.38' into for-2.6.39 commit 3b03b58dab847883e6b9a431558c7d8e43fa94c6 Author: Benoit Cousson Date: Tue Feb 22 10:36:27 2011 +0100 OMAP4: hwmod data: Prevent timer1 to be reset and idle during init Since the timer1 is now started before the hwmod_init, we cannot reset it and idle it anymore. Add the appropriate flags to prevent the hwmod framework to do that. Signed-off-by: Benoit Cousson Cc: Kevin Hilman Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 9e1453c5c5fe670bb98a6097b262122386b0d3fe Author: Ajit Khaparde Date: Sun Feb 20 11:42:22 2011 +0000 be2net: use hba_port_num instead of port_num Use hba_port_num for phy loopback and ethtool phy identification. From: Suresh R Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 609ff3bb8f6cd38c68c719bbc3c31d6b0b9ce894 Author: Ajit Khaparde Date: Sun Feb 20 11:42:07 2011 +0000 be2net: add code to display temperature of ASIC Add support to display temperature of ASIC via ethtool -S From: Somnath K Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 3968fa1e58896187ee5629db0720d93b9313ad9f Author: Ajit Khaparde Date: Sun Feb 20 11:41:53 2011 +0000 be2net: fix to ignore transparent vlan ids wrongly indicated by NIC With transparent VLAN tagging, the ASIC wrongly indicates packets with VLAN ID. Strip them off in the driver. The VLAN Tag to be stripped will be given to the host as an async message. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit b2aebe6d8102ed55c161371a6ac4d945c95c334c Author: Ajit Khaparde Date: Sun Feb 20 11:41:39 2011 +0000 be2net: variable name change change occurances of stats_ioctl_sent to stats_cmd_sent Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 4ee772144f376ddf2a8c6ea5708a1362a9e85002 Author: Ajit Khaparde Date: Sun Feb 20 11:41:20 2011 +0000 be2net: fixes in ethtool selftest > add missing separator between items in ethtool self_test array > fix reporting of test resluts when link is down and when selftest command fails. From: Suresh R Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit f6c4bf3e6927e1cc98b33c64df93aa8964349195 Author: Ajit Khaparde Date: Sun Feb 20 11:41:04 2011 +0000 be2net: add new counters to display via ethtool stats New counters: > jabber frame stats > red drop stats Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 5a893fc28f0393adb7c885a871b8c59e623fd528 Author: Konrad Rzeszutek Wilk Date: Tue Feb 22 13:24:32 2011 -0500 ttm: Include the 'struct dev' when using the DMA API. This makes the accounting when using 'debug_dma_dump_mappings()' and CONFIG_DMA_API_DEBUG=y be assigned to the correct device instead of 'fallback'. No functional change - just cosmetic. Signed-off-by: Konrad Rzeszutek Wilk commit 2a3bcfdde613884ba7c5bf0e116cfd1991d4ba20 Merge: eaefd11 64d8ad6 Author: David S. Miller Date: Tue Feb 22 10:21:36 2011 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 commit eaefd1105bc431ef329599e307a07f2a36ae7872 Author: Eric Dumazet Date: Fri Feb 18 03:26:36 2011 +0000 net: add __rcu annotations to sk_wq and wq Add proper RCU annotations/verbs to sk_wq and wq members Fix __sctp_write_space() sk_sleep() abuse (and sock->wq access) Fix sunrpc sk_sleep() abuse too Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 04cfa852ff8dab923640500ee850d19e75bacabc Merge: dc19e4e 9721dbb Author: David S. Miller Date: Tue Feb 22 10:15:59 2011 -0800 Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6 commit dc19e4e5e02fb6b46cccb08b2735e38b997a6ddf Author: Nobuhiro Iwamatsu Date: Tue Feb 15 21:17:32 2011 +0000 sh: sh_eth: Add support ethtool This commit supports following functions. - get_settings - set_settings - nway_reset - get_msglevel - set_msglevel - get_link - get_strings - get_ethtool_stats - get_sset_count About other function, the device does not support. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: David S. Miller commit 2f14ddc3a7146ea4cd5a3d1ecd993f85f2e4f948 Author: Zhang, Fengzhe Date: Wed Feb 16 22:26:20 2011 +0800 xen/setup: Inhibit resource API from using System RAM E820 gaps as PCI mem gaps. With the hypervisor argument of dom0_mem=X we iterate over the physical (only for the initial domain) E820 and subtract the the size from each E820_RAM region the delta so that the cumulative size of all E820_RAM regions is equal to 'X'. This sometimes ends up with E820_RAM regions with zero size (which are removed by e820_sanitize) and E820_RAM that are smaller than physically. Later on the PCI API looks at the E820 and attempts to set up an resource region for the "PCI mem". The E820 (assume dom0_mem=1GB is set) compared to the physical looks as so: [ 0.000000] BIOS-provided physical RAM map: [ 0.000000] Xen: 0000000000000000 - 0000000000097c00 (usable) [ 0.000000] Xen: 0000000000097c00 - 0000000000100000 (reserved) -[ 0.000000] Xen: 0000000000100000 - 00000000defafe00 (usable) +[ 0.000000] Xen: 0000000000100000 - 0000000040000000 (usable) [ 0.000000] Xen: 00000000defafe00 - 00000000defb1ea0 (ACPI NVS) [ 0.000000] Xen: 00000000defb1ea0 - 00000000e0000000 (reserved) [ 0.000000] Xen: 00000000f4000000 - 00000000f8000000 (reserved) .. And we get [ 0.000000] Allocating PCI resources starting at 40000000 (gap: 40000000:9efafe00) while it should have started at e0000000 (a nice big gap up to f4000000 exists). The "Allocating PCI" is part of the resource API. The users that end up using those PCI I/O regions usually supply their own BARs when calling the resource API (request_resource, or allocate_resource), but there are exceptions which provide an empty 'struct resource' and expect the API to provide the 'struct resource' to be populated with valid values. The one that triggered this bug was the intel AGP driver that requested a region for the flush page (intel_i9xx_setup_flush). Before this patch, when running under Xen hypervisor, the 'struct resource' returned could have (depending on the dom0_mem size) physical ranges of a 'System RAM' instead of 'I/O' regions. This ended up with the Hypervisor failing a request to populate PTE's with those PFNs as the domain did not have access to those 'System RAM' regions (rightly so). After this patch, the left-over E820_RAM region from the truncation, will be labeled as E820_UNUSABLE. The E820 will look as so: [ 0.000000] BIOS-provided physical RAM map: [ 0.000000] Xen: 0000000000000000 - 0000000000097c00 (usable) [ 0.000000] Xen: 0000000000097c00 - 0000000000100000 (reserved) -[ 0.000000] Xen: 0000000000100000 - 00000000defafe00 (usable) +[ 0.000000] Xen: 0000000000100000 - 0000000040000000 (usable) +[ 0.000000] Xen: 0000000040000000 - 00000000defafe00 (unusable) [ 0.000000] Xen: 00000000defafe00 - 00000000defb1ea0 (ACPI NVS) [ 0.000000] Xen: 00000000defb1ea0 - 00000000e0000000 (reserved) [ 0.000000] Xen: 00000000f4000000 - 00000000f8000000 (reserved) For more information: http://mid.gmane.org/1A42CE6F5F474C41B63392A5F80372B2335E978C@shsmsx501.ccr.corp.intel.com BugLink: http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1726 Signed-off-by: Fengzhe Zhang Signed-off-by: Konrad Rzeszutek Wilk commit 695884fb8acd9857e0e7120ccb2150e30f4b8fef Merge: 5df9150 04bea68 Author: Thomas Gleixner Date: Tue Feb 22 18:24:26 2011 +0100 Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform Reason: x86 devicetree support for ce4100 depends on those device tree changes scheduled for .39. Signed-off-by: Thomas Gleixner commit 941aefac4c243cf407d7665d3e64beb32d556acf Author: Russell King Date: Fri Feb 11 11:32:19 2011 +0000 ARM: pm: allow generic sleep code to be used with SMP CPU idle Allow the generic sleep code to be used with SMP CPU idle by storing N CPU stack pointers rather than just one. Tested on Assabet and Tegra 2. Tested-by: Colin Cross Signed-off-by: Russell King commit 2e2f3d3792de5913897b6bb49ac13915b0b020d5 Author: Russell King Date: Sun Feb 6 17:39:31 2011 +0000 ARM: pm: convert samsung platforms to generic suspend/resume support Tested-by: Kukjin Kim Signed-off-by: Russell King commit 96c20015dae59e58d055c1e2e17a811e0d1f1d03 Author: Russell King Date: Sun Feb 6 17:41:40 2011 +0000 ARM: pm: convert sa11x0 to generic suspend/resume support Convert sa11x0 to use the generic CPU suspend/resume support, rather than implementing its own version. Tested on Assabet. Signed-off-by: Russell King commit 4f5ad99bb5331c571371f94ff4423cbb366c460b Author: Russell King Date: Sun Feb 6 17:41:26 2011 +0000 ARM: pm: convert PXA to generic suspend/resume support Signed-off-by: Russell King commit f6b0fa02e8b0708d17d631afce456524eadf87ff Author: Russell King Date: Sun Feb 6 15:48:39 2011 +0000 ARM: pm: add generic CPU suspend/resume support This adds core support for saving and restoring CPU coprocessor registers for suspend/resume support. This contains support for suspend with ARM920, ARM926, SA11x0, PXA25x, PXA27x, PXA3xx, V6 and V7 CPUs. Tested on Assabet and Tegra 2. Tested-by: Colin Cross Tested-by: Kukjin Kim Signed-off-by: Russell King commit 7715db5aeca09d853be4f2eb0bc688a970220621 Author: Kishore Kadiyala Date: Tue Feb 15 03:40:36 2011 -0500 OMAP: hsmmc: Enable MMC4 and MMC5 on OMAP4 platforms OMAP4 supports up to 5 MMC controllers, but only 3 of these were initialized. MMC5 is used by wl12xx chip. So initialize MMC4 and MMC5. Signed-off-by: Kishore Kadiyala Signed-off-by: Panduranga Mallireddy Signed-off-by: Tony Lindgren commit b17e0979113b7b75bb3f73e2243d156f91698edb Author: Panduranga Mallireddy Date: Tue Feb 15 03:40:35 2011 -0500 omap: panda: add mmc5/wl1271 device support Add MMC5 support on PANDA, which has the wl1271 device hardwired to. The wl1271 is a 4-wire, 1.8V, embedded SDIO WLAN device with an external IRQ line, and power-controlled by a GPIO-based fixed regulator. Based on the patch for mmc3/wl1271 device support for zoom by Ohad Ben-Cohen Signed-off-by: Panduranga Mallireddy Signed-off-by: Tony Lindgren commit edc840613c0fff590cad2deafdeffe6ea51405f7 Author: Panduranga Mallireddy Date: Tue Feb 15 03:40:34 2011 -0500 omap: panda: add fixed regulator device for wlan Add a fixed regulator vmmc device to enable power control of the wl1271 wlan device. Based on the patch for zoom by Ohad Ben-Cohen Signed-off-by: Panduranga Mallireddy Signed-off-by: Tony Lindgren commit cdc43482713d0af97d30d9b5d3c53b18fcec5d35 Author: Panduranga Mallireddy Date: Tue Feb 15 03:40:33 2011 -0500 omap: select REGULATOR_FIXED_VOLTAGE by default for panda and sdp4430 Power to the wl12xx wlan device is controlled by a fixed regulator. Boards that have the wl12xx should select REGULATOR_FIXED_VOLTAGE. Signed-off-by: Panduranga Mallireddy Signed-off-by: Tony Lindgren commit 66e171a3e8ed9179b2754831ae138e8fc251e4c7 Author: Panduranga Mallireddy Date: Tue Feb 15 03:40:32 2011 -0500 omap: panda: wlan board muxing Add board muxing to support the wlan wl1271 chip that is hardwired to mmc5 (fifth mmc controller) on the PANDA. Based on the wlan board muxing for zoom3 by Ohad Ben-Cohen Signed-off-by: Panduranga Mallireddy Signed-off-by: Tony Lindgren commit d3f02fc3409824ff9b29bc23e60e76da768a1205 Author: Balaji T K Date: Mon Feb 7 16:08:47 2011 +0000 OMAP2: add regulator for MMC1 Signed-off-by: Balaji T K Tested-by: Kishore Kadiyala Signed-off-by: Tony Lindgren commit 530a5a50168e5e14ba2fedd5e66796156b1df565 Author: Balaji T K Date: Mon Feb 7 20:59:59 2011 +0530 OMAP4: Fix -EINVAL for vana, vcxio, vdac Fixed regulators in twl6030 do not have set_voltage hook. Regulator core returns -22 if set_voltage is NULL and apply_uV is set while applying the constraint to set voltage resulting in failure during probe of these regulators. Do not set apply_uV for fixed regulators which don't have set_voltage. machine_constraints_voltage: VANA: failed to apply 2100000uV constraint twl_reg twl_reg.43: can't register VANA, -22 twl_reg: probe of twl_reg.43 failed with error -22 machine_constraints_voltage: VCXIO: failed to apply 1800000uV constraint twl_reg twl_reg.44: can't register VCXIO, -22 twl_reg: probe of twl_reg.44 failed with error -22 machine_constraints_voltage: VDAC: failed to apply 1800000uV constraint twl_reg twl_reg.45: can't register VDAC, -22 twl_reg: probe of twl_reg.45 failed with error -22 Signed-off-by: Balaji T K Signed-off-by: Tony Lindgren commit 73a92aa4f1d6786eaa5b4e637eee648db0dfd7a7 Author: Rajendra Nayak Date: Thu Feb 3 12:45:22 2011 +0000 omap3sdp: clean regulator supply mapping in board file clean the regulator supply mapping data in the 3430sdp board file (which is spread all over) by moving all of them together. Also use the REGULATOR_SUPPLY macro and remove instances of mapping dev pointers at run time. Additonally define all regulator_consumer_supply as array's and use ARRAY_SIZE macro to define num_consumer_supplies. Signed-off-by: Rajendra Nayak Reviewed-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 710f957846cff998c681f3701f6f90eda896458f Merge: e953fd7 011b991 Author: Chris Wilson Date: Tue Feb 22 15:58:46 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Merge in the conflicting eDP fix. Conflicts: drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/intel_display.c Signed-off-by: Chris Wilson commit 62c0740c4ff2a4a8850619e0f5ac56a3b6e83cec Author: Eliad Peller Date: Wed Feb 2 11:20:05 2011 +0200 wl12xx: declare support for IEEE80211_HW_REPORTS_TX_ACK_STATUS The wl12xx fw supports ack status reporting for tx frames, so add the IEEE80211_HW_REPORTS_TX_ACK_STATUS flag to our supported features. Since we do the rate control in the fw, we'll probably want to adjust the STA_LOST_PKT_THRESHOLD heuristics in the future, to account for retransmissions as well. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit b1a48cab6f47de18a989927e24025aab7ea106ff Author: Luciano Coelho Date: Tue Feb 22 14:19:28 2011 +0200 wl12xx: fix MODULE_AUTHOR email address Change my old email address to the new one in MODULE_AUTHOR. Signed-off-by: Luciano Coelho commit a100885d9dfd8685e0b4e442afc9041ee4c90586 Author: Arik Nemtsov Date: Sat Feb 12 23:24:20 2011 +0200 wl12xx: avoid blocking while holding rcu lock on bss info change Some blocking functions were called while holding the rcu lock for accessing STA information. This can lead to a deadlock. Save the required info beforehand and release the rcu without blocking. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 92fe9b5f112c77dbb63f42f7bed885d709586106 Author: Eliad Peller Date: Wed Feb 9 12:25:14 2011 +0200 wl12xx: fix identification of beacon packets (debug) for debugging purposes, wl12xx determines whether a rx packet is a beacon packet. however, it checks only the frame_control subtype without checking the actual packet type, which leads to false identification in some cases. use ieee80211_is_beacon instead. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 1ec610ebd6390c2b028434144af204c312a68791 Author: Gery Kahn Date: Tue Feb 1 03:03:08 2011 -0600 wl12xx: update PLT initialization for new firmware In revision > 6.1.3.0.0 the firmware expects memory configuration command as part of boot. This was missing if driver boots in PLT mode. The patch adds the memory configuration command, which fixes PLT commands tx continuous and rx statistics. Signed-off-by: Gery Kahn Signed-off-by: Luciano Coelho commit 03c5a9cf49999ca3431eb9199c9bb831b0020be2 Author: Dan Carpenter Date: Mon Feb 7 19:47:42 2011 +0300 wl12xx: change type from u8 to int ret is used to store int types. Using an u8 will break the error handling. Signed-off-by: Dan Carpenter Signed-off-by: Luciano Coelho commit e953fd7bb32f55309a96abd5ceba9cf68d221434 Author: Chris Wilson Date: Mon Feb 21 22:23:52 2011 +0000 drm/i915: Add support for limited color range of broadcast outputs In order to prevent "crushed blacks" on TVs, the range of the RGB output may be limited to 16-235. This used to be available through Xorg under the "Broadcast RGB" option, so reintroduce support for KMS. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34543 Signed-off-by: Chris Wilson commit ce453d81cb0397aa7d5148984f51907e14072d74 Author: Chris Wilson Date: Mon Feb 21 14:43:56 2011 +0000 drm/i915: Use a device flag for non-interruptible phases The code paths for modesetting are growing in complexity as we may need to move the buffers around in order to fit the scanout in the aperture. Therefore we face a choice as to whether to thread the interruptible status through the entire pinning and unbinding code paths or to add a flag to the device when we may not be interrupted by a signal. This does the latter and so fixes a few instances of modesetting failures under stress. Signed-off-by: Chris Wilson commit 8408c282f0cf34ee166df5f842f2861d245407fd Author: Chris Wilson Date: Mon Feb 21 12:54:48 2011 +0000 drm/i915: First try a normal large kmalloc for the temporary exec buffers As we just need a temporary array whilst performing the relocations for the execbuffer, first attempt to allocate using kmalloc even if it is not of order page-0. This avoids the overhead of remapping the discontiguous array and so gives a moderate boost to execution throughput. Signed-off-by: Chris Wilson commit fca874092597ef946b8f07031d8c31c58b212144 Author: Chris Wilson Date: Thu Feb 17 13:44:48 2011 +0000 drm/i915: Add a module parameter to ignore lid status Seems like we are forever to be cursed with buggy firmware, so allow the user to explicitly set the panel connection status. Of secondary utility for cases where I run laptops with the lid closed, but still want to configure the LVDS. Signed-off-by: Chris Wilson commit c87252266352c5201e2925740018f52578fa92bb Author: Chris Wilson Date: Sat Feb 19 11:31:06 2011 +0000 drm/i915: Protect against drm_gem_object not being the first member Dave Airlie spotted that we had a potential bug should we ever rearrange the drm_i915_gem_object so not the base drm_gem_object was not its first member. He noticed that we often convert the return of drm_gem_object_lookup() immediately into drm_i915_gem_object and then check the result for nullity. This is only valid when the base object is the first member and so the superobject has the same address. Play safe instead and use the compiler to convert back to the original return address for sanity testing. Signed-off-by: Chris Wilson commit 548f245ba6a318ef93f4d79bcc15cfe59a86f0d5 Author: Jesse Barnes Date: Thu Feb 17 10:40:53 2011 -0800 drm/i915: fix per-pipe reads after "cleanup" In a few places I replaced reads of per-pipe registers with the actual register offsets themselves (converting I915_READ(reg) to _PIPE(reg)). Alexey caught this on his 9xx machine because the cursor control write was affected. A quick audit showed a few more places where I'd borked a read, so here's a patch to fix things up. Reported-by: Alexey Fisher Signed-off-by: Jesse Barnes [ickle: compilation fix] Tested-by: Alexey Fisher Signed-off-by: Chris Wilson commit fc9a2228ac208dc2b6033cfc6c56b6f7655fbdfa Author: Chris Wilson Date: Thu Feb 17 17:14:34 2011 +0000 Revert "drm/i915: Disable SSC for outputs other than LVDS or DP" This reverts commit 633f2ea26665d37bb3c8ae30799aa14988622653 and the attempted fix dcbe6f2b3d136995915e2f9ecc7d4f3b28f47b6c. There is a single clock source used for both SSC (some LVDS and DP) and non-SSC (VGA, DVI) outputs. So we need to be careful to only enable SSC as necessary. However, fiddling with DREFCLK was causing DP links to be dropped and we do not have a fix ready, so revert. Signed-off-by: Chris Wilson commit c97cf42219b7b6037d2f96c27a5f114f2383f828 Author: Arnaldo Carvalho de Melo Date: Tue Feb 22 12:02:07 2011 -0300 perf top: Live TUI Annotation Now one has just to press the right key, 'a' or Enter on the main 'perf top --tui' screen to live annotate the symbol under the cursor. The annotate window starts centered on the hottest line (the one with most samples so far) then TAB and shift+TAB can be used to go to the prev/next hot line. Pressing 'H' at any point will center again the screen on the hottest line. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 70433c01613c2a44756c7b25f7bdd6c1c77b119f Author: Thomas Gleixner Date: Tue Feb 22 12:50:12 2011 +0100 genirq: Use the correct variable for note_interrupt note_interrupt wants to be called with the combined result of all handlers called, not with the last one. If it's a shared interrupt then the last handler might return IRQ_NONE often enough to trigger the spurious dectector which turns off a perfectly fine working interrupt line. Bug was introduced in commit 1277a532(genirq: Simplify handle_irq_event()). Yes, I really messed up there. First the variable ret should not have been named differently to avoid similarity with retval. Second it should have been declared in the do {} loop. Rename it to res and move it into the do {} loop and vanish under a huge brown paperbag. Reported-bisected-tested-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit b7440a14f28492bac30d7d43fd982fd210c6e971 Author: Anand Gadiyar Date: Tue Feb 22 12:43:09 2011 +0530 Bluetooth: fix build break on hci_sock.c Linux-next as of 20110217 complains when building for OMAP1. LD vmlinux `hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o `hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o make: *** [vmlinux] Error 1 A recent patch by Gustavo (Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko) introduced this by calling the hci_sock_cleanup function in the error path of bt_init. Fix this by dropping the __exit marking for hci_sock_cleanup. Signed-off-by: Anand Gadiyar Signed-off-by: Gustavo F. Padovan commit 2bf50555b0920be7e29d3823f6bbd20ee5920489 Author: Yinghai Lu Date: Tue Feb 22 11:18:49 2011 +0100 x86-64, NUMA: Seperate out numa_alloc_distance() from numa_set_distance() Alloc code is much bigger the distance setting. Separate it out into numa_alloc_distance() for readability. -v2: Let alloc_numa_distance to return -ENOMEM on failing path, requested by tj. -tj: Description update. Minor tweaks including function name, location and return value check. Signed-off-by: Yinghai Lu Acked-by: David Rientjes Signed-off-by: Tejun Heo commit 90e6b677b47ff8c5ba1637941af6b9f92723b003 Author: Tejun Heo Date: Tue Feb 22 11:10:08 2011 +0100 x86-64, NUMA: Add proper function comments to global functions Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Ingo Molnar commit b8ef9172b2aad7eeb1fcd37a9e632c7b24da1f64 Author: Tejun Heo Date: Tue Feb 22 11:10:08 2011 +0100 x86-64, NUMA: Move NUMA emulation into numa_emulation.c Create numa_emulation.c and move all NUMA emulation code there. The definitions of struct numa_memblk and numa_meminfo are moved to numa_64.h. Also, numa_remove_memblk_from(), numa_cleanup_meminfo(), numa_reset_distance() along with numa_emulation() are made global. - v2: Internal declarations moved to numa_internal.h as suggested by Yinghai. Signed-off-by: Tejun Heo Acked-by: Yinghai Lu Cc: Ingo Molnar commit fbe99959d1db85222829a64d869dcab704ac7ec8 Author: Tejun Heo Date: Tue Feb 22 11:10:08 2011 +0100 x86-64, NUMA: Prepare numa_emulation() for moving NUMA emulation into a separate file Update numa_emulation() such that, it - takes @numa_meminfo and @numa_dist_cnt instead of directly referencing the global variables. - copies the distance table by iterating each distance with node_distance() instead of memcpy'ing the distance table. - tests emu_cmdline to determine whether emulation is requested and fills emu_nid_to_phys[] with identity mapping if emulation is not used. This allows the caller to call numa_emulation() unconditionally and makes return value unncessary. - defines dummy version if CONFIG_NUMA_EMU is disabled. This patch doesn't introduce any behavior change. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Ingo Molnar commit 97e1efbbe1c8492ea4f804618e26b19325c879fe Author: Antonio Ospite Date: Sun Feb 20 18:26:46 2011 +0100 HID: bt hidp: send Output reports using SET_REPORT on the Control channel The current implementation of hidp_output_raw_report() relies only on the Control channel even for Output reports, and the BT HID specification [1] does not mention using the DATA message for Output reports on the Control channel (see section 7.9.1 and also Figure 11: SET_ Flow Chart), so let us just use SET_REPORT. This also fixes sending Output reports to some devices (like Sony Sixaxis) which are not able to handle DATA messages on the Control channel. Ideally hidp_output_raw_report() could be improved to use this scheme: Feature Report -- SET_REPORT on the Control channel Output Report -- DATA on the Interrupt channel for more efficiency, but as said above, right now only the Control channel is used. [1] http://www.bluetooth.com/Specification%20Documents/HID_SPEC_V10.pdf Signed-off-by: Antonio Ospite Acked-by: Gustavo F. Padovan Signed-off-by: Jiri Kosina commit 9e912f452931b3da9d13d716a381ba0d5fb74ced Author: Grazvydas Ignotas Date: Tue Feb 15 23:27:35 2011 +0200 bq27x00: Use single i2c_transfer call for property read Doing this by using 2 calls sometimes results in unexpected values being returned on OMAP3 i2c controller. Signed-off-by: Grazvydas Ignotas Signed-off-by: Lars-Peter Clausen commit 2ec523a8238a117b082ca6b0cef3b9ae812364f9 Author: Lars-Peter Clausen Date: Wed Feb 2 19:35:07 2011 +0100 bq27x00: Cleanup bq27x00_i2c_read Some minor stylistic cleanups. Signed-off-by: Lars-Peter Clausen Tested-by: Grazvydas Ignotas commit bf7d4140450f6dbc019a8831223e08d778f90dd7 Author: Pali Rohár Date: Tue Feb 1 00:23:13 2011 +0100 bq27x00: Minor cleanups * Consistently use uppercase for hexadecimal values. * Clarify/fix the unit of functions return value in its comment. Signed-off-by: Pali Rohár Signed-off-by: Lars-Peter Clausen Tested-by: Grazvydas Ignotas commit c1b9ab67e7c7021be9d0db6345d6ccc5d70248f1 Author: Lars-Peter Clausen Date: Sat Sep 18 17:31:16 2010 +0200 bq27x00: Give more specific reports on battery status The current code only reports whether the battery is charging or discharging. But the battery also reports whether it is fully charged, furthermore by look at if the battery is supplied we can tell whether it is discharging or not charging. Signed-off-by: Lars-Peter Clausen Acked-by: Rodolfo Giometti Tested-by: Grazvydas Ignotas commit fd9b958c5525024204e7e2c48fe5eae560d171bd Author: Pali Rohár Date: Tue Feb 1 00:10:41 2011 +0100 bq27x00: Add MODULE_DEVICE_TABLE This patch adds MODULE_DEVICE_TABLE for module bq27x00_battery. Signed-off-by: Pali Rohár Tested-by: Pali Rohár Signed-off-by: Lars-Peter Clausen Acked-by: Rodolfo Giometti Tested-by: Grazvydas Ignotas commit 631c17ee5daf0ca73688cb5e5216fc0e3e340483 Author: Pali Rohár Date: Tue Feb 1 00:08:02 2011 +0100 bq27x00: Add new properties This patch add support for reporting properties POWER_SUPPLY_PROP_CHARGE_NOW, POWER_SUPPLY_PROP_CHARGE_FULL, POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, POWER_SUPPLY_PROP_CHARGE_COUNTER, POWER_SUPPLY_PROP_ENERGY_NOW in module bq27x00_battery. Signed-off-by: Pali Rohár Signed-off-by: Lars-Peter Clausen Tested-by: Grazvydas Ignotas commit 740b755a3b3433f5ee5f9ef54de5d1b4c08223cc Author: Lars-Peter Clausen Date: Fri Jan 7 20:14:53 2011 +0100 bq27x00: Poll battery state This patch adds support for polling the battery state and generating a power_supply_changed() event if it has changed. Signed-off-by: Lars-Peter Clausen Tested-by: Grazvydas Ignotas commit 297a533b3e621be520d44d8baf3bb72ce15c4110 Author: Lars-Peter Clausen Date: Fri Jan 7 20:12:47 2011 +0100 bq27x00: Cache battery registers This patch adds a register cache to the bq27x00 battery driver. Usually multiple, if not all, power_supply properties are queried at once, for example when an uevent is generated. Since some registers are used by multiple properties caching the registers should reduce the number of reads. The cache is valid for 5 seconds this roughly matches the internal update interval of the current register for the bq27000/bq27200. Fast changing properties(*_NOW) which can be obtained by reading a single register are not cached. It will also be used in the follow up patch to check if the battery status has been changed since the last update to emit power_supply_changed events. Signed-off-by: Lars-Peter Clausen Tested-by: Grazvydas Ignotas commit 7fb7ba588c0f276609609565b21fcc853284a9a0 Author: Lars-Peter Clausen Date: Mon May 24 19:55:27 2010 +0200 bq27x00: Add bq27000 support This patch adds support for the bq27000 battery to the bq27x00 driver. The bq27000 is similar to the bq27200 except that it uses the HDQ bus instead of I2C to communicate with the host system. The driver is implemented as a platform driver. The driver expects to be provided with a read callback function through its platform data. The read function is assumed to do the lowlevel HDQ handling and read out the value of a certain register. Signed-off-by: Lars-Peter Clausen Tested-by: Grazvydas Ignotas commit a40402ef0bf3b6e53a7dfd396e9487eb2f613e19 Author: Lars-Peter Clausen Date: Mon May 24 19:37:58 2010 +0200 bq27x00: Prepare code for addition of bq27000 platform driver This patch simplifies the drivers data structure and moves code to be shared by the bq27000 and bq27200/bq27500 init functions into a common function. This patch has no functional changes, it only moves code around. Signed-off-by: Lars-Peter Clausen Acked-by: Rodolfo Giometti Tested-by: Grazvydas Ignotas commit 3413b4ea250ff0b4142a154a2764e33979957e8b Author: Lars-Peter Clausen Date: Mon May 24 21:57:33 2010 +0200 bq27x00: Return -ENODEV for properties if the battery is not present This patch changes get_property callback of the bq27x00 battery to return -ENODEV for properties other then the PROP_PRESENT if the battery is not present. The power subsystem core expects a driver to behave that way. Signed-off-by: Lars-Peter Clausen Acked-by: Rodolfo Giometti Tested-by: Grazvydas Ignotas commit a2e5118c370e78c3841606e7edc7677c986325fa Author: Pali Rohár Date: Mon May 24 20:52:13 2010 +0200 bq27x00: Fix CURRENT_NOW property According to the bq27000 datasheet the current should be calculated by the following formula: current = AI * 3570 / 20 This patch adjust the drivers code accordingly. Signed-off-by: Pali Rohár Signed-off-by: Lars-Peter Clausen Acked-by: Rodolfo Giometti Tested-by: Grazvydas Ignotas commit 0e9f30497e88600ba52013665270f543bb94f0d8 Author: Lars-Peter Clausen Date: Mon May 24 20:20:57 2010 +0200 bq27x00: Improve temperature property precession This patch improves the precession of the temperature property of the bq27x00 driver. By dividing before multiplying the current code effectively cuts of the last decimal digit. This patch fixes it by multiplying before dividing. Signed-off-by: Lars-Peter Clausen Acked-by: Rodolfo Giometti Tested-by: Grazvydas Ignotas commit 5661f334e8a53848552c8763f3bd63d0672b2e7b Author: Lars-Peter Clausen Date: Mon May 24 20:36:52 2010 +0200 bq27x00: Add type property This patch adds the type property to the bq27x00 battery driver. All bq27x00 are lithium ion batteries. Signed-off-by: Lars-Peter Clausen Acked-by: Rodolfo Giometti Tested-by: Grazvydas Ignotas commit 8635bf6ea3402154eec64763e6ed14972013c1c1 Author: Arnaldo Carvalho de Melo Date: Tue Feb 22 06:56:18 2011 -0300 perf probe: Remove redundant checks While fixing an error propagating problem in f809b25 I added two redundant checks. I did that because I didn't expect the checks to be on the while and for loop condition expression, where they are tested before we run the loop, where the 'ret' variable is set. So remove it from there and leave it just after it is actually set, eliminating unneded tests. Reported-by: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 97774672573ac4355bd12cf84b202555c1131b69 Author: Lars-Peter Clausen Date: Mon Feb 21 15:34:19 2011 +0100 power_supply: Initialize changed_work before calling device_add Calling device_add causes an inital uevent for that device to be generated. The power_supply uevent function calls the drivers get_property function, which might causes the driver to update its state, which again might causes the driver to call power_supply_changed(). Since the power_supplys changed_work has not been initialized at this point the behavior is undefined and can result in an OOPS. This patch fixes the issue by initializing the power_supplys changed_work prior to adding the power_supplys device to the device tree. Reported-by: Grazvydas Ignotas Signed-off-by: Lars-Peter Clausen Tested-by: Grazvydas Ignotas commit 9d7e584b3fb4d9f581b83c0916e10b91de78e663 Author: Jarkko Nikula Date: Mon Feb 21 14:57:22 2011 +0200 ASoC: omap: rx51: Add FM transmitter support Si4713 FM transmitter on Nokia RX-51/N900 is connected to same Line out signals of TLV320AIC34 than TPA6130 headphone amplifier. This patch adds route to transmitter and "FM Transmitter" control to keep route active when needed. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Acked-by: Peter Ujfalusi Signed-off-by: Liam Girdwood commit 770c4d81e0d2ca45516ddc9ae0a69565790b5533 Author: Sunil Mushran Date: Mon Feb 21 14:25:25 2011 -0800 ocfs2/dlm: Move kmalloc() outside the spinlock In dlm_query_region_handler(), move the kmalloc outside the spinlock. This allows us to use GFP_KERNEL instead of GFP_ATOMIC. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 731109e78415b4cc6c2f8de6c11b37f0e40741f8 Author: Changli Gao Date: Sat Feb 19 18:05:08 2011 +0800 ipvs: use hlist instead of list Signed-off-by: Changli Gao Signed-off-by: Simon Horman commit f722e17fdb2c97bbec2563636dd88489cdb1428b Author: Lars-Peter Clausen Date: Sat Jan 8 19:12:26 2011 +0100 power_supply: Ignore -ENODATA errors when generating uevents Sometimes a driver can not report a meaningful value for a certain property and returns -ENODATA. Currently when generating a uevent and a property return -ENODATA it is treated as an error an no uevent is generated at all. This is not an desirable behavior. This patch adds a special case for -ENODATA and ignores properties which return this error code when generating the uevent. Signed-off-by: Lars-Peter Clausen Tested-by: Grazvydas Ignotas commit 9c0ff728b86361f4b5c58b9acf9853d682a1b8f8 Author: Kukjin Kim Date: Mon Feb 14 16:57:58 2011 +0900 tty: Change dependency of ARCH_EXYNOS4 This patch changes dependency of ARCH_EXYNOS4 from ARCH_S5PV310 according to the change of ARCH name, EXYNOS4. Cc: Ben Dooks Cc: Greg Kroah-Hartman Signed-off-by: Kukjin Kim commit b4a5660da011a0d55cac2ead05a9171d5544d272 Author: Kukjin Kim Date: Mon Feb 14 16:53:58 2011 +0900 ASoC: Change dependency of ARCH_EXYNOS4 This patch changes dependency of ARCH_EXYNOS4 from ARCH_S5PV310 according to the change of ARCH name, EXYNOS4. Acked-by: Jassi Brar Cc: Liam Girdwood Acked-by: Mark Brown Signed-off-by: Kukjin Kim commit fc406cd84b051f39f870b8050303941877f7b0b5 Author: Kukjin Kim Date: Mon Feb 14 16:52:45 2011 +0900 mtd: OneNAND: Change dependency of ARCH_EXYNOS4 This patch updates EXYNOS4 OneNAND support according to the change of ARCH name, EXYNOS4. Cc: Kyungmin Park Signed-off-by: Kukjin Kim commit a1fe724a47e4a06bb022cac400f181eeac49583d Author: Kukjin Kim Date: Mon Feb 14 16:59:54 2011 +0900 ARM: exynos4_defconfig: Add defconfig for EXYNOS4 Cc: Russell King Signed-off-by: Kukjin Kim commit 10606aadb046d008c88d1a99b309357ca33d590e Author: Kukjin Kim Date: Mon Feb 14 15:05:27 2011 +0900 ARM: EXYNOS4: Update Kconfig and Makefile for the new ARCH_EXYNOS4 This patch changes the Kconfig and Makefile for the new ARCH_EXYNOS4. It also updates arch/arm/Kconfig, Makeifile and arch/arm/mm/Kconfig to include support for the new ARCH_EXYNOS4. Cc: Russell King Signed-off-by: Kukjin Kim commit d11135ca4f6e626e1c8aa78de6d472a11a9e9811 Author: Kukjin Kim Date: Mon Feb 14 14:59:52 2011 +0900 ARM: EXYNOS4: Moved board support files This patch moves board support files, SMDKC210, SMKDV310 and UNIVERSAL_C210 into arch/arm/mach-exynos4/ according to the change of ARCH name, EXYNOS4. Cc: Kyungmin Park Signed-off-by: Kukjin Kim commit 3db3ae5eb94eb8579991174fe66999261b66018d Author: Kukjin Kim Date: Mon Feb 14 16:22:36 2011 +0900 ARM: EXYNOS4: Update device support This patch updates device support of EXYNOS4 according to the change of ARCH name, EXYNOS4. Cc: Ben Dooks Signed-off-by: Kukjin Kim commit 3c31336dc5b7ea5b6d6168a8c38c46dd54d65e95 Author: Kukjin Kim Date: Mon Feb 14 16:13:27 2011 +0900 ARM: EXYNOS4: Update Timer part This patch updates Timer part of EXYNOS4 according to the change of ARCH name, EXYNOS4. Signed-off-by: Kukjin Kim commit c81a24ff8f4efda02ffaa0c3170155550bcae339 Author: Kukjin Kim Date: Mon Feb 14 16:10:55 2011 +0900 ARM: EXYNOS4: Update IRQ part This patch updates IRQ part of EXYNOS4 according to the change of ARCH name, EXYNOS4. Signed-off-by: Kukjin Kim commit b3ed3a174c419702eddf9fb28636f6e4baa29d03 Author: Kukjin Kim Date: Mon Feb 14 16:08:04 2011 +0900 ARM: EXYNOS4: Update Clock part This patch updates Clock part of EXYNOS4 according to the change of ARCH name, EXYNOS4. Signed-off-by: Kukjin Kim commit 7d30e8b3815f804139271dfc31962ab74ce89650 Author: Kukjin Kim Date: Mon Feb 14 16:33:10 2011 +0900 ARM: EXYNOS4: Add EXYNOS4 CPU initialization support This patch adds EXYNOS4 CPU support files in mach-exynos4, and basically they are moved from mach-s5pv310 so that it can support Samsung's new CPU name, EXYNOS4. The EXYNOS4 ingegrates a ARM Cortex A9 multi-core. Signed-off-by: Kukjin Kim commit c472da6da1f38efee6bcfcce30583531262cebe2 Author: Sylwester Nawrocki Date: Tue Feb 15 14:27:44 2011 +0900 ARM: S5PV210: Change framebuffer window 0 size on GONI Increase virtual size of the frambuffer window 0 for display panning support. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 9a16afdfc2fe1117b2615ed55dff446b789bb3d5 Author: Sylwester Nawrocki Date: Tue Feb 15 14:27:44 2011 +0900 ARM: S5PV210: Add supplies for CIF camera on GONI board Add regulator supplies required for NOON010PC30 CIF sensor. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 9c4f0a390c66cd6e85635f79ff999f1e37458af1 Author: Sylwester Nawrocki Date: Tue Feb 15 14:27:44 2011 +0900 ARM: S5PV210: Enable I2C0 bus on GONI board Add I2C0 bus platform device for camera sensors. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit d3f9c570219c72736ae2da9071f1efbf804707f7 Author: Kukjin Kim Date: Fri Jan 28 18:22:10 2011 +0900 ARM: S5PV210: Use REGULATOR_SUPPLY macro for regulator consumers To use REGULATOR_SUPPLY macro is cleaner for initializing regulator consumer supply. Signed-off-by: Kukjin Kim commit 5d15765594eeb5d82c5630b3428ea0ac4f7d3c31 Author: Lukas Czerner Date: Tue Feb 15 17:07:36 2011 +0000 xfs: check if device support discard in xfs_ioc_trim() Right now we, are relying on the fact that when we attempt to actually do the discard, blkdev_issue_discar() returns -EOPNOTSUPP and the user is informed that the device does not support discard. However, in the case where the we do not hit any suitable free extent to trim in FITRIM code, it will finish without any error. This is very confusing, because it seems that FITRIM was successful even though the device does not actually supports discard. Solution: Check for the discard support before attempt to search for free extents. Signed-off-by: Lukas Czerner Signed-off-by: Alex Elder commit 5dbd571d875d73e087c1eeb3d840cfc653a97422 Author: Alexander V. Lukyanov Date: Mon Feb 21 21:33:21 2011 -0500 ext4: allow inode_readahead_blks=0 (linux-2.6.37) I cannot disable inode-read-ahead feature of ext4 (on 2.6.37): # echo 0 > /sys/fs/ext4/sda2/inode_readahead_blks bash: echo: write error: Invalid argument On a server with lots of small files and random access this read-ahead makes performance worse, and I'd like to disable it. I work around this problem by using value of 1, but it still reads an extra block. This patch fixes the problem by checking for zero explicitly. Signed-off-by: Alexander V. Lukyanov Signed-off-by: "Theodore Ts'o" commit 7dc576158d7e5cdff3349f78598fdb4080536342 Author: Peter Huewe Date: Mon Feb 21 21:01:42 2011 -0500 ext4: Fix sparse warning: Using plain integer as NULL pointer This patch fixes the warning "Using plain integer as NULL pointer", generated by sparse, by replacing the offending 0s with NULL. Signed-off-by: Peter Huewe Signed-off-by: "Theodore Ts'o" commit c4d0c3b097f7584772316ee4d64a09fe0e4ddfca Author: Dan Rosenberg Date: Mon Feb 14 13:45:28 2011 +0000 xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1 The FSGEOMETRY_V1 ioctl (and its compat equivalent) calls out to xfs_fs_geometry() with a version number of 3. This code path does not fill in the logsunit member of the passed xfs_fsop_geom_t, leading to the leaking of four bytes of uninitialized stack data to potentially unprivileged callers. v2 switches to memset() to avoid future issues if structure members change, on suggestion of Dave Chinner. Signed-off-by: Dan Rosenberg Reviewed-by: Eugene Teo Signed-off-by: Alex Elder commit da488945f4bf4096f4ab6091938469bd8822cfec Author: Theodore Ts'o Date: Mon Feb 21 20:39:58 2011 -0500 ext4: fix compile warnings with EXT4FS_DEBUG enabled Compile 2.6.38-rc1 with turning EXT4FS_DEBUG on, we get following compile warnings. This patch fixes them. CC fs/ext4/hash.o CC fs/ext4/resize.o fs/ext4/resize.c: In function 'setup_new_group_blocks': fs/ext4/resize.c:233:2: warning: format '%#04llx' expects type 'long long unsigned int', but argument 3 has type 'long unsigned int' fs/ext4/resize.c:251:2: warning: format '%#04llx' expects type 'long long unsigned int', but argument 3 has type 'long unsigned int' CC fs/ext4/extents.o CC fs/ext4/ext4_jbd2.o CC fs/ext4/migrate.o Reported-by: Akira Fujita Signed-off-by: "Theodore Ts'o" commit e603dc15072c7fec0ae263597e6dabc3bb4c5c5b Author: Arnaldo Carvalho de Melo Date: Mon Feb 21 16:05:50 2011 -0300 perf evsel: Fix inverted test for fixing up attr.inherit flag The kernel refuses mmapping an event with the inherit flag set for something that is systemwide (cpu == -1), and the evsel layer got this reversed at some point, fix it. The symtom was that the --pid and --tid parameters for 'perf record' and 'perf top' returned with -EINVAL, like: # /tmp/build-perf/perf record -v -fo/tmp/perf.data -p 1042 Warning: ... trying to fall back to cpu-clock-ticks Fatal: failed to mmap with 22 (Invalid argument) Reported-by: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit fbee632d0ca9f4073a3fefb9a843eac8af036b0f Author: Arnaldo Carvalho de Melo Date: Mon Feb 21 13:23:57 2011 -0300 perf probe: Fix error propagation leading to segfault There are two hunks in this patch that stops probe processing as soon as one error is found, breaking out of loops, the other fix an error propagation that should return a negative error number but instead was returning the result of "ret < 0", which is 1 and thus made several error checks fail because they test agains < 0. The problem could be triggered by asking for a variable that was optimized out, fact that should stop the whole probe processing but instead was segfaulting while installing broken probes: [root@emilia ~]# probe perf_mmap:55 user_lock_limit Failed to find the location of user_lock_limit at this address. Perhaps, it has been optimized out. Failed to find 'user_lock_limit' in this function. Add new events: probe:perf_mmap (on perf_mmap:55 with user_lock_limit) probe:perf_mmap_1 (on perf_mmap:55 with user_lock_limit) Segmentation fault (core dumped) [root@emilia ~]# perf probe -l probe:perf_mmap (on perf_mmap:55@git/linux/kernel/perf_event.c with user_lock_limit) probe:perf_mmap_1 (on perf_mmap:55@git/linux/kernel/perf_event.c with user_lock_limit) [root@emilia ~]# After the fix: [root@emilia ~]# probe perf_mmap:55 user_lock_limit Failed to find the location of user_lock_limit at this address. Perhaps, it has been optimized out. Failed to find 'user_lock_limit' in this function. Error: Failed to add events. (-2) [root@emilia ~]# Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6f9524e9e118929f1de02840dffe858f99685aea Author: Lukas Czerner Date: Mon Feb 21 20:16:21 2011 -0500 ext4: update ext4 documentation Add documentation for mount options and ioctls to Documentation/filesystem/ext4.txt, which has not been udpated for some time. Also add for ext4 sysfs tunables to the Documentation/ABI/testing/sysfs-fs-ext4 file, and fix a few typographical errors in that file. https://bugzilla.kernel.org/show_bug.cgi?id=9423 Signed-off-by: Lukas Czerner Signed-off-by: "Theodore Ts'o" commit 905a74d9a0452b15bb4087a0ea48d017430e4e23 Author: Benoit Cousson Date: Fri Feb 18 14:01:06 2011 +0100 OMAP4: hwmod data: Add rev and dev_attr fields in McSPI - Add a rev attribute to identify various McSPI IP version. - Add a dev_attr structure to provide the number of chipselect supported by the instance. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Cc: Govindraj.R Signed-off-by: Tony Lindgren commit 15c4794fe247d85ce38eb5f5e2a5855d996f56cd Author: Anderson Briglia Date: Mon Feb 21 15:09:23 2011 -0300 Bluetooth: Fix LE conn creation This patch prevents a crash when remote host tries to create a LE link which already exists. i.e.: call l2test twice passing the same parameters. Signed-off-by: Anderson Briglia Signed-off-by: Ville Tervo Signed-off-by: Gustavo F. Padovan commit 7fdd7f89006dd5a4c702fa0ce0c272345fa44ae0 Author: John Stultz Date: Tue Feb 15 10:52:57 2011 -0800 timers: Export CLOCK_BOOTTIME via the posix timers interface This patch exports CLOCK_BOOTTIME through the posix timers interface CC: Jamie Lokier CC: Thomas Gleixner CC: Alexander Shishkin CC: Arve Hjønnevåg Signed-off-by: John Stultz commit 70a08cca1227dc31c784ec930099a4417a06e7d0 Author: John Stultz Date: Tue Feb 15 10:45:16 2011 -0800 timers: Add CLOCK_BOOTTIME hrtimer base CLOCK_MONOTONIC stops while the system is in suspend. This is because to applications system suspend is invisible. However, there is a growing set of applications that are wanting to be suspend-aware, but do not want to deal with the complications of CLOCK_REALTIME (which might jump around if settimeofday is called). For these applications, I propose a new clockid: CLOCK_BOOTTIME. CLOCK_BOOTTIME is idential to CLOCK_MONOTONIC, except it also includes any time spent in suspend. This patch add hrtimer base for CLOCK_BOOTTIME, using get_monotonic_boottime/ktime_get_boottime, to allow in kernel users to set timers against. CC: Jamie Lokier CC: Thomas Gleixner CC: Alexander Shishkin CC: Arve Hjønnevåg Signed-off-by: John Stultz commit 314ac37150011ebb398f522db528d2dbcc611189 Author: John Stultz Date: Mon Feb 14 18:43:08 2011 -0800 time: Extend get_xtime_and_monotonic_offset() to also return sleep Extend get_xtime_and_monotonic_offset to get_xtime_and_monotonic_and_sleep_offset(). CC: Jamie Lokier CC: Thomas Gleixner CC: Alexander Shishkin CC: Arve Hjønnevåg Signed-off-by: John Stultz commit abb3a4ea2e0ea7114a4475745da2f32bd9ad5b73 Author: John Stultz Date: Mon Feb 14 17:52:09 2011 -0800 time: Introduce get_monotonic_boottime and ktime_get_boottime This adds new functions that return the monotonic time since boot (in other words, CLOCK_MONOTONIC + suspend time). CC: Jamie Lokier CC: Thomas Gleixner CC: Alexander Shishkin CC: Arve Hjønnevåg Signed-off-by: John Stultz commit e06383db9ec591696a06654257474b85bac1f8cb Author: John Stultz Date: Tue Dec 14 19:37:07 2010 -0800 hrtimers: extend hrtimer base code to handle more then 2 clockids The hrtimer code is written mainly with CLOCK_REALTIME and CLOCK_MONOTONIC in mind. These are clockids 0 and 1 resepctively. However, if we are to introduce any new hrtimer bases, using new clockids, we have to skip the cputimers (clockids 2,3) as well as other clockids that may not impelement timers. This patch adds a little bit of indirection between the clockid and the base, so that we can extend the base by one when we add a new clockid at number 7 or so. CC: Jamie Lokier CC: Thomas Gleixner CC: Alexander Shishkin CC: Arve Hjønnevåg Signed-off-by: John Stultz commit 320d6c1b56de5f461c6062625b9664095f90ee95 Author: Sujith Manoharan Date: Mon Feb 21 17:07:12 2011 +0530 ath9k_hw: Fix power on reset Commit "ath9k_hw: add an extra delay when reseting AR_RTC_RESET" added an extra udelay to the reset routine. As the required delay is already present, remove this. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 60687ba710359f32343b7630dc05d3811ef5bf4c Author: RA-Shiang Tu Date: Sun Feb 20 13:57:46 2011 +0100 rt2x00: Add support for RT5390 chip Add new RT5390 chip support Signed-off-by: Shiang Tu Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit fe59147c4f42a491a77b788571c37f0a0be6f41d Author: Shiang Tu Date: Sun Feb 20 13:57:22 2011 +0100 rt2x00: Add/Modify the GPIO register definition Revise/Add GPIO register related definitions Signed-off-by: Shiang Tu Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6f492b6d38e18f8d023137231c5d717068deb28d Author: Shiang Tu Date: Sun Feb 20 13:56:54 2011 +0100 rt2x00: Add/Modify protection related register definitions Make the definition of protection related registers more precisely Signed-off-by: Shiang Tu Acked-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 47715e6473d12f265c02cebc587de51af80ed6dc Author: Helmut Schaa Date: Sun Feb 20 13:56:26 2011 +0100 rt2x00: Remove superfluos empty line Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 1bce85cf9cea85f6b9a27326effef1e05f7cbc23 Author: Helmut Schaa Date: Sun Feb 20 13:56:07 2011 +0100 Revert "rt2x00 : avoid timestamp for monitor injected frame." This reverts commit e81e0aef32bfa7f593b14479b9c7eaa7196798ac "rt2x00 : avoid timestamp for monitor injected frame." as it breaks proper timestamp insertion into probe responses injected by hostapd for example. Signed-off-by: Helmut Schaa Cc: Benoit PAPILLAULT Cc: Alban Browaeys Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 430df7980ef1a522ad2fd1d06e1b6655f2d9320f Author: Helmut Schaa Date: Sun Feb 20 13:55:46 2011 +0100 rt2x00: Minor optimization for devices with RTS/CTS offload Only devices that don't have RTS/CTS offload need to check for IEEE80211_TX_RC_USE_RTS_CTS and IEEE80211_TX_RC_USE_CTS_PROTECT. By swapping both conditions we keep the same number of needed conditionals for devices without RTS/CTS offload but save one conditional on devices with RTS/CTS offload. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit e90c54b2358559bd305ff08096e077d2a7f02bf3 Author: RA-Jay Hung Date: Sun Feb 20 13:55:25 2011 +0100 rt2x00: Fix rt2800 txpower setting to correct value TX_PWR_CFG_* setting need to consider below cases -compesate 20M/40M tx power delta for 2.4/5GHZ band -limit maximum EIRP tx power to power_level of regulatory requirement Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit d96aa640967ab10641a0a389a4a1569efa54ac72 Author: RA-Jay Hung Date: Sun Feb 20 13:54:52 2011 +0100 rt2x00: Add antenna setting for RT3070/RT3090/RT3390 with RX antenna diversity support For RT3070/RT3090/RT3390 with RX antenna diversity support, we must select default antenna using gpio control way even if we do not turn on antenna diversity feature. Seperate the meaning of TX/RX chain and antenna. Some chips use 2x2 TX/RX chain but may have 3 RX antennas or 1x1 TX/RX chain but may have 2 RX antennas to do antenna diversity. Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 9e0bc671873c96104b8f793b03661f443e1c4b5a Author: Larry Finger Date: Sat Feb 19 16:30:02 2011 -0600 rtlwifi: Remove obsolete/unused macros The original code has many macros that are no longer needed. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 17c9ac62812b58aacefc7336215aecbb522f6547 Author: Larry Finger Date: Sat Feb 19 16:29:57 2011 -0600 rtlwifi: rtl8192ce: Fix endian warnings Drivers rtlwifi, and rtl8192ce generate a large number of sparse warnings. This patch fixes most of them. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 663dcc73675bd70ee11195ce832b1d1691f967d0 Author: Larry Finger Date: Sat Feb 19 16:29:52 2011 -0600 rtlwifi: Modify build system for rtl8192cu Modify Kconfig and Makefile to build rtl8192cu. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 29d00a3e46bb6b0743e79f4abc249d8c318e0a56 Author: George Date: Sat Feb 19 16:29:47 2011 -0600 rtlwifi: rtl8192cu: Add routine trx Add routine rtlwifi/rtl8192cu/trx.c. This routine differs from the rtl8192ce file of the same name. Signed-off-by: George Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 59187c5b12526a5f53d1a8b91922ce992bc98eef Author: George Date: Sat Feb 19 16:29:42 2011 -0600 rtlwifi: rtl8192cu: Add routine table Add rtlwifi/rtl8192cu/table.c. These tables are different than the ones used in rtl8192ce. Signed-off-by: George Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 3ac23f8106051aa8a922d9ad8415232bb5c1af70 Author: George Date: Sat Feb 19 16:29:37 2011 -0600 rtlwifi: rtl8192cu: Add routine rf Add rtlwifi/rtl8192cu/rf.c. This routine is distinct from the one in rtl8192ce with the same name. Signed-off-by: George Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f0a39ae738d660cb69e486abd20c0dec1cdcb898 Author: George Date: Sat Feb 19 16:29:32 2011 -0600 rtlwifi: rtl8192cu: Add routine phy Add the routine rtlwifi/rtl8192cu/phy.c. Most of the code is included from rtlwifi/rtl8192c/phy_common.c. Signed-off-by: George Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 666e8457fae432ec292e0abc344f8684046fa605 Author: George Date: Sat Feb 19 16:29:27 2011 -0600 rtlwifi: rtl8192cu: Add routine mac Add the routine rtlwifi/rtl8192cu/hw.c. Signed-off-by: George Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit dc0313f46664192c3cbd60e94abb28ab6f00979d Author: George Date: Sat Feb 19 16:29:22 2011 -0600 rtlwifi: rtl8192cu: Add routine hw Add the routine rtlwifi/rtl8192cu/hw.c. This one is distinct from the routine of the same name in rtl8192ce. Signed-off-by: George Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 442888c706e90634c4cc3441751b43115a7d8506 Author: George Date: Sat Feb 19 16:29:17 2011 -0600 rtlwifi: rtl8192cu: Add routines dm, fw, led and sw Add the rtlwifi/rtl8192cu routines for dm.c, fw.c, led.c and sw.c. Where possible, these routines use the corresponding code in rtl8192ce. Signed-off-by: George Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 4295cd254af3181873c7ad15969421d3cb852cf9 Author: Larry Finger Date: Sat Feb 19 16:29:12 2011 -0600 rtlwifi: Move common parts of rtl8192ce/phy.c Move common routines from rtlwifi/rtl8192ce/phy.c and .../rtl8192cu/phy.c into rtlwifi/rtl8192c/phy_common.c. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit e97b775d9bce1d7b51df5bf470ba9c529d93dc66 Author: Larry Finger Date: Sat Feb 19 16:29:07 2011 -0600 rtlwifi: Modify wifi.h for rtl8192cu Further merge of parameters needed for rtl8192cu. In addition, some changes needed for rtl8192se and rtl8192de are included and additional Hungarian notation is removed. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 18d30067d3b0c7e1362b7a866a9873e03a6d7d62 Author: George Date: Sat Feb 19 16:29:02 2011 -0600 rtlwifi: Add headers for rtl8187cu Signed-off-by: Larry Finger Signed-off-by: George Signed-off-by: John W. Linville commit 7ea4724036ed17ec811cb8082af7760f04484ef7 Author: Larry Finger Date: Sat Feb 19 16:28:57 2011 -0600 rtlwifi: Modify some rtl8192ce routines for merging rtl8192cu Modify some rtl8192ce routines for merging with rtl8192cu. In addition, remove some usage of Hungarian notation. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 0e80b9d1c51883e01603e2ff0caae608eda09fa5 Author: Larry Finger Date: Sat Feb 19 16:28:52 2011 -0600 rtlwifi: Make changes in rtlwifi/rtl8192ce/def.h to support rtl8192cu This change modifies rtlwifi/rtl8192ce/def.h to handle rtl8192cu. In addition, a couple of routines needed for both drivers are converted to be inline. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit a9dd591919788b38c9177a41dcb40a7a0620cdd0 Author: Larry Finger Date: Sat Feb 19 16:28:47 2011 -0600 rtlwifi: Make changes in rtlwifi/rtl8192ce/reg.h to support rtl8192cu This change modifies rtlwifi/rtl8192ce/reg.h to support rtl8192cu. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 69081624c7b2138b137738e307cb67e2dafd6e9b Author: Vasanthakumar Thiagarajan Date: Sat Feb 19 01:13:42 2011 -0800 ath9k: Implement op_flush() When op_flush() is called with no drop (drop=false), the driver tries to tx as many frames as possible in about 100ms on every hw queue. During this time period frames from sw queue are also scheduled on to respective hw queue. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 0aec516ce4cfd44f48b3ae0c54bc2f1eab007173 Author: Randy Dunlap Date: Fri Feb 18 17:25:36 2011 -0800 wl12xx: fix sdio_test kconfig/build errors The wl12xx sdio_test code uses wl12xx_get_platform_data, which is only present when WL12*_SDIO is enabled, so make WL12XX_SDIO_TEST depend on WL12XX_SDIO so that the needed interface will be present. sdio_test.c:(.devinit.text+0x13178): undefined reference to `wl12xx_get_platform_data' Signed-off-by: Randy Dunlap Cc: Luciano Coelho Cc: Roger Quadros Signed-off-by: John W. Linville commit d985255e00e8a6a0d87b1dc674113bc76bed04a0 Author: Wojciech Dubowik Date: Fri Feb 18 13:06:42 2011 +0100 ath5k: Enable AR2315 chipset recognition Enable recognition of AR2315 chipsets in ath5k driver. Reported-by: Simon Morgenthaler Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit f456228365bf3615bc6837c363653f31df66abff Author: Christian Lamparter Date: Wed Feb 9 22:13:11 2011 +0100 ar9170usb: mark the old driver as obsolete AR9170USB will be replaced by carl9170 in the foreseeable future [2.6.40]. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit a664b5bc77fbc80c163de5606114659d3cbeb043 Author: Johan Hedberg Date: Sat Feb 19 12:06:02 2011 -0300 Bluetooth: Fix unnecessary list traversal in mgmt_pending_remove All of the places that need to call mgmt_pending_remove already have a pointer to the pending command, so searching for the command in the list doesn't make sense. The added benefit is that many places that previously had to call list_del + mgmt_pending_free can just call mgmt_pending_remove now. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit a958355699dd90ba69951bdf55dda00e3e97222c Author: Johan Hedberg Date: Sat Feb 19 12:06:01 2011 -0300 Bluetooth: Fix inititial value for remote authentication requirements The remote authentication requirements for conections need to be initialized to 0xff (unknown) since it is possible that we receive a IO Capability Request before we have received information about the remote requirements. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 2a61169209c72317d4933f8d22f749a6a61a3d36 Author: Johan Hedberg Date: Sat Feb 19 12:06:00 2011 -0300 Bluetooth: Add mgmt_auth_failed event To properly track bonding completion an event to indicate authentication failure is needed. This event will be sent whenever an authentication complete HCI event with a non-zero status comes. It will also be sent when we're acting in acceptor role for SSP authentication in which case the controller will send a Simple Pairing Complete event. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit ac56fb13c0508181b4227b8ada6d47aaaf72794c Author: Johan Hedberg Date: Sat Feb 19 12:05:59 2011 -0300 Bluetooth: Fix mgmt_pin_code_reply return parameters The command complete event for mgmt_pin_code_reply & mgmt_pin_code_neg_reply should have the adapter index, Bluetooth address as well as the status. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 59a24b5d0d4befc2498f51c57905cb02963ff275 Author: Johan Hedberg Date: Sat Feb 19 12:05:58 2011 -0300 Bluetooth: Fix mgmt_pin_code_reply command status opcode The opcode for the ENODEV case was wrong (probably copy-paste mistake). Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit a5c296832b4fde7d32c01cff9cdd27d9c7c1c4f5 Author: Johan Hedberg Date: Sat Feb 19 12:05:57 2011 -0300 Bluetooth: Add management support for user confirmation request This patch adds support for the user confirmation (numeric comparison) Secure Simple Pairing authentication method. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit e9a416b5ce0c0f93819f55d34cf6882196e9c3b2 Author: Johan Hedberg Date: Sat Feb 19 12:05:56 2011 -0300 Bluetooth: Add mgmt_pair_device command This patch adds a new mgmt_pair_device which can be used to initiate a dedicated bonding procedure. Some extra callbacks are added to the hci_conn struct so that the pairing code can get notified of the completion of the procedure. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 366a033698266c304abd6365ea3bcaec36860328 Author: Johan Hedberg Date: Sat Feb 19 12:05:55 2011 -0300 Bluetooth: Make pending_add return a pointer to the added entry This makes it more convenient to do manipulations on the entry (needed by later commits). Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 8fff39e06987492da3d4a0b9ec7cdbd245b6762b Author: Thomas Gleixner Date: Mon Feb 21 14:19:42 2011 +0100 genirq: Add missing break in __irq_set_trigger() The switch case in __irq_set_trigger() lacks a break, which emits a pr_err unconditionally on success. Reported-by: Lars-Peter Clausen Signed-off-by: Thomas Gleixner commit ed4dea6e0e33a3e58d8b77b775a8f0e433e7a005 Author: Yinghai Lu Date: Sat Feb 19 11:07:37 2011 -0800 genirq: Use IRQ_BITMAP_BITS as search size in irq_alloc_descs() The runtime expansion of nr_irqs does not take into account that bitmap_find_next_zero_area() returns "start" + size in case the search for an matching zero area fails. That results in a start value which can be completely off and is not covered by the following expand_nr_irqs() and possibly outside of the absolute limit. But we use it without further checking. Use IRQ_BITMAP_BITS as the limit for the bitmap search and expand nr_irqs when the start bit is beyond nr_irqs. So start is always pointing to the correct area in the bitmap. nr_irqs is just the limit for irq enumerations, not the real limit for the irq space. [ tglx: Let irq_expand_nr_irqs() take the new upper end so we do not expand nr_irqs more than necessary. Made changelog readable ] Signed-off-by: Yinghai Lu LKML-Reference: <4D6014F9.8040605@kernel.org> Signed-off-by: Thomas Gleixner commit a61d825808a0ce9935afebc225dcd602d5339e14 Author: Thomas Gleixner Date: Mon Feb 21 12:54:34 2011 +0100 genirq: Fix misplaced status update in irq_disable() We lazy disable interrupt lines, so only mark the line masked, when the chip provides an irq_disable callback. Signed-off-by: Thomas Gleixner commit be663ab67077fac8e23eb8e231a8c1c94cb32e54 Author: Wey-Yi Guy Date: Mon Feb 21 11:27:26 2011 -0800 iwlwifi: split the drivers for agn and legacy devices 3945/4965 Intel WiFi devices 3945 and 4965 now have their own driver in the folder drivers/net/wireless/iwlegacy Add support to build these drivers independently of the driver for AGN devices. Selecting the 3945 builds iwl3945.ko and iwl_legacy.ko, and selecting the 4965 builds iwl4965.ko and iwl_legacy.ko. iwl-legacy.ko contains code shared between both devices. The 3945 is an ABG/BG device, with no support for 802.11n. The 4965 is a 2x3 ABGN device. Signed-off-by: Meenakshi Venkataraman Acked-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 516295e5ab4bf986865cfff856d484ec678e3b0b Author: Russell King Date: Sun Nov 21 16:27:49 2010 +0000 ARM: pgtable: add pud-level code Add pud_offset() et.al. between the pgd and pmd code in preparation of using pgtable-nopud.h rather than 4level-fixup.h. This incorporates a fix from Jamie Iles for uaccess_with_memcpy.c. Signed-off-by: Russell King commit f60892d3e36dcdd0d9f30db05beae7a446a93f28 Author: Will Deacon Date: Tue Feb 15 12:44:10 2011 +0100 ARM: 6673/1: LPAE: use phys_addr_t instead of unsigned long for start of membanks The unsigned long datatype is not sufficient for mapping physical addresses >= 4GB. This patch ensures that the phys_addr_t datatype is used to represent the start address of a membank, which may reside above the 4GB boundary. Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King commit e33b9d0878ff6b8a543b3423c3019a5dbbf5689a Author: Russell King Date: Sun Feb 20 11:47:41 2011 +0000 ARM: Use long long format when printing meminfo physical addresses Acked-by: Will Deacon Signed-off-by: Russell King commit 4bc85c1324aaa4a8bb0171e332ff762b6230bdfe Author: Wey-Yi Guy Date: Mon Feb 21 11:11:05 2011 -0800 Revert "iwlwifi: split the drivers for agn and legacy devices 3945/4965" This reverts commit aa833c4b1a928b8d3c4fcc2faaa0d6b81ea02b56. commit aa833c4b1a928b8d3c4fcc2faaa0d6b81ea02b56 Author: Wey-Yi Guy Date: Mon Feb 21 10:57:10 2011 -0800 iwlwifi: split the drivers for agn and legacy devices 3945/4965 Intel WiFi devices 3945 and 4965 now have their own driver in the folder drivers/net/wireless/iwlegacy Add support to build these drivers independently of the driver for AGN devices. Selecting the 3945 builds iwl3945.ko and iwl_legacy.ko, and selecting the 4965 builds iwl4965.ko and iwl_legacy.ko. iwl-legacy.ko contains code shared between both devices. The 3945 is an ABG/BG device, with no support for 802.11n. The 4965 is a 2x3 ABGN device. Signed-off-by: Meenakshi Venkataraman Acked-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 73b78a22720087d2d384bdd49e9c25500ba73edd Author: Wey-Yi Guy Date: Fri Feb 11 08:13:14 2011 -0800 iwlwifi: enable 2-wire bt coex support for non-combo device For non-combo devices, 2-wire BT coex is needed to make sure BT coex still function with external BT devices Signed-off-by: Wey-Yi Guy commit 46d0637a128f2f555c1f7be02cd65c45b92b2a60 Author: Wey-Yi Guy Date: Mon Feb 7 16:54:50 2011 -0800 iwlwifi: Loading correct uCode again when fail to load During uCode loading, if the reply_alive come back with "failure", try to load the same uCode again. Signed-off-by: Wey-Yi Guy commit 491bc292766330473eac4569be5d57f9aeb80112 Author: Wey-Yi Guy Date: Wed Feb 9 09:37:46 2011 -0800 iwlwifi: Limit number of firmware reload If device has serious problem and cause firmware can not recover itself. Keep reloading firmware will not help, it can only fill up the syslog and lock up the system because busy reloading. Introduce the limit reload counter, if the reload reach the maximum within the pre-defined duration;stop the reload operation. Signed-off-by: Wey-Yi Guy commit 503e1639654b5a7ef80557985fef8a36a785b9e1 Author: Richard Zhao Date: Fri Feb 18 20:26:30 2011 +0800 ARM: imx53: correct Silicon Revision definition following fuse map Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 646e610d403e1ad977530c1b0a87dabc8293b5ef Author: Frank Li Date: Mon Feb 21 14:28:10 2011 +0800 ARM: imx53_smd add uncompress print Signed-off-by: Frank Li Signed-off-by: Sascha Hauer commit f6d7f2c60d3a63d786feeb60628f930cd2d8e912 Author: Marc Kleine-Budde Date: Mon Feb 21 12:41:55 2011 +0100 ax88796: use generic mdio_bitbang driver ..instead of using hand-crafted and not proper working version. Signed-off-by: Marc Kleine-Budde commit 5710fabf315efcd53c54ad4ecc6158f2964745e3 Author: Antonio Ospite Date: Sun Feb 20 18:26:45 2011 +0100 HID: hid-sony.c: Fix sending Output reports to the Sixaxis The Sixaxis does not want the report_id as part of the data packet in Output reports, so we have to discard buf[0] when sending the actual control message. Add also some documentation about that and about why hdev->hid_output_raw_report needs to be overridden. Signed-off-by: Antonio Ospite Signed-off-by: Jiri Kosina commit c9218c3a8231c0a67662d85266698f2f037cac20 Author: Marc Kleine-Budde Date: Mon Feb 21 11:24:39 2011 +0100 ax88796: clean up probe and remove function This way we can remove the struct resource pointers from the private data. Signed-off-by: Marc Kleine-Budde commit a54dc58511644a22ae0d57d857e154cddf6d7926 Author: Marc Kleine-Budde Date: Mon Feb 21 10:43:31 2011 +0100 ax88796: make pointer to platform data const Signed-off-by: Marc Kleine-Budde commit 0f442f5a3c25dd4df3fecb25819dc269c9222bdf Author: Marc Kleine-Budde Date: Sun Feb 20 19:13:20 2011 +0100 ax88796: remove platform_device member from struct ax_device Signed-off-by: Marc Kleine-Budde commit 85ac6162c94638c7f27afa4bf63f165a6ca5e931 Author: Marc Kleine-Budde Date: Sun Feb 20 17:46:18 2011 +0100 ax88796: use netdev_ instead of dev_ and pr_ Signed-off-by: Marc Kleine-Budde commit 1cbece33ff657cfc9782963d502f3c3be07c0317 Author: Marc Kleine-Budde Date: Sat Feb 19 23:07:09 2011 +0100 ax88796: remove first_init parameter from ax_init_dev() ax_init_dev() is always called with first_init=1. Signed-off-by: Marc Kleine-Budde commit 2f9709dbdf2777c88b7f1f9a8283119f17f7373e Author: Marc Kleine-Budde Date: Sat Feb 19 22:12:27 2011 +0100 ax88796: remove memset of private data It's allocated via alloc_netdev, thus already zeroed. Signed-off-by: Marc Kleine-Budde commit ea5a43db0f7123c5cb459d8f77454534bc62de4f Author: Marc Kleine-Budde Date: Sat Feb 19 22:08:33 2011 +0100 ax88796: don't use magic ei_status to acces private data Signed-off-by: Marc Kleine-Budde commit 9f072429592d70b0f88c4d66f83735cc693a9870 Author: Marc Kleine-Budde Date: Sat Feb 19 17:07:40 2011 +0100 ax88796: fix codingstyle and checkpatch warnings Signed-off-by: Marc Kleine-Budde commit 442a4fffffa26fc3080350b4d50172f7589c3ac2 Author: Jarod Wilson Date: Mon Feb 21 21:43:10 2011 +1100 random: update interface comments to reflect reality At present, the comment header in random.c makes no mention of add_disk_randomness, and instead, suggests that disk activity adds to the random pool by way of add_interrupt_randomness, which appears to not have been the case since sometime prior to the existence of git, and even prior to bitkeeper. Didn't look any further back. At least, as far as I can tell, there are no storage drivers setting IRQF_SAMPLE_RANDOM, which is a requirement for add_interrupt_randomness to trigger, so the only way for a disk to contribute entropy is by way of add_disk_randomness. Update comments accordingly, complete with special mention about solid state drives being a crappy source of entropy (see e2e1a148bc for reference). Signed-off-by: Jarod Wilson Acked-by: Matt Mackall Signed-off-by: Herbert Xu commit ce92136843cb6e14aba5fd7bc4e88dbe71e70c5a Author: Jamie Iles Date: Mon Feb 21 16:43:21 2011 +1100 crypto: picoxcell - add support for the picoxcell crypto engines Picochip picoXcell devices have two crypto engines, one targeted at IPSEC offload and the other at WCDMA layer 2 ciphering. Signed-off-by: Jamie Iles Signed-off-by: Herbert Xu commit 69efcc6d90d234a3a076afb2c635c1609536faa4 Author: Yinghai Lu Date: Mon Feb 21 10:58:13 2011 +0100 x86-64, NUMA: Do not scan two times for setup_node_bootmem() By the time setup_node_bootmem() is called, all the memblocks are already registered. As node_data is allocated from these memblocks, calling it more than once doesn't make any difference. Drop the loop. tj: Dropped comment referencing to the old behavior as suggested by David and rephrased the description. Signed-off-by: Yinghai Lu Acked-by: David Rientjes Signed-off-by: Tejun Heo commit 24d51add7438f9696a7205927bf9de3c5c787a58 Author: Tejun Heo Date: Mon Feb 21 09:52:50 2011 +0100 workqueue: fix build failure introduced by s/freezeable/freezable/ wq:fixes-2.6.38 does s/WQ_FREEZEABLE/WQ_FREEZABLE and wq:for-2.6.39 adds new usage of the flag. The combination of the two creates a build failure after merge. Fix it by renaming all freezeables to freezables. Signed-off-by: Tejun Heo Reported-by: Stephen Rothwell commit 163d27706bb91a648cc292151fc072e1e8cd4b4d Author: Dan Carpenter Date: Fri Feb 18 08:30:52 2011 -0800 Input: uinput - reversed test in uinput_setup_device() The test here is reversed. It should be if (IS_ERR()) instead of if (!IS_ERR()). Signed-off-by: Dan Carpenter Signed-off-by: Dmitry Torokhov commit 919ed895f0b4227da26ea1b0a1347db5010f105e Author: Iiro Valkonen Date: Tue Feb 15 13:36:52 2011 -0800 Input: atmel_mxt_ts - allow board code to specify IRQ flags Different board have different requirements/setups so let's be more flexible. Signed-off-by: Iiro Valkonen Signed-off-by: Dmitry Torokhov commit 71749f5c66e797a39600dae9de58aab3858dc488 Author: Iiro Valkonen Date: Tue Feb 15 13:36:52 2011 -0800 Input: atmel_mxt_ts - allow board code to suppliy controller config As there is no common configuration settings that would work in every situation, remove the fixed config data from driver code and add config data to platform data. Signed-off-by: Iiro Valkonen Signed-off-by: Dmitry Torokhov commit 46ee2a05a466ca7e34d65fe3feba195d62109362 Author: Chris Leech Date: Tue Feb 15 13:36:52 2011 -0800 Input: atmel_mxt_ts - add mXT224 identifier to id_table "mXT224" is used in the Intel mid firmware in SFI tables to identify the presence of this I2C device. Signed-off-by: Chris Leech Signed-off-by: Dmitry Torokhov commit 87b2c7df329e547c1905e0b7e13bfce09cfa5cfe Author: Mark Brown Date: Fri Feb 11 08:53:33 2011 -0800 Input: synaptics_i2c - convert to dev_pm_ops There is a general move to convert drivers to dev_pm_ops rather than bus specific PM ops in order to facilitate core development. Do this converison for synaptics-i2c. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 3dcab3bdd9cbf45433fc4e1514f3144638652e2b Author: Mark Brown Date: Fri Feb 11 08:53:04 2011 -0800 Input: adxl34x - fix references to adx134x The adxl34x SPI driver has what appears to be a typo referring to the device as adx134x with the numeral 1 rather than letter l. This appears to be an error so convert. Signed-off-by: Mark Brown Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit 4d1ac94e2e3cd15f06ffc74efa42d6572fdf7689 Author: Mark Brown Date: Fri Feb 11 09:22:40 2011 -0800 Input: adxl34x-spi - convert to dev_pm_ops There is a general move to convert drivers to use dev_pm_ops rather than bus specific ones in order to facilitate core development. Do this conversion for adxl34x-spi. Signed-off-by: Mark Brown Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit fbb899356d4a6b6080ab3d9656914938db49449e Author: Mark Brown Date: Fri Feb 11 08:51:52 2011 -0800 Input: adxl34x-i2c - convert to dev_pm_ops There is a general move to convert drivers to use dev_pm_ops rather than bus specific ones in order to facilitate core development. Do this conversion for adxl34x-i2c. Signed-off-by: Mark Brown Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit 76e2c68f3214c3a641b9e489cdaea035bfbc8060 Author: Mark Brown Date: Fri Feb 11 08:51:13 2011 -0800 Input: max7359 - convert to dev_pm_ops There is a general move to convert drivers to use dev_pm_ops rather than bus specific ops to facilitate core work. Do this conversion for max7359. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 65b0c03852d75e4d7d0bc282344b1500fe471725 Author: Mark Brown Date: Fri Feb 11 08:50:37 2011 -0800 Input: lm8323 - convert to dev_pm_ops There is a general move away from bus specific PM operations to using dev_pm_ops in order to facilicate core improvements. Update lm8323 to the new model. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit a257090cd4e26b96667a15262f322e51f6582507 Author: Mark Brown Date: Fri Feb 11 08:49:37 2011 -0800 Input: ad714x-spi - convert to dev_pm_ops There is a general move to convert drivers to use dev_pm_ops rather than bus specific PM operations in order to facilitate core work. Do this conversion for ad714x-spi. Signed-off-by: Mark Brown Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit 6b7cfd193a00ba72efb19a05c486f96ae9297d0b Author: Mark Brown Date: Fri Feb 11 08:49:05 2011 -0800 Input: ad714x-i2c - convert to dev_pm_ops There is a general move to convert drivers to use dev_pm_ops rather than bus specific PM operations in order to facilitate core work. Do this conversion for ad714x-i2c. Signed-off-by: Mark Brown Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit 4dfcc271d587465f0d181c7636453ba4d0ec8acc Author: Dmitry Torokhov Date: Fri Feb 11 01:10:45 2011 -0800 Input: uinput - use memdup_user() and friends Instead of open-coding copying of data structures from userspace use memdup_user() and strndup_user(). Note that this introduces change in behavior because driver used to truncate 'phys' longer than 1024 bytes, but now it will refuse to set 'phys' that long. Arguably trying to set such 'phys' is suspect anyways. Signed-off-by: Dmitry Torokhov commit 5d9d6e91b835796c21fbd7ce479880e5181be112 Author: David Herrmann Date: Fri Feb 11 01:10:44 2011 -0800 Input: uinput - fix setting up device name The check for non-empty device name was botched since we tried to account for extra space for the terminating zero at the same time. Convert to kstrndup() to avoid this problem. Signed-off-by: David Herrmann Acked-by: Aristeu Rozanski Signed-off-by: Dmitry Torokhov commit 26cdb1ae76f842e895ef4d09796a9101a7f8746b Author: Iiro Valkonen Date: Fri Feb 4 00:51:05 2011 -0800 Input: atmel_mxt_ts - read whole message to make CHG low Read the whole message, as reading just the first byte isn't always guaranteed to clear the message. Signed-off-by: Iiro Valkonen Signed-off-by: Dmitry Torokhov commit 7686b108d8ef5c32f429d5228798636f3a1caf5a Author: Iiro Valkonen Date: Wed Feb 2 23:21:58 2011 -0800 Input: atmel_mxt_ts - get rid of qt602240 prefixes in names Change prefixes from qt602240 to mxt to reflect that the driver supports whole line of mXT touchscreens. Signed-off-by: Iiro Valkonen Signed-off-by: Dmitry Torokhov commit 964de52147c2842092642512e6f654fc2ab51408 Author: Dmitry Torokhov Date: Wed Feb 2 23:21:58 2011 -0800 Input: qt602240_ts - rename to atmel_mxt_ts Since the driver will be supporting whole range of Atmels mXT touchscreen controllers we better rename it to atmel_mxt_ts. Acked-by: Iiro Valkonen Signed-off-by: Dmitry Torokhov commit 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 Merge: 4149efb 6f576d5 Author: Tejun Heo Date: Mon Feb 21 09:43:56 2011 +0100 Merge branch 'master' into for-2.6.39 commit 9c7dc562cd78784f54261b9bedb44e8b0056f729 Author: Colin Cross Date: Sat Feb 12 21:25:23 2011 -0800 ARM: tegra: clock: Miscellaneous clock updates Correct max rates for pclk and sclk (Originally fixed by Dima Zavin ) Correct max rate for plla (Originally fixed by Stephen Warren ) Remove unnecessary no-op set_rate on audio clocks Add clock lookup entries for grhost, bsea, and vde clocks Update clock clookup entries for vcp, bsea, and vde clocks Add shared clock entries for sclk and emc Add a virtual cop clock to provide a reset op (Originally fixed by Dima Zavin ) Pass set_rate on super clocks through to parent Fix pllx frequency table entry for 608 MHz Remove incorrect plla frequency table entries Acked-by: Olof Johansson Signed-off-by: Colin Cross commit c2f44a9df9e1f8974911ef538565e301b38e0680 Author: Colin Cross Date: Tue Oct 26 17:33:31 2010 -0700 ARM: tegra: clock: Fix clock issues in suspend The PLLP registers are now being restored by the low-level resume code, and the CPU may be running off PLLP, so don't touch them during clock resume. Save plld, plls, pllu, and audio clock during suspend (originally fixed by Mayuresh Kulkarni ) The lock time for plld is 1000 us, so increase the delay after setting the PLLs. Add a BUG_ON to ensure the size of the suspend context area is correct. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 9743b38969790d33b077ab80b175ea63a0398703 Author: Colin Cross Date: Sat Feb 12 18:24:32 2011 -0800 ARM: tegra: clock: Add function to set SDMMC tap delay The SDMMC controllers have extra bits in the clock source register that adjust the delay between the clock and data to compenstate for delays on the PCB. The values need to be set from the clock code so the clock can be locked during the read-modify-write on the clock source register. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 7a281284125fe8704ea16fd1ca243971b7c0a105 Author: Colin Cross Date: Mon Nov 22 18:54:36 2010 -0800 ARM: tegra: cpufreq: Adjust memory frequency with cpu frequency Adjusts the minimum memory frequency when the cpu frequency changes. The values are currently hardcoded to a reasonable default. If memory frequency scaling is not enabled this patch will have no effect. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 6d2968284f63efa1d1849165f9e3a80402509212 Author: Colin Cross Date: Mon Nov 22 18:37:54 2010 -0800 ARM: tegra: clocks: Add emc scaling Add clock ops on the emc peripheral clock that call into the emc driver to update the memory controller registers for the new frequency. Tegra has an interlock between the clock controller and the memory controller that prevents the new register values from taking effect until the clock frequency update occurs. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit efdf72ad5c42b529286a1991f51badb030043719 Author: Colin Cross Date: Sat Feb 12 18:22:49 2011 -0800 ARM: tegra: Add external memory controller driver The frequency memory bus on Tegra can be adjusted without disabling accesses to memory by updating the memory configuration registers from a per-board table, and then changing the clock frequency. The clock controller and memory controller have an interlock that prevents the new memory registers from taking effect until the clock frequency change. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 0fd857ae09c455f0036bf548fb6ec26b3049f5de Author: Sergei Shtylyov Date: Fri Feb 18 23:44:32 2011 +0300 usb: musb: gadget: DBG() already prints function name In the gadget code, there are several DBG() macro invocations that explicitly print the calling function's name while DBG() macro itself does this anyway; most of these were added by commit f11d893de444965dfd3e55f726533ae1df5c6471 (usb: musb: support ISO high bandwidth for gadget mode). Remove the duplicated printing, somewhat clarifying the messages at the same time... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi commit 4db4afb4df93425708ca19417921bcc6a6306476 Author: Colin Cross Date: Sun Feb 20 23:35:07 2011 -0800 ARM: tegra: clock: Minor cleanups Remove unnecessary uses of #ifdef CONFIG_DEBUG_FS Convert bool assignments from 1 to true Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 310992ca4b994db8c869e1c0f32c004b7a196147 Author: Colin Cross Date: Sat Feb 12 16:14:03 2011 -0800 ARM: tegra: clock: Add shared bus clock type Some clocks may have multiple downstream users that need to request a higher clock rate. Shared bus clocks provide a unique shared_bus_user clock to each user. The frequency of the bus is set to the highest enabled shared_bus_user clock, with a minimum value set by the shared bus. Drivers can use clk_enable and clk_disable to enable or disable their requirement, and clk_set_rate to set the minimum rate. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 89a5fb84dabdf6daeae7d5301a6b1ae4754425dd Author: Colin Cross Date: Wed Oct 20 17:47:59 2010 -0700 ARM: tegra: cpufreq: Take an extra reference to pllx During cpu frequency changes, take an extra reference to pllx so that it doesn't turn off and on while the cpu is temporarily on pllp. If the cpu is moved to pllp permanently, pllx will be turned off. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 4729fd7a7dfe7847b4870801ad12222adaeb016c Author: Colin Cross Date: Sat Feb 12 16:43:05 2011 -0800 ARM: tegra: clock: Convert global lock to a lock per clock Give each clock its own lock, and remove all lock traversals from parent to child clocks to prevent AB-BA deadlocks. This brings the locking in line with the common struct clk patches and should make conversion simple. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit f151961173bf28047d01b410969f05e485f56d7e Author: Colin Cross Date: Sat Feb 12 16:05:31 2011 -0800 ARM: tegra: clock: Move unshared clk struct members into union Creates a union of a struct for each type of clock to reduce memory usage and clarify which members are used by all clocks and which are used by a single type. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 3ec349fbf1e88e84d4dffc54b6cb32129a32b7b0 Author: Colin Cross Date: Sat Feb 12 15:52:56 2011 -0800 ARM: tegra: clock: Rearrange static clock tables Make the static clocks look more like the array of clocks so they can all be initalized with the same helper function. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 41cfe3676d0f4f07ba79d4f64a21450ab02d22cd Author: Colin Cross Date: Sat Feb 12 15:52:04 2011 -0800 ARM: tegra: clock: Drop CPU dvfs The existing version did not extend well to core dvfs, drop it for now until the new clk api with clk_prepare and clk_unprepare is ready and non-atomic clocks are possible. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit f035530b799a9c945415ad2139bb6494b542639a Author: Colin Cross Date: Wed Oct 13 19:16:02 2010 -0700 ARM: tegra: clock: Initialize clocks that have no enable Assume that any clock that has no enable op is always on. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 35c47c3bbaa82b046d645aed2b709ce12ef0e25e Author: Colin Cross Date: Thu Sep 16 14:59:49 2010 -0700 ARM: tegra: clock: Don't use PLL lock bits The PLL lock bits are not reliable, use per-PLL timeouts instead. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit bd41ef55e88ae03381569e51ad6ff3bab35e7b0e Author: Colin Cross Date: Wed Sep 8 20:01:04 2010 -0700 ARM: tegra: clock: Drop debugging Drop the unnecessary pr_debug calls to avoid having to maintain them. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 14133add42928d6759f35f5d94938adf2cda2bb6 Author: Colin Cross Date: Wed Sep 8 19:41:58 2010 -0700 ARM: tegra: clock: Don't BUG on changing an enabled PLL When updating the CPU PLL frequency, keeping the PLL enabled avoids ramping the PLL all the way down and back up again. Remove the BUG_ON in tegra2_pll_clk_set_rate to allow the rate to change while the PLL is enabled. Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 2b84cb4faab698b1708ce841c554546b1c9b2261 Author: Dima Zavin Date: Thu Sep 2 19:11:11 2010 -0700 ARM: tegra: clock: enable clk reset for non-peripheral clocks Add a new 'reset' clk op. This can be provided for any clock, not just peripherals. Signed-off-by: Dima Zavin Acked-by: Olof Johansson Signed-off-by: Colin Cross commit 375b19cd34ea9b1ab338deac20b4bd2c553bf57b Author: Simon Glass Date: Thu Feb 17 08:13:57 2011 -0800 ARM: tegra: Fix hang on reboot This seems to be a regression in 2.6.37. We cannot use writel() here since the resulting wmb() calls l2x0_cache_sync() which uses a spinlock and L1 cache may be off at this point. http://lists.infradead.org/pipermail/linux-arm-kernel/2011-February/041909.html Signed-off-by: Simon Glass Signed-off-by: Colin Cross commit 1ca00347c579f15b0eea1a6d4bab84e2cf56e745 Author: Stephen Warren Date: Wed Jan 5 14:32:20 2011 -0700 ARM: tegra: APB DMA: Enable clock and remove reset. Signed-off-by: Stephen Warren Signed-off-by: Colin Cross commit b4e1b7e88b2c87c358c2a88bec0c76d25accc604 Author: Tao Ma Date: Mon Feb 21 11:19:43 2011 +0800 ocfs2: Make the left masklogs compat. Since we have removed almost all of the masklogs in fs/ocfs2/*, make the left masklogs compat. Signed-off-by: Tao Ma commit 75ba49ae0637c15880fe8f1c8a89333afa052bd8 Author: Tao Ma Date: Mon Feb 21 11:19:27 2011 +0800 ocfs2: Remove masklog ML_AIO. There is no user for masklog AIO, so remove it. Signed-off-by: Tao Ma commit d701485a6246486fda0ee58457b82a81562a7bc4 Author: Tao Ma Date: Thu Feb 24 16:22:20 2011 +0800 ocfs2: Remove masklog ML_UPTODATE. Remove mlog(0,...) and mlog(ML_UPTODATE,...) from fs/ocfs2/uptodate.c and fs/ocfs2/buffer_head_io.c. The masklog UPTODATE is removed finally. Signed-off-by: Tao Ma commit 15057e981abb3436c16835af1001447056a809b5 Author: Tao Ma Date: Thu Feb 24 16:09:38 2011 +0800 ocfs2: Remove masklog ML_BH_IO. Remove mlog(0,...) and mlog(ML_BH_IO,...) from fs/ocfs2/buffer_head_io.c. The masklog BH_IO is removed finally. Signed-off-by: Tao Ma commit b41079504c786eb226e7e1e3dc5cc1f37fbd1c2b Author: Tao Ma Date: Thu Feb 24 14:15:35 2011 +0800 ocfs2: Remove masklog ML_JOURNAL. Remove mlog(0) from fs/ocfs2/journal.c and the masklog JOURNAL. Signed-off-by: Tao Ma commit 781f200cb7a657339c8760984870c252701aa485 Author: Tao Ma Date: Thu Feb 24 13:50:19 2011 +0800 ocfs2: Remove masklog ML_EXPORT. Remove mlog(0) from fs/ocfs2/export.c and the masklog EXPORT. Signed-off-by: Tao Ma commit a5b8443b34d57c6c6e3f8180d9f88890f3625a4b Author: Tao Ma Date: Wed Feb 23 22:51:49 2011 +0800 ocfs2: Remove masklog ML_DCACHE. Remove mlog(0) from fs/ocfs2/dcache.c and the masklog DCACHE. Signed-off-by: Tao Ma commit 8990e44a2bceaa68018fb13000e3a4497d78a53c Author: Tao Ma Date: Wed Feb 23 22:45:26 2011 +0800 ocfs2: Remove masklog ML_NAMEI. Remove mlog(0) from fs/ocfs2/namei.c and the masklog NAMEI finally. Signed-off-by: Tao Ma commit f1088d471f8d846e817eb4d673212d18d9820c61 Author: Tao Ma Date: Wed Feb 23 22:30:23 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/dir.c This is the 2nd step to remove the debug info of NAMEI. Signed-off-by: Tao Ma commit f32037d9bda37ca9a7a179cc1546033d374a8541 Author: Tao Ma Date: Mon Feb 21 11:19:02 2011 +0800 ocfs2: remove NAMEI from symlink.c No mlog(0,...) in symlink.c, so just remove NAMEI. Signed-off-by: Tao Ma commit 1db986a839d8acf8ad809c876f1154f2e672d3af Author: Tao Ma Date: Wed Feb 23 22:19:12 2011 +0800 ocfs2: Remove masklog ML_QUOTA. Remove mlog(0) from fs/ocfs2/quota_global.c and the masklog QUOTA. Signed-off-by: Tao Ma commit 38877a43795d3a834fad827f3d6532ff649e5c45 Author: Tao Ma Date: Wed Feb 23 22:12:48 2011 +0800 ocfs2: Remove mlog(0) from quota_local.c. Remove mlog(0) from fs/ocfs2/quota_local.c. Signed-off-by: Tao Ma commit 2661836e0ca07f57505563ec31aeee20b1758987 Author: Tao Ma Date: Wed Feb 23 22:10:56 2011 +0800 ocfs2: Remove masklog ML_RESERVATIONS. Remove mlog(0) from fs/ocfs2/reservations.c and the masklog RESERVATIONS. Signed-off-by: Tao Ma commit 402b418311f0d20a71451770d764a2e37b08dbcf Author: Tao Ma Date: Wed Feb 23 22:01:17 2011 +0800 ocfs2: Remove masklog ML_XATTR. Remove mlog(0) from fs/ocfs2/xattr.c and the masklog ML_XATTR. Signed-off-by: Tao Ma commit 32a42d392bf9b8f90f41434ccb3605e958b16251 Author: Tao Ma Date: Wed Feb 23 21:29:08 2011 +0800 ocfs2: Remove masklog ML_SUPER. Remove mlog(0) from fs/ocfs2/super.c and the masklog SUPER. Signed-off-by: Tao Ma commit b5770f98b00e94dd573e3438427de09733fe2039 Author: Tao Ma Date: Wed Feb 23 21:17:39 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c This is the 2nd step to remove the debug info of SUPER. Signed-off-by: Tao Ma commit a8731086eff053b430cddbf5783654dfd700ea06 Author: Tao Ma Date: Tue Feb 22 22:29:08 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c This is the 1st step to remove the debug info of SUPER. Signed-off-by: Tao Ma commit a716357c47ea1cc4f535356cff2c39edd327136b Author: Tao Ma Date: Tue Feb 22 22:27:33 2011 +0800 ocfs2: Remove masklog ML_EXTENT_MAP. Remove mlog(0) from fs/ocfs2/extent_map.c and the masklog EXTENT_MAP. Signed-off-by: Tao Ma commit 64f3b2692724fdbe72697b77887685b5bd3f4a3c Author: Tao Ma Date: Tue Feb 22 22:24:57 2011 +0800 ocfs2: Remove masklog ML_INODE. Remove mlog(0) from fs/ocfs2/inode.c and the masklog INODE. Signed-off-by: Tao Ma commit 6218b90e7669d83cb8ad744f3400205d260597f2 Author: Tao Ma Date: Mon Feb 21 11:18:30 2011 +0800 ocfs2: Little refactoring against ocfs2_iget. ocfs2_iget is used to get/create inode. Only iget5_locked will give us an inode = NULL. So move this check ahead of ocfs2_read_locked_inode so that we don't need to check inode before we read and unlock inode. This is also helpful for trace event(see the next patch). Signed-off-by: Tao Ma commit 468eedde23d6c9335935773f4f5764267d5a7763 Author: Tao Ma Date: Tue Feb 22 22:14:41 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/file.c This is the 2nd step to remove the debug info of INODE. Signed-off-by: Tao Ma commit da561c9cfa3022f6134ef52686d52931d3d1df3d Author: Tao Ma Date: Mon Feb 21 11:18:23 2011 +0800 ocfs2: remove INODE from unused files. As there are no such debug information in fs/ocfs2/ioctl.c, fs/ocfs2/locks.c and fs/ocfs2/sysfile.c, ML_INODE are also removed. Signed-off-by: Tao Ma commit 614a9e849ca6ea24843795251cb30af525d5336b Author: Tao Ma Date: Tue Feb 22 21:59:46 2011 +0800 ocfs2: Remove FILE_IO from masklog. Change all the "mlog(0," in fs/ocfs2/mmap.c to trace events. And finally remove masklog FILE_IO. Signed-off-by: Tao Ma commit 9558156bcf8e4750d20034e941213273743ed86a Author: Tao Ma Date: Tue Feb 22 21:33:59 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/aops.c Remove all the "mlog(0," in fs/ocfs2/aops.c. Signed-off-by: Tao Ma commit 198aac2838731691ca67e15fd8a56f65307d3677 Author: Tao Ma Date: Tue Feb 22 08:20:04 2011 +0800 ocfs2: Remove masklog ML_REFCOUNT. Change all the "mlog(0," in fs/ocfs2/refcounttree.c to trace events. And finally remove masklog ML_REFCOUNT. Signed-off-by: Tao Ma commit 81bad69749623062fae2f94e2d98dd43d95a36f4 Author: Tao Ma Date: Tue Feb 22 08:01:27 2011 +0800 ocfs2: Remove DISK_ALLOC from masklog. Since all 4 files, localalloc.c, suballoc.c, alloc.c and resize.c, which use DISK_ALLOC are changed to trace events, Remove masklog DISK_ALLOC totally. Signed-off-by: Tao Ma commit a5438702ee63b13710c497bb22c7952a7e5d6a52 Author: Tao Ma Date: Tue Feb 22 08:24:01 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c This is the 4th step to remove the debug info of DISK_ALLOC. Signed-off-by: Tao Ma commit 2f73e135b83c5001dad84cbd1d445d23fd045b83 Author: Tao Ma Date: Tue Feb 22 08:22:33 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c This is the 3rd step to remove the debug info of DISK_ALLOC. Signed-off-by: Tao Ma commit a04733d8afad9cd0bfb8269173e30d28fb96088e Author: Tao Ma Date: Tue Feb 22 07:56:45 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/localalloc.c This is the 2nd step to remove the debug info of DISK_ALLOC. So this patch removes all mlog(0,...) from localalloc.c and adds the corresponding tracepoints. Different mlogs have different solutions. 1. Some are replaced with trace event directly. 2. Some are replaced while some new parameters are added. 3. Some are combined into one trace events. 4. Some redundant mlogs are removed. Signed-off-by: Tao Ma commit a09d09b8f8d7c8acd46d96e3e9899bd1461fc036 Author: Tao Ma Date: Tue Feb 22 08:21:10 2011 +0800 ocfs2: Remove mlog(0) from fs/ocfs2/alloc.c This is the first try of replacing debug mlog(0,...) to trace events. Wengang has did some work in his original patch http://oss.oracle.com/pipermail/ocfs2-devel/2009-November/005513.html But he didn't finished it. So this patch removes all mlog(0,...) from alloc.c and adds the corresponding trace events. Different mlogs have different solutions. 1. Some are replaced with trace event directly. 2. Some are replaced and some new parameters are added since I think we need to know the btree owner in that case. 3. Some are combined into one trace events. 4. Some redundant mlogs are removed. What's more, it defines some event classes so that we can use them later. Cc: Wengang Wang Signed-off-by: Tao Ma commit 80a9a84da381087ed89f5fdfc40a513cf9768ac4 Author: Wengang Wang Date: Mon Feb 21 11:13:14 2011 +0800 ocfs2: Add ocfs2_trace.h. About one year ago, Wengang Wang tried some first steps to add tracepoints to ocfs2. Hiss original patch is here: http://oss.oracle.com/pipermail/ocfs2-devel/2009-November/005512.html But as Steven Rostedt indicated in his article http://lwn.net/Articles/383362/, we'd better have our trace files resides in fs/ocfs2, so I rewrited the patch using the method Steven mentioned in that article. Signed-off-by: Wengang Wang Signed-off-by: Tao Ma commit c1e8d35ef5ffb393b94a192034b5e3541e005d75 Author: Tao Ma Date: Mon Mar 7 16:43:21 2011 +0800 ocfs2: Remove EXIT from masklog. mlog_exit is used to record the exit status of a function. But because it is added in so many functions, if we enable it, the system logs get filled up quickly and cause too much I/O. So actually no one can open it for a production system or even for a test. This patch just try to remove it or change it. So: 1. if all the error paths already use mlog_errno, it is just removed. Otherwise, it will be replaced by mlog_errno. 2. if it is used to print some return value, it is replaced with mlog(0,...). mlog_exit_ptr is changed to mlog(0. All those mlog(0,...) will be replaced with trace events later. Signed-off-by: Tao Ma commit ef6b689b63b9f5227ccee6f16dd9ee3faf58a464 Author: Tao Ma Date: Mon Feb 21 11:10:44 2011 +0800 ocfs2: Remove ENTRY from masklog. ENTRY is used to record the entry of a function. But because it is added in so many functions, if we enable it, the system logs get filled up quickly and cause too much I/O. So actually no one can open it for a production system or even for a test. So for mlog_entry_void, we just remove it. for mlog_entry(...), we replace it with mlog(0,...), and they will be replace by trace event later. Signed-off-by: Tao Ma commit 59ed5aba9ca1c799e272b352d5d2d7fe12bd32e8 Author: Shan Wei Date: Sat Feb 19 21:57:26 2011 +0000 sctp: fix compile warnings in sctp_tsnmap_num_gabs net/sctp/tsnmap.c: In function ‘sctp_tsnmap_num_gabs’: net/sctp/tsnmap.c:347: warning: ‘start’ may be used uninitialized in this function net/sctp/tsnmap.c:347: warning: ‘end’ may be used uninitialized in this function Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 089c34827e52346f0303d1e6a7b744c1f4da3095 Author: Shan Wei Date: Sat Feb 19 21:55:45 2011 +0000 tcp: Remove debug macro of TCP_CHECK_TIMER Now, TCP_CHECK_TIMER is not used for debuging, it does nothing. And, it has been there for several years, maybe 6 years. Remove it to keep code clearer. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 81146ec1b85067e70b71e81b5ecd9998ce054c0e Author: Ilpo Järvinen Date: Sat Feb 19 21:52:41 2011 +0000 tcp: document tcp_max_ssthresh (Limited Slow-Start) Base on Ilpo's patch about documenting tcp_max_ssthresh. (see http://marc.info/?l=linux-netdev&m=117950581307310&w=2) According to errata of RFC3742, fix the number of segments increased during RTT time. Just to state the occasion to use this parameter, But about how to set parameter value, maybe some others can do it. Signed-off-by: Ilpo Järvinen Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 1396fa9cd2e34669253b7ca8c75f12103481f71c Author: Dan Carpenter Date: Fri Feb 18 12:17:16 2011 +0300 x86, microcode, AMD: Fix signedness bug in generic_load_microcode() install_equiv_cpu_table() returns type int. It uses negative error codes so using an unsigned type breaks the error handling. Signed-off-by: Dan Carpenter Acked-by: Borislav Petkov Cc: open list:AMD MICROCODE UPD... Cc: Andreas Herrmann LKML-Reference: <20110218091716.GA4384@bicker> Signed-off-by: Ingo Molnar commit 2b15cd96e5e93f9aa4f7041c91c1e7c344a62cbb Author: Borislav Petkov Date: Fri Feb 18 16:47:36 2011 +0100 x86, system.h: Drop unused __SAVE/__RESTORE macros Those are unused since at least the beginning of git history. Signed-off-by: Borislav Petkov LKML-Reference: <1298044056-31104-1-git-send-email-bp@amd64.org> Signed-off-by: Ingo Molnar commit 1936a267f1b5a32d4a846608fdcce82ca0f6ac8e Author: Tristan Ye Date: Sun Jan 30 14:25:59 2011 +0800 Ocfs2: Using macro to set/clear *FILLED* flags in info handler. It's a best-effort attempt to simplize duplicated codes here. Signed-off-by: Tristan Ye Signed-off-by: Joel Becker commit 1dd9ffc827b8591aabcf5fea6ea83b69e846deb9 Author: Tao Ma Date: Mon Jan 24 23:23:30 2011 +0800 ocfs2: optimize ocfs2_check_dir_entry() with unlikely() annotations In cad3f00, ext4_check_dir_entry was modified by adding some unlikely. Ted described it as "This function gets called a lot for large directories, and the answer is almost always 'no, no, there's no problem'. This means using unlikely() is a good thing." ext3 added the similar change in commit a4ae309. So change it accordingly in ocfs2. Cc: Joel Becker Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit 5bc970e803ad2b1f26771f39376a79dbf0f5bf64 Author: Sunil Mushran Date: Tue Dec 28 23:26:03 2010 -0800 ocfs2: Use hrtimer to track ocfs2 fs lock stats Patch makes use of the hrtimer to track times in ocfs2 lock stats. The patch is a bit involved to ensure no additional impact on the memory footprint. The size of ocfs2_inode_cache remains 1280 bytes on 32-bit systems. A related change was to modify the unit of the max wait time from nanosec to microsec allowing us to track max time larger than 4 secs. This change necessitated the bumping of the output version in the debugfs file, locking_state, from 2 to 3. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 01cb7021584c4c70f7c5596ac2147b494a144053 Author: Raymond Yau Date: Sun Feb 20 15:55:14 2011 +0800 ALSA - au88x0 - add Playback Volume to 10 bands Equalizer Controls Add " Playback Volume" to 10 bands Equalizer Controls of au88x0 so that alsa-lib won't regard them as "Capture Volume". Signed-off-by: Raymond Yau Signed-off-by: Takashi Iwai commit da935c66bacb3ed9ada984b053297f87c2dff63a Merge: 9435eb1 2205a6e Author: David S. Miller Date: Sat Feb 19 19:17:35 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: Documentation/feature-removal-schedule.txt drivers/net/e1000e/netdev.c net/xfrm/xfrm_policy.c commit 499ef7a5c48ea9fe8034b61de304ce9f6b753fe7 Author: Stephen Warren Date: Wed Jan 5 14:24:12 2011 -0700 ARM: tegra: Prevent requeuing in-progress DMA requests If a request already in the queue is passed to tegra_dma_enqueue_req, tegra_dma_req.node->{next,prev} will end up pointing to itself instead of at tegra_dma_channel.list, which is the way a the end-of-list should be set up. When the DMA request completes and is list_del'd, the list head will still point at it, yet the node's next/prev will contain the list poison values. When the next DMA request completes, a kernel panic will occur when those poison values are dereferenced. This makes the DMA driver more robust in the face of buggy clients. Signed-off-by: Stephen Warren Signed-off-by: Colin Cross commit fe92a026e30050d5c79b2d41274211550a14cb04 Merge: cca414b 47f5ae5 Author: Colin Cross Date: Sat Feb 19 14:35:16 2011 -0800 Merge branch 'tegra-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into outside-for-next commit 3ba6e69ad887f8a814267ed36fd4bfbddf8855a9 Author: Dave Martin Date: Tue Feb 8 12:09:52 2011 +0100 ARM: 6653/1: bitops: Use BX instead of MOV PC,LR The kernel doesn't officially need to interwork, but using BX wherever appropriate will help educate people into good assembler coding habits. BX is appropriate here because this code is predicated on __LINUX_ARM_ARCH__ >= 6 Signed-off-by: Dave Martin Acked-by: Nicolas Pitre Signed-off-by: Russell King commit 6ba9256c09b0ab394d0fadbfb86d8f4dfba8846b Author: Andreas Mohr Date: Sat Feb 19 00:49:48 2011 +0100 ALSA: azt3328: hook up new emulated AC97 on AC97 patch side Make newly created AC97 emulation of azt3328 known to the AC97 layer side. - relocate common functions to the top (due to definition after use) - rename control names - adjust 3D settings to the card's custom layout of this register Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit b5dc20cd21357ea3663d428e42fcf9d167bb7aa2 Author: Andreas Mohr Date: Sat Feb 19 00:49:32 2011 +0100 ALSA: azt3328: add custom AC97 semi-emulation use standard ALSA AC97 layer Make use of the very flexible ALSA ac97 layer (hooks for custom I/O!) on this weird AC97 copycat hardware, via semi-extended I/O translation/emulation. Some 5kB binary/loaded size saved (well... additional huge AC97 module penalty not factored in, of course ;-P). Given that the driver previously had 20kB that's not bad, but the much more important thing is to have AC97 layer stress-tested with a thoroughly weird AC97 copycat (or, simply put, if it were not for this AC97 test aspect, this effort would merely have been a nut job ;). Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit a439520f8b18917b322f576be04c54aba84bb044 Author: Thomas Gleixner Date: Fri Feb 4 18:46:16 2011 +0100 genirq: Implement irq_data based move_*_irq() versions No need to lookup the irq descriptor when calling from a chip callback function which has irq_data already handy. Signed-off-by: Thomas Gleixner commit 77694b408abb8f92195ad5ed6ce5492f1d794c77 Author: Thomas Gleixner Date: Tue Feb 15 10:33:57 2011 +0100 genirq; Add fasteoi irq_chip quirk Some chips want irq_eoi() only called when an interrupt is actually handled. So they have checks for INPROGRESS and DISABLED in their irq_eoi callbacks. Add a chip flag, which allows to handle that in the generic code. No impact on the fastpath. Signed-off-by: Thomas Gleixner commit 781295762defc709a609efc01d8bb065276cd9a2 Author: Thomas Gleixner Date: Thu Feb 10 15:14:20 2011 +0100 genirq: Add preflow handler support sparc64 needs to call a preflow handler on certain interrupts befor calling the action chain. Integrate it into handle_fasteoi_irq. Must be enabled via CONFIG_IRQ_FASTEOI_PREFLOW. No impact when disabled. Signed-off-by: Thomas Gleixner Cc: David S. Miller commit 3836ca08aad4575c120ccf328652f3873eea9063 Author: Thomas Gleixner Date: Mon Feb 14 20:09:19 2011 +0100 genirq: Consolidate set_chip_handler functions No need to have separate functions if we have one plus inline wrappers. Signed-off-by: Thomas Gleixner commit 02725e7471b8dd58fa96f6604bdb5dde45405a2e Author: Thomas Gleixner Date: Sat Feb 12 10:37:36 2011 +0100 genirq: Use irq_get/put functions Convert the management functions to use the common irq_get/put function. Signed-off-by: Thomas Gleixner commit d5eb4ad2dfb2dfae43fd51bc8630b4fc3ef00e92 Author: Thomas Gleixner Date: Sat Feb 12 12:16:16 2011 +0100 genirq: Implement irq_get/put_desc_[bus]locked/unlock() Most of the managing functions get the irq descriptor and lock it - either with or without buslock. Instead of open coding this over and over provide a common function to do that. Signed-off-by: Thomas Gleixner commit 091738a266fc74329ae186f22ff2b3f01319112d Author: Thomas Gleixner Date: Mon Feb 14 20:16:43 2011 +0100 genirq: Remove real old transition functions These transition helpers are stale for years now. Remove them. Signed-off-by: Thomas Gleixner commit a6967caf00ebbb2d4acdebcb72a25f2e9ba43fd2 Author: Thomas Gleixner Date: Thu Feb 10 22:01:25 2011 +0100 genirq: Remove desc->status when GENERIC_HARDIRQS_NO_COMPAT=y If everything uses the right accessors, then enabling GENERIC_HARDIRQS_NO_COMPAT should just work. If not it will tell you. Don't be lazy and use the trick which I use in the core code! git grep status_use_accessors will unearth it in a split second. Offenders are tracked down and not slapped with stinking trouts. This time we use frozen shark for a better educational value. Signed-off-by: Thomas Gleixner commit e1ef824146131709d7466e37f889f2dab24ca98e Author: Thomas Gleixner Date: Thu Feb 10 22:25:31 2011 +0100 genirq: Reflect IRQ_MOVE_PCNTXT in irq_data state Required by x86. Signed-off-by: Thomas Gleixner commit 7f94226f03299f1ca32f118f02f2a0295e0e5e93 Author: Thomas Gleixner Date: Thu Feb 10 19:46:26 2011 +0100 genirq: Move wakeup state to irq_data Some irq_chips need to know the state of wakeup mode for setting the trigger type etc. Reflect it in irq_data state. Signed-off-by: Thomas Gleixner commit d4d5e08960844a062da8387ee5f16ca7a33200d0 Author: Thomas Gleixner Date: Thu Feb 10 13:16:14 2011 +0100 genirq: Add IRQCHIP_SET_TYPE_MASKED flag irq_chips, which require to mask the chip before changing the trigger type should set this flag. So the core takes care of it and the requirement for looking into desc->status in the chip goes away. Signed-off-by: Thomas Gleixner Cc: Linus Walleij Cc: Lars-Peter Clausen commit 2bff17ad2107c66fc8ca96501a7128dd7fa7a390 Author: Thomas Gleixner Date: Thu Feb 10 13:08:38 2011 +0100 genirq: Add flags to irq_chip Looking through irq_chip implementations I noticed that some of them have special requirements, like setting the type masked and therefor fiddle in irq_desc->status. Add a flag field, so the core code can handle it. Signed-off-by: Thomas Gleixner commit 5d4d8fc9ac3e9a90bbdf90bae6864cb2c01f2208 Author: Thomas Gleixner Date: Tue Feb 8 17:27:18 2011 +0100 genirq: Cleanup irq.h Put the constants into an enum and document them. Signed-off-by: Thomas Gleixner commit f9e4989eb8183a1f33581fa1b99274287b0639d2 Author: Thomas Gleixner Date: Wed Feb 9 14:54:49 2011 +0100 genirq: Force wrapped access to desc->status in core code Force the usage of wrappers by another nasty CPP substitution. Signed-off-by: Thomas Gleixner commit 1ccb4e612f68ceefb888c2c6c1def6294ea8666d Author: Thomas Gleixner Date: Wed Feb 9 14:44:17 2011 +0100 genirq: Wrap the remaning IRQ_* flags Use wrappers to keep them away from the core code. Signed-off-by: Thomas Gleixner commit 876dbd4cc1b35c1a4cb96a2be1d43ea0eabce3b4 Author: Thomas Gleixner Date: Tue Feb 8 17:28:12 2011 +0100 genirq: Mirror irq trigger type bits in irq_data.state That's the data structure chip functions get provided. Also allow them to signal the core code that they updated the flags in irq_data.state by returning IRQ_SET_MASK_OK_NOCOPY. The default is unchanged. The type bits should be accessed via: val = irqd_get_trigger_type(irqdata); and irqd_set_trigger_type(irqdata, val); Coders who access them directly will be tracked down and slapped with stinking trouts. Signed-off-by: Thomas Gleixner commit 2bdd10558c8d93009cb6c32ce9e30800fbb08add Author: Thomas Gleixner Date: Tue Feb 8 17:22:00 2011 +0100 genirq: Move IRQ_AFFINITY_SET to core Keep status in sync until last abuser is gone. Signed-off-by: Thomas Gleixner commit bce43032ad79fae0ce5b6174ce1321e643ceb54b Author: Thomas Gleixner Date: Thu Feb 10 22:37:41 2011 +0100 genirq: Reuse existing can set affinty check Add a !desc check while at it. Signed-off-by: Thomas Gleixner commit a005677b3dd05decdd8880cf3044ae709856f58f Author: Thomas Gleixner Date: Tue Feb 8 17:11:03 2011 +0100 genirq: Mirror IRQ_PER_CPU and IRQ_NO_BALANCING in irq_data.state That's the right data structure to look at for arch code. Accessor functions are provided. irqd_is_per_cpu(irqdata); irqd_can_balance(irqdata); Coders who access them directly will be tracked down and slapped with stinking trouts. Signed-off-by: Thomas Gleixner commit 1ce6068dac1924f7095be5850481e790cbf1b3c1 Author: Thomas Gleixner Date: Wed Feb 9 20:44:21 2011 +0100 genirq: Move debug code to separate header It'll break when I'm going to undefine the constants. Signed-off-by: Thomas Gleixner commit fae581e588e64a0690f3fc995e404fcacaebe772 Author: Thomas Gleixner Date: Tue Feb 8 16:53:24 2011 +0100 genirq: Remove CHECK_IRQ_PER_CPU from core code Signed-off-by: Thomas Gleixner commit 8f53f92404bead2ab2154d45c8f508880bb5d95d Author: Thomas Gleixner Date: Tue Feb 8 16:50:00 2011 +0100 genirq: Make CHECK_IRQ_PER_CPU an inline and deprecate it Its' too ugly and needs to go. The only users are core code and parisc. Core code does not need it and parisc gets a new check once IRQ_PER_CPU is reflected in irq_data.state. Signed-off-by: Thomas Gleixner commit 6a58fb3bad099076f36f0f30f44507bc3275cdb6 Author: Thomas Gleixner Date: Tue Feb 8 15:40:05 2011 +0100 genirq: Remove CONFIG_IRQ_PER_CPU The saving of this switch is minimal versus the ifdef mess it creates. Simple enable PER_CPU unconditionally and remove the config switch. Signed-off-by: Thomas Gleixner commit f230b6d5c48f8d12f4dfa1f8b5ab0b0320076d21 Author: Thomas Gleixner Date: Sat Feb 5 15:20:04 2011 +0100 genirq: Add IRQ_MOVE_PENDING to irq_data.state chip implementations need to know about it. Keep status in sync until all users are fixed. Accessor function: irqd_is_setaffinity_pending(irqdata) Coders who access them directly will be tracked down and slapped with stinking trouts. Signed-off-by: Thomas Gleixner commit 91c499178139d6597e68db19638e4135510a34b8 Author: Thomas Gleixner Date: Thu Feb 3 20:48:29 2011 +0100 genirq: Add state field to irq_data Some chip implementations need to access certain status flags. With sparse irqs that requires a lookup of the irq descriptor. Add a state field which contains such flags. Name it in a way which will make coders happy to access it with the proper accessor functions. And it's easy to grep for. Signed-off-by: Thomas Gleixner commit 6d2cd17fde1fc3e93302815f049f255bb2b3123e Author: Thomas Gleixner Date: Tue Feb 8 14:34:18 2011 +0100 genirq: Move IRQ_WAKEUP to core No users outside of core. Signed-off-by: Thomas Gleixner commit c531e8361f1968d664e6e97fbd3bfa4cf0e62e42 Author: Thomas Gleixner Date: Tue Feb 8 12:44:58 2011 +0100 genirq: Move IRQ_SUSPENDED to core No users outside of core. Signed-off-by: Thomas Gleixner commit 6e40262ea43c4b0e3f435b3a083e4461ef921c17 Author: Thomas Gleixner Date: Tue Feb 8 12:36:06 2011 +0100 genirq: Move IRQ_MASKED to core Keep status in sync until all users are fixed. Signed-off-by: Thomas Gleixner commit 2a0d6fb335d4428285dab2d254911748e6040807 Author: Thomas Gleixner Date: Tue Feb 8 12:17:57 2011 +0100 genirq: Move IRQ_PENDING flag to core Keep status in sync until all users are fixed. Signed-off-by: Thomas Gleixner commit c1594b77e46124bb462f961e536120e471c67446 Author: Thomas Gleixner Date: Mon Feb 7 22:11:30 2011 +0100 genirq: Move IRQ_DISABLED to core Keep status in sync until all abusers are fixed. Signed-off-by: Thomas Gleixner commit 163ef3091195f514a06f064b12914597d2644c55 Author: Thomas Gleixner Date: Tue Feb 8 11:39:15 2011 +0100 genirq: Move IRQ_REPLAY and IRQ_WAITING to core No users outside of core. Signed-off-by: Thomas Gleixner commit 3d67baec7f1b01fc289ac1a2f1a7e6d5e43391c6 Author: Thomas Gleixner Date: Mon Feb 7 21:02:10 2011 +0100 genirq: Move IRQ_ONESHOT to core No users outside of core. Signed-off-by: Thomas Gleixner commit 009b4c3b8ad584b3462734127a5bec680d5d6af4 Author: Thomas Gleixner Date: Mon Feb 7 21:48:49 2011 +0100 genirq: Add IRQ_INPROGRESS to core We need to maintain the flag for now in both fields status and istate. Add a CONFIG_GENERIC_HARDIRQS_NO_COMPAT switch to allow testing w/o the status one. Wrap the access to status IRQ_INPROGRESS in a inline which can be turned of with CONFIG_GENERIC_HARDIRQS_NO_COMPAT along with the define. There is no reason that anything outside of core looks at this. That needs some modifications, but we'll get there. Signed-off-by: Thomas Gleixner commit 6954b75b488dd740950573f244ddd66fd28620aa Author: Thomas Gleixner Date: Mon Feb 7 20:55:35 2011 +0100 genirq: Move IRQ_POLL_INPROGRESS to core No users outside of core. Signed-off-by: Thomas Gleixner commit 6f91a52d9bb28396177662f1da0f2e2cef9cf5d0 Author: Thomas Gleixner Date: Mon Feb 14 13:33:16 2011 +0100 genirq: Use modify_status for set_irq_nested_thread No need for a separate function in the core code. Signed-off-by: Thomas Gleixner commit 7acdd53e5b2c55b6f7e3427e85e2f91fa814a4f9 Author: Thomas Gleixner Date: Mon Feb 7 20:40:54 2011 +0100 genirq: Move IRQ_SPURIOUS_DISABLED to core state No users outside. Signed-off-by: Thomas Gleixner commit bd062e7667ac173afef57fbfe9327f3b914a9d4c Author: Thomas Gleixner Date: Mon Feb 7 20:25:25 2011 +0100 genirq: Move IRQ_AUTODETECT to internal state No users outside of core Signed-off-by: Thomas Gleixner commit e6bea9c404699223322d7411c6f2ceaec02fa83c Author: Thomas Gleixner Date: Wed Feb 9 13:16:52 2011 +0100 genirq: Protect tglx from tripping over his own feet The irq_desc.status field will either go away or renamed to settings. Anyway we need to maintain compatibility to avoid breaking the world and some more. While moving bits into the core, I need to avoid that I use any of the still existing IRQ_ bits in the core code by typos. So that file will hold the inline wrappers and some nasty CPP tricks to break the build when typoed. Signed-off-by: Thomas Gleixner commit dbec07bac614a61e3392c1e7c08cc6a49ad43f7a Author: Thomas Gleixner Date: Mon Feb 7 20:19:55 2011 +0100 genirq: Add internal state field to irq_desc That field will contain internal state information which is not going to be exposed to anything outside the core code - except via accessor functions. I'm tired of everyone fiddling in irq_desc.status. core_internal_state__do_not_mess_with_it is clear enough, annoying to type and easy to grep for. Offenders will be tracked down and slapped with stinking trouts. Signed-off-by: Thomas Gleixner commit 35e857cbeb24e75c6f9a9312ac30454eee8c5950 Author: Thomas Gleixner Date: Thu Feb 10 12:20:23 2011 +0100 genirq: Fixup core code namespace fallout Signed-off-by: Thomas Gleixner commit c78b9b65faa291def628dbd8539649f58299f0f3 Author: Thomas Gleixner Date: Thu Dec 16 17:21:47 2010 +0100 genirq: Implement generic irq_show_interrupts() All archs implement show_interrupts() in more or less the same way. That's tons of duplicated code with different bugs with no value. Implement a generic version and deprecate show_interrupts() Unfortunately we need some ifdeffery for !GENERIC_HARDIRQ archs. Signed-off-by: Thomas Gleixner commit 1277a5325adfc53caac7dd3dac5d3d2fd2a125b4 Author: Thomas Gleixner Date: Mon Feb 7 01:40:27 2011 +0100 genirq: Simplify handle_irq_event() Now that all core users are converted one layer can go. Signed-off-by: Thomas Gleixner commit 0877d66257082ce86fca8f9826b91870575b272c Author: Thomas Gleixner Date: Mon Feb 7 01:29:15 2011 +0100 genirq: Use handle_irq_event() in the spurious poll code Signed-off-by: Thomas Gleixner commit 849f061c25f8951d11c7dd88f44950ccde296392 Author: Thomas Gleixner Date: Mon Feb 7 01:25:41 2011 +0100 genirq: Use handle_perpcu_event() in handle_percpu_irq() Signed-off-by: Thomas Gleixner commit a60a5dc2db3b08b3c2900614c43b1262410c2d8c Author: Thomas Gleixner Date: Mon Feb 7 01:24:07 2011 +0100 genirq: Use handle_irq_event() in handle_edge_irq() It's safe to drop the IRQ_INPROGRESS flag between action chain walks as we are protected by desc->lock. Signed-off-by: Thomas Gleixner commit a7ae4de5c8ae8110556f0f9c7241093ef984605c Author: Thomas Gleixner Date: Mon Feb 7 01:23:07 2011 +0100 genirq: Use handle_irq_event() in handle_fasteoi_irq() Signed-off-by: Thomas Gleixner commit 1529866c63d789925de9b4250646d82d033e4b95 Author: Thomas Gleixner Date: Mon Feb 7 01:22:17 2011 +0100 genirq: Use handle_irq_event() in handle_level_irq() Signed-off-by: Thomas Gleixner commit 107781e72192067b95a7d373bfa460434a13c6ae Author: Thomas Gleixner Date: Mon Feb 7 01:21:02 2011 +0100 genirq: Use handle_irq_event() in handle_simple_irq() Signed-off-by: Thomas Gleixner commit 4912609f228da4a3d2bfbdf0f31de3d9eab2b7f8 Author: Thomas Gleixner Date: Mon Feb 7 01:08:49 2011 +0100 genirq: Implement handle_irq_event() Core code replacement for the ugly camel case. It contains all the code which is shared in all handlers. clear status flags set INPROGRESS flag unlock call action chain note_interrupt lock clr INPROGRESS flag Signed-off-by: Thomas Gleixner commit d78f8dd36b90626106ce19cb2e6828b0dc39447e Author: Thomas Gleixner Date: Wed Feb 2 21:41:17 2011 +0000 genirq: Do not fiddle with IRQ_MASKED in handle_edge_irq() IRQ_MASKED is set in mask_ack_irq() anyway. Remove it from handle_edge_irq() to allow simpler ab^HHreuse of that function. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra LKML-Reference: <20110202212551.918484270@linutronix.de> commit 3aae994fb0f43f6d94a31c33536a83869504abdf Author: Thomas Gleixner Date: Fri Feb 4 10:17:52 2011 +0100 genirq: Consolidate IRQ_DISABLED Handle IRQ_DISABLED consistent. Signed-off-by: Thomas Gleixner commit 50f7c0327513d5acefbe26fd33498af18d1ffac5 Author: Thomas Gleixner Date: Thu Feb 3 13:23:54 2011 +0100 genirq: Remove default magic Now that everything uses the wrappers, we can remove the default functions. None of those functions is performance critical. That makes the IRQ_MASKED flag tracking fully consistent. Signed-off-by: Thomas Gleixner commit 87923470c712dff00b101ffb6b6fbc27bd7a6df5 Author: Thomas Gleixner Date: Thu Feb 3 12:27:44 2011 +0100 genirq: Consolidate disable/enable Create irq_disable/enable and use them to keep the flags consistent. Signed-off-by: Thomas Gleixner commit 4699923861513671d3f6ade8efb4e56a9a7ecadf Author: Thomas Gleixner Date: Wed Feb 2 21:41:14 2011 +0000 genirq: Consolidate startup/shutdown of interrupts Aside of duplicated code some of the startup/shutdown sites do not handle the MASKED/DISABLED flags and the depth field at all. Move that to a helper function and take care of it there. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra LKML-Reference: <20110202212551.787481468@linutronix.de> commit 3b56f0585fd4c02d047dc406668cb40159b2d340 Author: Thomas Gleixner Date: Wed Feb 2 21:41:12 2011 +0000 genirq: Remove bogus conditional The if (chip->irq_shutdown) check will always evaluate to true, as we fill in chip->irq_shutdown with default_shutdown in irq_chip_set_defaults() if the chip does not provide its own function. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra LKML-Reference: <20110202212551.667607458@linutronix.de> commit 1535dfacbf21c4da1b73fcf07c39913da5bd5581 Author: Thomas Gleixner Date: Mon Feb 7 01:55:43 2011 +0100 genirq: Move irq thread flags to core Soleley used in core code. Signed-off-by: Thomas Gleixner commit fe200ae48ef5c79bf7941fe8046ff9505c570ff6 Author: Thomas Gleixner Date: Mon Feb 7 10:34:30 2011 +0100 genirq: Mark polled irqs and defer the real handler With the chip.end() function gone we might run into a situation where a poll call runs and the real interrupt comes in, sees IRQ_INPROGRESS and disables the line. That might be a perfect working one, which will then be masked forever. So mark them polled while the poll runs. When the real handler sees IRQ_INPROGRESS it checks the poll flag and waits for the polling to complete. Add the necessary amount of sanity checks to it to avoid deadlocks. Signed-off-by: Thomas Gleixner commit d05c65fff0ef672be75429266751f0e015b54d94 Author: Thomas Gleixner Date: Mon Feb 7 14:31:37 2011 +0100 genirq: spurious: Run only one poller at a time No point in running concurrent pollers which confuse each other by setting PENDING. Signed-off-by: Thomas Gleixner commit c7259cd7af757ddcd65701c37099dcddae2054f0 Author: Thomas Gleixner Date: Mon Feb 7 09:52:27 2011 +0100 genirq: Do not poll disabled, percpu and timer interrupts There is no point in polling disabled lines. percpu does not make sense at all because we only poll on the cpu we're currently running on. Also polling per_cpu interrupts is racy as hell. The handler runs without locking so we might get a huge surprise. If the timer interrupt needs polling, then we wont get there anyway. Signed-off-by: Thomas Gleixner commit fa27271bc8d230355c1f24ddea103824fdc12de6 Author: Thomas Gleixner Date: Mon Feb 7 09:10:39 2011 +0100 genirq: Fixup poll handling try_one_irq() contains redundant code and lots of useless checks for shared interrupts. Check for shared before setting IRQ_INPROGRESS and then call handle_IRQ_event() while pending. Shorter version with the same functionality. Signed-off-by: Thomas Gleixner commit b738a50a202639614c98b5763b01bf9201779e50 Author: Thomas Gleixner Date: Wed Feb 2 23:58:19 2011 +0100 genirq: Warn when handler enables interrupts We run all handlers with interrupts disabled and expect them not to enable them. Warn when we catch one who does. Signed-off-by: Thomas Gleixner commit 1082687e8d6292a61759eb83358e7db39fed1bf4 Author: Thomas Gleixner Date: Mon Feb 7 09:05:05 2011 +0100 genirq: Plug race in report_bad_irq() We cannot walk the action chain unlocked. Even if IRQ_INPROGRESS is set an action can be removed and we follow a null pointer. It's safe to take the lock there, because the code which removes the action will call synchronize_irq() which waits unlocked for IRQ_INPROGRESS going away. Signed-off-by: Thomas Gleixner commit 2b879eaf095878430c38cbd95e5c0fc4ce65ad8e Author: Thomas Gleixner Date: Mon Feb 14 11:25:02 2011 +0100 genirq: Remove redundant thread affinity setting Thread affinity is already set by setup_affinity(). Signed-off-by: Thomas Gleixner commit 3b8249e759c701c4a82f99d957be651a7657bf6f Author: Thomas Gleixner Date: Mon Feb 7 16:02:20 2011 +0100 genirq: Do not copy affinity before set While rumaging through arch code I found that there are a few workarounds which deal with the fact that the initial affinity setting from request_irq() copies the mask into irq_data->affinity before the chip code is called. In the normal path we unconditionally copy the mask when the chip code returns 0. Copy after the code is called and add a return code IRQ_SET_MASK_OK_NOCOPY for the chip functions, which prevents the copy. That way we see the real mask when the chip function decided to truncate it further as some arches do. IRQ_SET_MASK_OK is 0, which is the current behaviour. Signed-off-by: Thomas Gleixner commit 569bda8df11effa03e618729293c7961696abb10 Author: Thomas Gleixner Date: Mon Feb 7 17:05:08 2011 +0100 genirq: Always apply cpu online mask If the affinity had been set by the user, then a later request_irq() will honour that setting. But online cpus can have changed. So apply the online mask and for this case as well. Signed-off-by: Thomas Gleixner commit b008207cbd0d5ce606a1a2ac52826e0ab37d0b99 Author: Thomas Gleixner Date: Mon Feb 7 17:30:50 2011 +0100 genirq: Rremove redundant check IRQ_NO_BALANCING is already checked in irq_can_set_affinity() above, no need to check it again. Signed-off-by: Thomas Gleixner commit 1fa46f1f070961783661ae640cd2f6b2557f3885 Author: Thomas Gleixner Date: Mon Feb 7 16:46:58 2011 +0100 genirq: Simplify affinity related code There is lot of #ifdef CONFIG_GENERIC_PENDING_IRQ along with duplicated code in the irq core. Move the #ifdeffery into one place and cleanup the code so it's readable. No functional change. Signed-off-by: Thomas Gleixner commit a0cd9ca2b907d7ee26575e7b63ac92dad768a75e Author: Thomas Gleixner Date: Thu Feb 10 11:36:33 2011 +0100 genirq: Namespace cleanup The irq namespace has become quite convoluted. My bad. Clean it up and deprecate the old functions. All new functions follow the scheme: irq number based: irq_set/get/xxx/_xxx(unsigned int irq, ...) irq_data based: irq_data_set/get/xxx/_xxx(struct irq_data *d, ....) irq_desc based: irq_desc_get_xxx(struct irq_desc *desc) Signed-off-by: Thomas Gleixner commit 43abe43ce0619d744c7a5bb15cce075e532b53b7 Author: Thomas Gleixner Date: Sat Feb 12 12:10:49 2011 +0100 genirq: Add missing buslock to set_irq_type(), set_irq_wake() chips behind a slow bus cannot update the chip under desc->lock, but we miss the chip_buslock/chip_bus_sync_unlock() calls around the set type and set wake functions. Signed-off-by: Thomas Gleixner commit e7bcecb7b1d29b9ad5af939149a945658620ca8f Author: Thomas Gleixner Date: Wed Feb 16 17:12:57 2011 +0100 genirq: Make nr_irqs runtime expandable We face more and more the requirement to expand nr_irqs at runtime. The reason are irq expanders which can not be detected in the early boot stage. So we speculate nr_irqs to have enough room. Further Xen needs extra irq numbers and we really want to avoid adding more "detection" code into the early boot. There is no real good reason why we need to limit nr_irqs at early boot. Allow the allocation code to expand nr_irqs. We have already 8k extra number space in the allocation bitmap, so lets use it. Signed-off-by: Thomas Gleixner commit 218502bfe674f570205367b9094048207b04ba15 Merge: 51327ad 6d83f94 Author: Thomas Gleixner Date: Sat Feb 19 12:56:36 2011 +0100 Merge branch 'irq/urgent' into irq/core Reason: Further patches are conflicting with mainline fixes Signed-off-by: Thomas Gleixner commit d77e270c53a4911d23ded9f4ab8b175a3fe3bb34 Author: Russell King Date: Sat Jan 22 11:37:54 2011 +0000 ARM: integrator: add Integrator/CP sched_clock support Integrator/CP has the 24MHz counter which Versatile and later platforms also have, which we use for sched_clock support. Allow this counter to be used when building a kernel targetting Integrator/CP alone. Integrator/AP does not have this counter, so we must exclude support for the Integrator family when this is enabled. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 0462b4477ea3260304bbcd97c64c0b704b4f0f85 Author: Russell King Date: Wed Jan 19 10:24:56 2011 +0000 ARM: realview/vexpress: consolidate SMP bringup code Realview and Versatile Express share the same SMP bringup code, so consolidate the two implementations. Acked-by: Catalin Marinas Signed-off-by: Russell King commit cdab142a80d859984eb5e3876e0e762b1f0bded9 Author: Russell King Date: Wed Jan 19 10:07:38 2011 +0000 ARM: realview/vexpress: consolidate localtimer support Realview and Versatile Express local timer support is identical, so consolidate the implementations. Acked-by: Catalin Marinas Signed-off-by: Russell King commit c41b16f8c9d9dc74ed5669d4a3e3d42374c9e609 Author: Russell King Date: Wed Jan 19 15:32:15 2011 +0000 ARM: integrator/versatile: consolidate FPGA IRQ handling code Consolidate the FPGA IRQ handling code. Integrator/AP and Versatile have one FPGA-based IRQ handler each. Integrator/CP has three. Acked-by: Catalin Marinas Signed-off-by: Russell King commit dc37c31bbfaf87118d6c827be0a38a512a40b741 Author: Russell King Date: Tue Jan 18 20:26:08 2011 +0000 ARM: rationalize versatile family Kconfig/Makefile Move leds and sched_clock build conditionals out of the Makefile into the Kconfig file. Move selection of HAVE_SCHED_CLOCK into the platform Kconfig rather than duplicating it three times in the main architecture Kconfig. Acked-by: Catalin Marinas Signed-off-by: Russell King commit f093728c0ddc30bef5792b7faf2743024b166350 Author: Russell King Date: Tue Jan 18 19:48:57 2011 +0000 ARM: realview: remove old AMBA device DMA definitions The AMBA DMA macro definitions are not used, and the AMBA Primecell DMA support makes no use of them either, so they can be removed. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 5e4b822f298b49d2940e09c31695a64417a836b9 Author: Russell King Date: Tue Jan 18 19:47:40 2011 +0000 ARM: versatile: remove old AMBA device DMA definitions The AMBA DMA macro definitions are not used, and the AMBA Primecell DMA support makes no use of them either, so they can be removed. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 493a451bb559476d2f7f189670be2172ca3010b4 Author: Russell King Date: Tue Jan 11 13:07:52 2011 +0000 ARM: vexpress: use new init_early for clock tree and sched_clock init Initialize the clock tree and our sched_clock() early. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 631e55f966668d7a957342b38d7148643d919d73 Author: Russell King Date: Tue Jan 11 13:05:01 2011 +0000 ARM: realview: use new init_early for clock tree and sched_clock init Initialize the clock tree and our sched_clock() early. Acked-by: Catalin Marinas Signed-off-by: Russell King commit ad3bb19c5bd17cebe8e9a97dc0b53e274a05f23b Author: Russell King Date: Tue Jan 11 12:55:38 2011 +0000 ARM: versatile: use new init_early for clock tree and sched_clock init Initialize the clock tree and our sched_clock() early. Acked-by: Catalin Marinas Signed-off-by: Russell King commit c735c9873d0c2f269fd16f4b04903da41a44cbcf Author: Russell King Date: Tue Jan 11 13:00:04 2011 +0000 ARM: integrator: use new init_early for clock tree init Initialize the clock tree early. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 0fb44b910f6873c49066e8d0bf681a058fc01b67 Author: Russell King Date: Tue Jan 18 20:13:51 2011 +0000 ARM: vexpress: switch Versatile Express to use consolidated CLCD This switches Versatile Express to use the conslidated CLCD panel support, including the display capabilities. As Versatile Express uses a PL111, it can support the full range of pixel formats - 444, 5551, 565 in both RGB and BGR mode. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 3cb5ee496ae99ee89e378d628b19cb5a904b1397 Author: Russell King Date: Tue Jan 18 20:13:20 2011 +0000 ARM: realview: switch Realview to use consolidated CLCD This switches Realview platforms to use the consolidated CLCD panel support, including the display capabilities. As Realview uses a PL111, it can support the full range of pixel formats - 444, 5551, 565 in both RGB and BGR mode. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 3414ba8c899023b604e6066d25bc9d516e059401 Author: Russell King Date: Tue Jan 18 20:12:10 2011 +0000 ARM: versatile: switch Versatile to use consolidated CLCD This switches Versatile platforms to use the consolidated CLCD panel support, including the display capabilities. Versatile can support RGB5551, BGR5551, RGB565 and BGR565 modes. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 9dfec4fe6d2eb5580e5adcee8827dee3a16be49d Author: Russell King Date: Tue Jan 18 20:10:10 2011 +0000 ARM: integrator: switch Integrator platforms to use consolidated CLCD This switches integrator platforms to use the consolidated CLCD panel support, including the display capabilities. These capabilities prevent the unsupported BGR565 mode being selected, while still allowing RGB5551, BGR5551 and RGB565 modes. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 420c34e4ccbbacab56d199e90a214e24380077dd Author: Russell King Date: Tue Jan 18 20:08:06 2011 +0000 ARM: add versatile family consolidated CLCD support This consolidates the CLCD panel definitions and memory allocation into one location. Rename the Sanyo 2.5in and Epson 2.2in displays after their respective part numbers. Rather than using a general "Sanyo 2.5in" and "Epson 2.2in" description of the display panel, use the manufacturers part number to be more specific. This helps people identify what the timings actually refer to, which are panel specific. While here, add CLCD capability information to each panel definition, which has no effect until we add the board-level capabilities. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 7b4e9ced69a120e7e7446e3303d2307aa29d891c Author: Russell King Date: Fri Jan 21 14:03:28 2011 +0000 ARM: clcd: add method for describing display capabilities The ARM CLCD PL110 controller in TFT mode provides two output formats based on whether the controller is in 24bpp mode or not - either 5551 or 888. PL111 augments this with a 444 and 565 modes. Some implementations provide an external MUX on the PL110 output to reassign the bits to achieve 565 mode. Provide a system of capability flags to allow the CLCD driver to work out what is supported by each panel and board, and therefore which display formats are permitted. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 9c49e4ab84dd46769e7fd9773946e10c95bab680 Author: Russell King Date: Wed Jan 19 21:13:33 2011 +0000 ARM: clcd: use amba_part() to determine if we have a PL110 primecell Instead of matching the entire peripheral ID, match against just the part number using the amba_xxx() macros. Acked-by: Catalin Marinas Signed-off-by: Russell King commit ff6433225b08d74f77f6eb4c5bf5ca434a371492 Author: Russell King Date: Wed Jan 19 21:10:24 2011 +0000 ARM: clcd: clean up CLCD announcement printks Make the CLCD announcement printk say which primecell part number has been found. Display the revision as an unsigned decimal, and display only the first 8 hex digits of the base address unless it's larger. Acked-by: Catalin Marinas Signed-off-by: Russell King commit e6b9c1f8a623bfaa545067df73213db1c9c8e7af Author: Russell King Date: Sat Jan 22 11:02:10 2011 +0000 ARM: integrator: support CLCD RGB5551 layout for 16bpp When the CLCD is in anything but RGB888 mode, its outputs are configured for RGB5551 output. Integrator/CP supports RGB565 via an external multiplexer, which we configure for RGB5551 or RGB565 based only on the bits per pixel. So when userspace asks for the RGB555 layout, the mux remains in RGB565 mode, and we produce incorrect colours. Fix this. Note that Integrator doesn't support BGR565 mode, but does support BGR5551. Acked-by: Catalin Marinas Signed-off-by: Russell King commit 9728c1b6a724daefc413b44e10253cdbb5e06d08 Author: Russell King Date: Wed Jan 19 23:29:12 2011 +0000 ARM: versatile: support CLCD RGB565 layout with blue LSB RGB565 with blue in the LSB wasn't supported. Add support for this layout. Acked-by: Catalin Marinas Signed-off-by: Russell King commit bafc8205dc7bf2488175008deedc14ff4939d174 Author: Linus Walleij Date: Wed Feb 2 13:49:00 2011 +0100 ARM: 6647/1: add Versatile Express defconfig Being able to compile a major reference platform is helpful for me when developing on other archs using the same e.g. PrimeCells. I bet this is useful to others as well. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 68b5035c8e4ed9eb449121a0603d6299a489618c Author: Linus Walleij Date: Fri Jan 28 09:08:41 2011 +0100 ARM: 6644/1: mach-ux500: update the U8500 defconfig Config and activate all the devices we've merged for Ux500 in 2.6.38-rc1. This is needed for the default config to compile properly. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit d081377dfda42beab13d8b4af876571ce7661174 Author: Ryan Mallon Date: Mon Feb 14 03:46:42 2011 +0100 ARM: 6665/1: Add Snapper9260 rtc wakeup interrupt pin Signed-off-by: Ryan Mallon Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Russell King commit ad56c0dd9dfb0175e605b5e66b3f9973bef60ca0 Author: Ryan Mallon Date: Mon Feb 14 03:44:22 2011 +0100 ARM: 6664/1: AT91: Use macros for gpio_to_irq/irq_to_gpio Replace the static inline functions for gpio_to_irq/irq_to_gpio so that they can be used in static initialisers. Signed-off-by: Ryan Mallon Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Russell King commit 0fff6b9a4e0aba233a2ff644316d29b0cb784e33 Merge: 0cc9d52 aa90eb9 Author: Russell King Date: Sat Feb 19 09:44:55 2011 +0000 Merge branch 'pmu-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable commit 1c4badbdeae53d2584bb5395a062cfebed76696e Author: H. Peter Anvin Date: Fri Feb 18 15:50:36 2011 -0800 x86-64, trampoline: Remove unused variable Removed unused variable left over from development. Reported-by: Brian Gerst LKML-Reference: Cc: Stephen Rothwell Cc: Rafael J. Wysocki Cc: Matthieu Castet commit ee1b06ea6aed979da3b4e6b6ffea98ad55a3c5c1 Author: H. Peter Anvin Date: Fri Feb 18 15:47:42 2011 -0800 x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot The initial version of this patch had %eax being a segment and %ecx being the mode. I had changed the interfaces, but not the actual implementation! Reported-by: Brian Gerst LKML-Reference: Cc: Stephen Rothwell Cc: Rafael J. Wysocki Cc: Matthieu Castet commit 4baafdd76bafc51699a924d2bc1317f50b4ea75f Author: Mark Brown Date: Fri Feb 18 15:05:53 2011 -0800 ASoC: Hook wm_hubs micbiases up to CLK_SYS The microphone detection functionality requires a clock to work. In any non-detection case where the MICBIAS is enabled CLK_SYS will be needed anyway so there is no negative impact on power consumption. Signed-off-by: Mark Brown commit 40d2f1592ac262f13487b12cb47057e65b947bce Author: Mark Brown Date: Fri Feb 18 14:47:02 2011 -0800 ASoC: Mark WM8958 microphone detection registers readable So they show up in codec_reg. Signed-off-by: Mark Brown commit e0138c26cdeee8c033256ccd9e07d66db3c998be Author: Konrad Rzeszutek Wilk Date: Thu Dec 2 11:36:24 2010 -0500 nouveau/ttm/PCIe: Use dma_addr if TTM has set it. If the TTM layer has used the DMA API to setup pages that are TTM_PAGE_FLAG_DMA32 (look at patch titled: "ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set"), lets use it when programming the GART in the PCIe type cards. This patch skips doing the pci_map_page (and pci_unmap_page) if there is a DMA addresses passed in for that page. If the dma_address is zero (or DMA_ERROR_CODE), then we continue on with our old behaviour. [v2: Added a review-by tag] Reviewed-by: Thomas Hellstrom Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Ian Campbell commit c39d35161e87f1d7c0628af6907ac66a8c77f63f Author: Konrad Rzeszutek Wilk Date: Thu Dec 2 11:04:29 2010 -0500 radeon/ttm/PCIe: Use dma_addr if TTM has set it. If the TTM layer has used the DMA API to setup pages that are TTM_PAGE_FLAG_DMA32 (look at patch titled: "ttm: Utilize the dma_addr_t array for pages that are to in DMA32 pool."), lets use it when programming the GART in the PCIe type cards. This patch skips doing the pci_map_page (and pci_unmap_page) if there is a DMA addresses passed in for that page. If the dma_address is zero (or DMA_ERROR_CODE), then we continue on with our old behaviour. [v2: Fixed an indentation problem, added reviewed-by tag] [v3: Added Acked-by Jerome] Acked-by: Jerome Glisse Reviewed-by: Thomas Hellstrom Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Ian Campbell commit 5df91509d324d44cfb11e55d9cb02fe18b53b045 Author: jacob.jun.pan@linux.intel.com Date: Fri Feb 18 13:42:54 2011 -0800 x86: mrst: Remove apb timer read workaround APB timer current count was unreliable in the earlier silicon, which could result in time going backwards. This problem has been fixed in the current silicon stepping. This patch removes the workaround which was used to check and prevent timer rolling back when APB timer is used as clocksource device. The workaround code was also flawed by potential race condition around the cached read value last_read. Though a fix can be done by assigning last_read to a local variable at the beginning of apbt_read_clocksource(), but this is not necessary anymore. [ tglx: A sane timer on an Intel chip - I can't believe it ] Signed-off-by: Jacob Pan Cc: Arjan van de Ven Cc: Alan Cox LKML-Reference: <1298065374-25532-1-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: Thomas Gleixner commit b67afe7f43afd2f5cd98798993561920c1684c12 Merge: db28569 28bec7b Author: John W. Linville Date: Fri Feb 18 17:03:41 2011 -0500 Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c commit db28569adc692d9fb8a2d2d8e7ebab7fd5481f10 Author: Vivek Natarajan Date: Fri Feb 18 17:18:03 2011 +0530 mac80211: Clear PS related flag on disabling power save. Clear IEEE80211_STA_NULLFUNC_ACKED flag on disabling power save. Without this fix, there is a chance of setting CONF_PS before sending nullfunc frame. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 1a63e2ce4e67f6df74f032ec302314141816e432 Author: Vivek Natarajan Date: Fri Feb 18 16:49:47 2011 +0530 ath9k_hw: Updates for AR9485 1.1 chipsets. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 8354dd3ebc7f0b82f52990af3e5f4f4488020263 Author: Vivek Natarajan Date: Fri Feb 18 16:09:51 2011 +0530 ath9k_htc: Fix a compilation warning. Initialize caldata to avoid compilation warning. CC [M] drivers/net/wireless/ath/ath9k/htc_drv_main.o drivers/net/wireless/ath/ath9k/htc_drv_main.c: In function ‘ath9k_htc_config’: drivers/net/wireless/ath/ath9k/htc_drv_main.c:172: warning: ‘caldata’ may be used uninitialized in this function drivers/net/wireless/ath/ath9k/htc_drv_main.c:172: note: ‘caldata’ was declared here Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 540005c7fc787c211967148f7229f43db1eead38 Author: Jan Beulich Date: Thu Feb 17 13:36:19 2011 +0000 small adjustment to net/mac80211/Kconfig "def_bool n" without prompt is pointless, this should be just "bool". Signed-off-by: Jan Beulich Signed-off-by: John W. Linville commit 011d18350f525dfdb1ccbd52019e8c04cadcc222 Author: Rafał Miłecki Date: Thu Feb 17 01:50:51 2011 +0100 ssb: reset device only if it was enabled Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit b1a1bcf714c4d79f7872a34138d100941ebb0a0b Author: Rafał Miłecki Date: Thu Feb 17 01:50:50 2011 +0100 ssb: when needed, reject IM input while disabling device Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 0d4171e2153b70957fe67867420a1a24d5e4cd82 Author: Christian Lamparter Date: Wed Feb 16 19:43:06 2011 +0100 p54: implement flush callback Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 8b2988c13da00ac9d03f1764fdb26180c188f9e0 Author: Rafał Miłecki Date: Wed Feb 16 13:58:26 2011 +0100 ssb: remove invalid define SSB_TMSLOW_PHYCLK It was incorrectly introduced in d2730b2a6a019d14455556019d744ab051e6554b. We have already fixed function to use correct define, but forgot remove old one. Signed-off-by: Rafał Miłecki Cc: Gábor Stefanik Signed-off-by: John W. Linville commit 98605c2ed4963c44aa72799e697ae4bc7085ffcd Author: Rafał Miłecki Date: Wed Feb 16 13:58:25 2011 +0100 ssb: trivial: fix SPROM extract warning formatting Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 8ba0537c620ad9f37b0e810ce0a9ff367a021f5e Author: Johannes Berg Date: Wed Feb 16 08:46:58 2011 +0100 mac80211: fix 2.4 GHz 40 MHz disabling The module parameter ieee80211_disable_40mhz_24ghz was meant to allow disabling 40 MHz operation in the 2.4 GHz band by default. However, it is buggy as implemented because while it advertises to the AP that the device doesn't support 40 MHz, it will itself still use 40 MHz configurations. To fix this, clear the 40 MHz bits from the sband completely instead of overriding where used. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9bf8ab35f269d66e507de2b1ccc67a02d8284db5 Author: Henry Ptasinski Date: Thu Feb 17 21:29:01 2011 -0800 wireless-next-2.6: brcm80211: fix compile issue Commit 59eb21a65047 "cfg80211: Extend channel to frequency mapping for 802.11j" changed the definition of the ieee80211_channel_to_frequency; so fix its usage in brcmfmac. Signed-off-by: Stanislav Fomichev Reviewed-by: Henry Ptasinski Signed-off-by: John W. Linville commit 83bdf2a17279bd6ee3d0f5c0f086ebe06644109d Author: Ben Greear Date: Tue Feb 15 13:11:22 2011 -0800 mac80211: Add power to debugfs. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit fe0b7c616ebd7d25afbb4315d0e3220b112a7b2f Author: Larry Finger Date: Tue Feb 15 09:37:06 2011 -0600 p54: Fix compile warning If any of the p54-based drivers are built with CONFIG_P54_LEDS not defined, the following warning is generated: CC [M] drivers/net/wireless/p54/main.o drivers/net/wireless/p54/main.c: In function ‘p54_register_common’: drivers/net/wireless/p54/main.c:614:21: warning: unused variable ‘priv’ Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 12873372fe1f201813f1cc750a8af7d9193f445c Author: Bob Copeland Date: Tue Feb 15 09:19:28 2011 -0500 ath5k: move external function definitions to a header file Johannes pointed out the mess of external function prototypes in the mac80211-ops.c file. Woe to anyone who changes these functions... Signed-off-by: Bob Copeland Cc: Johannes Berg Signed-off-by: John W. Linville commit 8c68bd401d423c81fd4bfc19c625180528e4a5e8 Author: Michael Büsch Date: Tue Feb 15 00:21:50 2011 +0100 ssb: Make ssb_wait_bit multi-bit safe ssb_wait_bit was designed for only one-bit bitmasks. People start using it for multi-bit bitmasks. Make the "set" case is safe for this. The "unset" case is already safe. This does not change behavior of the current code. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit f4f314bf6fd39d85065c3fcda27bd594163abcf0 Merge: c269a20 8ffd878 Author: John W. Linville Date: Fri Feb 18 16:49:17 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 commit 6fc124697a0428148b9a8179e8431fa538d2994c Author: James Smart Date: Wed Feb 16 12:40:15 2011 -0500 [SCSI] lpfc 8.3.21: Change lpfc driver version to 8.3.21 Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 2a622bfbe1d95664ecd4bc1cfe6dacf4788dfc10 Author: James Smart Date: Wed Feb 16 12:40:06 2011 -0500 [SCSI] lpfc 8.3.21: Debugfs additions - Add the driver debugfs framework for supporting debugfs read and write operations, and iDiag command structure. - Add read and write to SLI4 device PCI config space registers. - Add the driver support of debugfs PCI config space register bits set/clear methods to the provided bitmask. - Add iDiag driver support for SLI4 device queue diagnostic. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit ab56dc2e1d32556971e0729b3a6c37e0ff3104a6 Author: James Smart Date: Wed Feb 16 12:39:57 2011 -0500 [SCSI] lpfc 8.3.21: Initialization and user interface changes - Make link speed not supported by port message an error message. - Add support for new SLI failure codes add sysfs parameter to reflect the security setting and current state. - Add all lpfc module parameters to the /sys/modules/lpfc/parameters directory. [jejb: fix up compile failure] Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 3173a5ecd8c4a1409d5af036977f326de2bee05d Author: Uwe Kleine-König Date: Thu Feb 10 11:16:09 2011 +0100 staging/trivial: fix typos concerning "select" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit ecc73a99e4fe593e03b0d45f6121e952fc928eef Author: Uwe Kleine-König Date: Thu Feb 10 11:16:08 2011 +0100 staging/trivial: fix typos concerning "memory" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 8c209fe9b0eb0bf0db09f55d83c101fc06bce152 Author: Uwe Kleine-König Date: Thu Feb 10 11:16:07 2011 +0100 staging/trivial: fix typos concerning "management" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit d9fed669ac4cb2ae5b1fad961c57f7ae1a5aa0be Author: Uwe Kleine-König Date: Thu Feb 10 11:16:06 2011 +0100 staging/trivial: fix typos concerning "initiali[zs]e" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit f9560042621fe0ce8bef3242f710662fac438104 Author: Uwe Kleine-König Date: Thu Feb 10 11:16:05 2011 +0100 staging/trivial: fix typos concerning "implementation" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 1bf8240c0779b00f1be8b236e55302d666b089c8 Author: Uwe Kleine-König Date: Thu Feb 10 11:16:04 2011 +0100 staging/trivial: fix typos concerning "function" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit f0c0dda0767e3fa713b8c4a29369a65e4ae5e5c4 Author: Uwe Kleine-König Date: Thu Feb 10 11:16:03 2011 +0100 staging/trivial: fix typos concerning "failed" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 9e36261d45989e13a2822d047687096f944cc9af Author: Uwe Kleine-König Date: Thu Feb 10 11:16:02 2011 +0100 staging/trivial: fix typos concerning "consistent" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit dca488b87efcae6f2b21ebe61922289b6093db2c Author: Uwe Kleine-König Date: Thu Feb 10 11:16:01 2011 +0100 staging/trivial: fix typos concerning "adjust" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit aec563b4f05a24c1d88db5aaf2d5047b6ae01663 Author: Uwe Kleine-König Date: Thu Feb 10 11:16:00 2011 +0100 staging/trivial: fix typos concerning "address" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 5ff6a1fd5c3ad2cae9626016cefa1d474571d618 Author: Uwe Kleine-König Date: Thu Feb 10 11:15:59 2011 +0100 staging/trivial: fix typos concerning "access" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit d0e0086893de668db30f31b8ba407199a0f693d0 Author: Vipin Mehta Date: Fri Feb 18 13:13:16 2011 -0800 staging: ath6kl: Fixing disappearing of scan list due to jiffies wrap over When jiffies wrap-over, all the BSS in the cache is removed. Wrap-over of jiffies is not handled in the correct way. This cause the scan list to go empty during this time for a small duration Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 28f7e85a4b454e4882a91ea13dd17cdf5013168d Author: Vipin Mehta Date: Fri Feb 18 13:13:15 2011 -0800 staging: ath6kl: Fixing accidental overwriting of probed ssid list in the hardware Fixing the code to avoid overwriting of the first index in the probed ssid list maintained by the hardware. This index is used to store broadcast SSID. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 98b6d2381a2812eba27a4cec3e8242262b0e5f01 Author: Vipin Mehta Date: Fri Feb 18 13:13:14 2011 -0800 staging: ath6kl: Adding state in driver to track the sme state Adding state in driver to track the sme state. The connect/disconnect events from the driver were messing up the state maintained within the cfg80211 module. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 9ea979d3b9e12e0f7f76153275e24c1d6cb389ab Author: Vipin Mehta Date: Fri Feb 18 13:13:13 2011 -0800 staging: ath6kl: Fixing the cached copy of the BSS filter set by user Fixing the cached copy of the BSS filter set by user. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 0ad7fdde6cfba9b0cf716bbd9549b05f195b8ebb Author: Vipin Mehta Date: Fri Feb 18 13:13:12 2011 -0800 staging: ath6kl: Fixing memory leak The patch fixes a mismatch in the allocation and free of scatter HIF bus requests in the suspend/resume path. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 711a1bccf23a54868d94af200061d35207c358e9 Author: Vipin Mehta Date: Fri Feb 18 13:13:11 2011 -0800 staging: ath6kl: Add configuration for excessive TX retry threshold Adding host side interface to configure the excessive TX retry threshold. It is used by the target to determine disconnection triggers. Additionally, some definitions have been added to header file wmi.h to bridge the gap for the newly added command. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 1581595dd918481e2df9927e08c71c5635b9af1e Author: Vipin Mehta Date: Fri Feb 18 13:13:10 2011 -0800 staging: ath6kl: Fixing a memory leak Fix for a memory leak discovered during suspend/resume testing. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 774c1fe2fe9f14c657deb63705ef044f7af9a6cb Author: Vipin Mehta Date: Fri Feb 18 13:13:09 2011 -0800 staging: ath6kl: Fixing a memory leak Virtual Scatter Gather Lists not getting freed during the HTCStop(). The patch adds some clean up code in the code path. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit fb9b548717444c82eb2d196c91729421ee68d4be Author: Vipin Mehta Date: Fri Feb 18 13:13:08 2011 -0800 staging: ath6kl: Adding support for txop bursting enable/disable Adding compile time support for enabling/disabling txop bursting. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 15eccc06e107f7d28e3e9985dc529a5dbbc4df63 Author: Vipin Mehta Date: Fri Feb 18 13:13:07 2011 -0800 staging: ath6kl: Consolidating hardware configuration Move all the wmi configuration commands done after wmi_ready to a single function. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit caf3fb4194f321f7657d697f901744aa3b899682 Author: Vipin Mehta Date: Fri Feb 18 13:13:06 2011 -0800 staging: ath6kl: Fixing driver initialization for manufacturing mode Fixing the driver initialization for manufacturing mode that involves downloading a firmware binary meant for RF tests on the factory floor. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 83195cc8a83df3546d72873ca2aed51f97b0c901 Author: Vipin Mehta Date: Fri Feb 18 13:13:05 2011 -0800 staging: ath6kl: Fixing target crash due to mismatch connect/disconnect Firmware design requires a WMI_DISCONNECT_CMD for every WMI_CONNECT_CMD to clear the firmware previous profile state. There is one case in linux host driver where two WMI_CONNECT_CMD are given without a WMI_DISCONNECT_CMD. This causes firmware state to mismatch causing an ASSERT. Use the driver state variable arConnectPending to track whether a WMI_CONNECT_CMD is issued to firmware. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 3f2fd78e68cdea8805c92b72008b9eb42f6580f6 Author: Vipin Mehta Date: Fri Feb 18 13:13:04 2011 -0800 staging: ath6kl: Return correct scan complete status Return correct scan complete status to the cfg80211 module based on the value returned from the hardware. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit e8763b5fe88a0ef8858cd614d961578d34b673a0 Author: Vipin Mehta Date: Fri Feb 18 13:13:03 2011 -0800 staging: ath6kl: Fixing key settings for WPA/WPA2 A bug was observed during the reconnection phase in the WPA/WPA2-PSK scenario where the EAPOL frames were going encrypted during an auto reconnection attempt. The initial 4-way handshake would go fine but then the driver was getting a command to set default keys sometime later. Setting of an incorrect flag (TX_USAGE) in the hadrware was causing the EAPOL frames during the subsequent 4-way handshake attempts to go encrypted causing the AP to reject the station. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit da101d563503d399d92412e833b6d5ae49c8ee5d Author: Vipin Mehta Date: Fri Feb 18 13:13:02 2011 -0800 staging: ath6kl: Fixing a NULL pointer exception The driver was dereferencing a NULL pointer because of the device instance being registered via the set_wiphy_dev() function. The function ar6000_avail_ev() was passing the argument as NULL instead of using the one returned by the MMC stack through the probe callback. Signed-off-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 6642a67c552e6d525913bb5fb4a00b2008213451 Author: Jerome Marchand Date: Thu Feb 17 17:11:49 2011 +0100 Staging: zram: initialize device on first read Currently the device is initialized when first write is done to the device. Any read attempt before the first write would fail, including "hidden" read the user may not know about (as for example if he tries to write a partial block). This patch initializes the device on first request, whether read or write. Signed-off-by: Jerome Marchand Cc: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 69648bed5383d5e9454aa9dc922dee4db2eef794 Author: Vasiliy Kulikov Date: Thu Feb 10 21:00:39 2011 +0300 staging: zcache: fix memory leak obj is not freed if __get_free_page() failed. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit 7a9f437af97110ed7beaceb5932ad8d3aa6e519d Author: Jonathan Cameron Date: Fri Feb 11 14:20:02 2011 +0000 staging:iio:gyro:adis16130 stub removal and cleanup Get rid of unused stubs for trigger and buffer support. Fix line length issues. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 8d016b43c99a2fa8d415cc4fb042c7177098812c Author: Jonathan Cameron Date: Fri Feb 11 14:20:01 2011 +0000 staging:iio:gyro:adis16080 unused stub removal and cleanup Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit d14ae859bb8e1bf372217ecc55b2fe0cb359a545 Author: Jonathan Cameron Date: Fri Feb 11 14:20:00 2011 +0000 staging:iio:gyro:adis16060 cleanup and dead code removal Removed stubs related to buffering and triggering. Put them back when they are actually needed. Fixed line length issues. Made a number of functions static as no longer in header. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 3faa4d3f88d85cdf5de26bd6e52073071cc24b07 Author: Jonathan Cameron Date: Fri Feb 11 14:07:43 2011 +0000 staging:iio:meter remove stubs from ade7854. General cleanup and use of standard functions to simplfy some spi reads as well. Also added a device id table to the spi version. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 3859faca5e6a79bcef54bd2233efe970323e3631 Author: Jonathan Cameron Date: Fri Feb 11 14:07:42 2011 +0000 staging:iio:meter remove stubs from ade7759. General cleanup and use of standard functions to simplfy some spi reads as well. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 5a0326d9f8134b1b65c22fc09c53bad0d41fe36c Author: Jonathan Cameron Date: Fri Feb 11 14:07:41 2011 +0000 staging:iio:meter remove stubs from ade7754. General cleanup and use of standard functions to simplfy some spi reads as well. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 72db6eb674d1a921f31d0fb7b50b6d76cb1c630a Author: Jonathan Cameron Date: Fri Feb 11 14:07:40 2011 +0000 staging:iio:meter remove stubs from ade7753. General cleanup and use of standard functions to simplfy some spi reads as well. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 96df9799a4dd62aab7566165d887ea40b1c8aa00 Author: Jonathan Cameron Date: Fri Feb 11 13:09:13 2011 +0000 staging:iio: buffer example - add lots more runtime parameters Add ability to control delay for event free buffers Add ability to control length of buffer Add ability to control how many read cycles occur Signed-off-by: Jonathan Cameron Tested-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit 30268a3da9325a2267cfc99efae7c192fa88199f Author: Jonathan Cameron Date: Fri Feb 11 13:09:12 2011 +0000 staging:iio: update example to handle case with no ring events Signed-off-by: Jonathan Cameron Tested-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit b949793b2c319b9ea3c2594aab203664caf2923e Author: Jonathan Cameron Date: Fri Feb 11 13:09:11 2011 +0000 staging:iio:lis3l02dq allow buffer implementation selection Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit b174baf4b79a067b58a77b86893c55d2c018d6f4 Author: Jonathan Cameron Date: Fri Feb 11 13:09:10 2011 +0000 staging:iio:kfifo buffer implementation A very simple use of a kfifo as an alternative for the ring_sw Signed-off-by: Jonathan Cameron Tested-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit d5857d65b5f7fab78c69da4085f0ce85a0399b25 Author: Jonathan Cameron Date: Fri Feb 11 13:09:09 2011 +0000 staging:iio:buffering move the copy to user on rip down into implementations The current interface is not as adaptable as it should be. Moving this complexity into the implementations makes it easier to add new implementations. Signed-off-by: Jonathan Cameron Tested-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman commit f2f1794835f1d8900d2b15d114c54e70c849809b Author: Tony SIM Date: Tue Feb 15 19:10:27 2011 +0900 staging: iio: ak8975: add platform data. As some of the platform not support irq_to_gpio, we pass gpio port by platform data. Signed-off-by: Tony SIM Signed-off-by: Andrew Chew Signed-off-by: Greg Kroah-Hartman commit ea801950cf54d5d3e219bd51e298193d56cd53e7 Author: David Brown Date: Mon Feb 14 16:15:25 2011 -0800 staging: msm: Use explicit GPLv2 licenses Replace a BSD-style license in Code Aurora Forum authored files with an explicit GPLv2. Signed-off-by: David Brown Signed-off-by: Greg Kroah-Hartman commit 78acd58746b513c062b3dafd5b563401bc9e9d47 Author: Javier Martinez Canillas Date: Sat Feb 12 04:38:25 2011 +0100 Staging: bcm: Bcmchar: Fix some checkpatch errors Signed-off-by: Javier Martinez Canillas Signed-off-by: Greg Kroah-Hartman commit 7227ba06479f981f5cf9977a7eeb3a20d30dc501 Author: Javier Martinez Canillas Date: Sat Feb 12 04:38:24 2011 +0100 Staging: bcm: Bcmchar: Fix style issues on bcm_char_read() Signed-off-by: Javier Martinez Canillas Signed-off-by: Greg Kroah-Hartman commit a7d3976edc32e6041f9d68c79ba64a17d5ec5095 Author: Javier Martinez Canillas Date: Sat Feb 12 04:38:23 2011 +0100 Staging: bcm: Bcmchar: Fix style issues on bcm_char_release() Signed-off-by: Javier Martinez Canillas Signed-off-by: Greg Kroah-Hartman commit 1e1233234edeacabbcaab9d086474224ba5af015 Author: Javier Martinez Canillas Date: Sat Feb 12 04:38:22 2011 +0100 Staging: bcm: Bcmchar: Fix style issues on bcm_char_open() Signed-off-by: Javier Martinez Canillas Signed-off-by: Greg Kroah-Hartman commit ebb61e5f9754e88843fc05ee2a6204ef3f6c2fc8 Author: Hank Janssen Date: Fri Feb 18 12:39:57 2011 -0800 Staging: hv: Fixed FIXME comments by using list_for_each_entry Fixed FIXME requests in channel_mgmt.c by using list_for_each_entry. Signed-off-by: Hank Janssen Signed-off-by: K.Y. Srinivasan Signed-off-by: Greg Kroah-Hartman commit 8014552a167ff56f30f7f6a3b4f4dda427f3d2fd Author: Haiyang Zhang Date: Mon Feb 14 14:51:42 2011 -0800 staging: hv: Remove dead code from rndis_filter.c Signed-off-by: Haiyang Zhang Signed-off-by: K. Y. Srinivasan Reviewed-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 5d8ffd71090ddd166206bf9b47a84294d73db6a5 Author: Haiyang Zhang Date: Mon Feb 14 14:51:41 2011 -0800 staging: hv: Remove dead code from netvsc.c Signed-off-by: Haiyang Zhang Signed-off-by: K. Y. Srinivasan Reviewed-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit d97ae00ea6a632bd97b99431db87d9b505b633a1 Author: K. Y. Srinivasan Date: Fri Feb 11 14:48:45 2011 -0800 Staging: hv: Cleanup vmalloc calls The subject says it all. There is no need to specify different page protection bits based on the architecture. Signed-off-by: K. Y. Srinivasan Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit e3fe0bb65b2686aa83dabdb1ecc22f5d80c536f8 Author: K. Y. Srinivasan Date: Fri Feb 11 10:00:12 2011 -0800 Staging: hv: Remove osd layer The OSD layer was a wrapper around native interfaces adding little value and was infact buggy - refer to the osd_wait.patch for details. This patch gets rid of the OSD abstraction. Signed-off-by: K. Y. Srinivasan Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 0c3b7b2f75158f9420ceeb87d5924bdbd8d0304a Author: K. Y. Srinivasan Date: Fri Feb 11 09:59:43 2011 -0800 Staging: hv: Use native wait primitives In preperation for getting rid of the osd layer; change the code to use native wait interfaces. As part of this, fixed the buggy implementation in the osd_wait_primitive where the condition was cleared potentially after the condition was signalled. Signed-off-by: K. Y. Srinivasan Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit df3493e0b3ba72f9b6192a91b24197cac41ce557 Author: K. Y. Srinivasan Date: Fri Feb 11 09:59:00 2011 -0800 Staging: hv: Use native page allocation/free functions In preperation for getting rid of the osd.[ch] files; change all page allocation/free functions to use native interfaces. Signed-off-by: K. Y. Srinivasan Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 7249e6a17bacbb18c4baf1b0d5ca70925409120d Author: Roland Vossen Date: Tue Feb 15 12:35:40 2011 +0100 staging: brcm80211: improved checks on incompatible firmware The return status of wl_ucode_init_buf() is now being used. Also a bug in firmware validation, which could lead to incompatible firmware not being rejected by the driver, has been fixed. Comment from Dan Carpenter on using negative error values has been incorporated in this commit. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 490e00f68534cd724ba8e486ff6cd6b10d1891b1 Author: Roland Vossen Date: Tue Feb 15 11:13:51 2011 +0100 staging: brcm80211: bugfix for stack dump on firmware load problems If there is a problem with the firmware load (eg, firmware not present in /lib/firmware/brcm), then the driver would dump its stack instead of bailing out gracefully. Root cause was an uninitialized variable (wl->pub) being dereferenced in the rfkill portion of a cleanup routine (wl_remove). Fix was to move the rfkill calls into the correct spot in wl_remove(). Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 59909c7c296a9f75ff395db2006de0aa6f57e7a7 Author: Roland Vossen Date: Tue Feb 15 11:13:50 2011 +0100 staging: brcm80211: bugfix for oops on firmware load problems Upon firmware load failure, wl_release_fw() was called multiple times. This caused the driver to oops. Solution was to remove redundant wl_release_fw() calls. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 02160695a40f915e5c0f5bbe1288365f6ac7cf8e Author: Stanislav Fomichev Date: Tue Feb 15 01:05:10 2011 +0300 staging: brcm80211: replace bcopy with memcpy Use native linux memcpy instead of legacy bcopy Signed-off-by: Stanislav Fomichev Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 70de655cace24d9f2dd8a4277e65fc6da07df75b Author: Stanislav Fomichev Date: Tue Feb 15 01:05:09 2011 +0300 staging: brcm80211: use %zu instead of %d for size_t Signed-off-by: Stanislav Fomichev Signed-off-by: Greg Kroah-Hartman commit 02aed8f3d69f1aefd3f7e66780ee103183ddb2ca Author: Roland Vossen Date: Mon Feb 14 12:16:47 2011 +0100 staging: brcm80211: removed unused code because of mac rev cleanup Code cleanup. Removed more defines, data structures and functions that were unused because this driver supports mac core rev 22 and up. Got rid of redundant brackets in wlc_bmac_txstatus() by moving locally defined variables above {} scope. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 3746507af6c8f7222eafa65188d256b49288ad08 Author: Roland Vossen Date: Mon Feb 14 12:16:46 2011 +0100 staging: brcm80211: removed obsolete comments Code cleanup. Only mac core revisions 22 and higher are supported, therefore comment related to older mac revisions was removed. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 7234592364e2efe8b4ac1040c99b1d7ef01cf502 Author: Roland Vossen Date: Mon Feb 14 12:16:45 2011 +0100 staging: brcm80211: removal of inactive d11 code Code cleanup. Removed code that was never invoked because the mac core revision supported is always higher than 22. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit aba0586c8af11e563f9c380ac4a0d4cbdd2e504c Author: Arend van Spriel Date: Thu Feb 10 15:27:46 2011 +0100 staging: brcm80211: remove declaration of unused string array The constant array declaration aci_names is not referenced anywhere in the code so it has been removed. Reviewed-by: Brett Rudley Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit bc042b67261043a93cfe2f311ffe5568a0b29017 Author: Arend van Spriel Date: Thu Feb 10 15:27:45 2011 +0100 staging: brcm80211: remove #ifdef BCMDBG from regular functions Under error condition debug functions are being called which only have implementation when BCMDBG is defined. This result in #ifdef BCMDBG blocks in functions. This patch fixes this by mapping the debug functions to empty macro when BCMDBG is not defined. This makes the calling function easier to read. Reviewed-by: Brett Rudley Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 77919fd72e96cb75ed1b3fc0921a6b5cef5f8042 Author: Arend van Spriel Date: Thu Feb 10 15:27:44 2011 +0100 staging: brcm80211: remove warning introduced by rfkill implementation During rfkill implementation the content of wlc_radio_upd function was removed for testing purposes only. This ended up in the patch sent out. This commit restores the function content, which was the only function calling static function wlc_radio_enable. This removes the compilation warning observed. Reviewed-by: Brett Rudley Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit cf60191a2d527065348bb315b1d650a086dde94b Author: Arend van Spriel Date: Thu Feb 10 12:03:52 2011 +0100 staging: brcm80211: remove unnecessary cast in wlc_d11hdrs_mac80211 memset prototype specifies a void pointer as buffer. Conversion from any pointer type to void pointer does not require an explicit cast. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 6677eaa335680f75fdc3aa1dae7557f1ed446491 Author: Arend van Spriel Date: Thu Feb 10 12:03:51 2011 +0100 staging: brcm80211: store BSSID in driver config information When mac80211 informs about new BSSID this was configured toward the hardware device, but the information is also needed inside the driver itself. This patch takes care of that. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit c234656fa33224860f648fba3e35f0b80cbe53d4 Author: Arend van Spriel Date: Thu Feb 10 12:03:50 2011 +0100 staging: brcm80211: set beacon interval as provided by mac80211 Driver now follows beacon interval as set by mac80211 callback. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit e0caf15007aed3ede132847b708c2335c5c9507e Author: Arend van Spriel Date: Thu Feb 10 12:03:49 2011 +0100 staging: brcm80211: store HT operation mode settings from mac80211 The HT operation mode is provided by mac80211 and they are now stored in the driver. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit d8a1fb44abc3e022419ecf8c51acf53b9b78e848 Author: Arend van Spriel Date: Thu Feb 10 12:03:48 2011 +0100 staging: brcm80211: handle change in association state from mac80211 The driver has flags for association state which are now being set according to notification from mac80211. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 4191e2d56458cdc9a31de68c8a8ff55a04242f9c Author: Arend van Spriel Date: Thu Feb 10 12:03:47 2011 +0100 staging: brcm80211: cleanup mac80211 callback bss_info_changed The implementation for bss_info_changed was not handling all changes as provided by mac80211 module. These have been added and will log message with changed parameters. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit e4cf544edb1c6a6287a8ed8d924259825364d40d Author: Arend van Spriel Date: Thu Feb 10 12:03:46 2011 +0100 staging: brcm80211: enable driver counter functionality The 802.11 core in the chipsets provides counters that are now used to provide counter values to mac80211 through get_stats callback. Counters related to ampdu and wmm (aka. wme) are not yet incorporated. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 8746e2baaedd45b51ceb0adbcaf2ce52bbb83598 Author: Arend van Spriel Date: Thu Feb 10 12:03:45 2011 +0100 staging: brcm80211: fix potential null pointer access handling ucode buffer Allocation of buffer in function wl_ucode_init_buf can fail. This was signalled by an error message, but code continued to access the null pointer. This is now avoided by jumping to failure label. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 0bef7748e1327f72b006ea699e8725be50685f0e Author: Arend van Spriel Date: Thu Feb 10 12:03:44 2011 +0100 staging: brcm80211: remove usage of printf (macro) from driver The driver contained several calls to printf which was mapped to printk using a macro. These have been changed to explicit call to printk or use an appropropriate macro. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 9d2c415612bc6dd300e7feffebf193243536eaea Author: Arend van Spriel Date: Thu Feb 10 12:03:43 2011 +0100 staging: brcm80211: return error code to mac80211 for 40MHz channels When mac80211 attempts to configure the driver for 40MHz channel it will return an error code -EIO as this is not yet supported. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 4a0791505639fcbb33b410c2a353d06688909188 Author: Arend van Spriel Date: Thu Feb 10 12:03:42 2011 +0100 staging: brcm80211: decrease level of non-error messages Non-error messages which were printed using WL_ERROR macro were decreased to WL_NONE (which is a no_printk) or WL_TRACE level macros. mac80211 callbacks that are not handled by the driver are printed with WL_ERROR. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 3646dd971b97be600bce75c2c7bb3e1c716bfd09 Author: Arend van Spriel Date: Thu Feb 10 12:03:41 2011 +0100 staging: brcm80211: use consistent naming for mac80211 callbacks Most mac80211 callbacks were named using prefix 'wl_ops' except for a few. These have been aligned to use the prefix as well. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 9435eb1cf0b76b323019cebf8d16762a50a12a19 Author: David S. Miller Date: Fri Feb 18 12:43:09 2011 -0800 ipv4: Implement __ip_dev_find using new interface address hash. Much quicker than going through the FIB tables. Signed-off-by: David S. Miller commit fd23c3b31107e2fc483301ee923d8a1db14e53f4 Author: David S. Miller Date: Fri Feb 18 12:42:28 2011 -0800 ipv4: Add hash table of interface addresses. This will be used to optimize __ip_dev_find() and friends. With help from Eric Dumazet. Signed-off-by: David S. Miller commit 073f48252698e83dc9e710d354c6859aeea78cd9 Author: Tomas Winkler Date: Tue Feb 15 14:15:20 2011 +0200 staging/easycap: use %p for printing pointers use %p instead of %X drop casting of pointer to long long int Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 7ee7142186b9acff6a142d0ebca5cfc28c85f5b5 Author: Tomas Winkler Date: Tue Feb 15 14:15:19 2011 +0200 staging/easycap: drop EASYCAP_NEEDS_USBVIDEO_H remove pointless compilation flag Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 30516058e2ad4a69ca9bdeac498ad522778bd3b5 Author: Tomas Winkler Date: Tue Feb 15 14:15:18 2011 +0200 staging/easycap: kill EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS are required in in-tree driver Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 3e17e39e1129a4dad1696fb6df30af227c1815cc Author: Tomas Winkler Date: Thu Feb 10 14:55:24 2011 +0200 staging/easycap: style changes in easycap_low.c remove uneedet brackets in ifs and switches drop pointless castings other small fixes Cc: Mike Thomas Signed-off-by: Tomas Winkler Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit ccb6d2e5dc37605503d0a3182dbb27981f90df94 Author: Tomas Winkler Date: Thu Feb 10 14:55:23 2011 +0200 staging/easycap: don't mask return value of usb_control_msg() by 0xFF masking return value of usb_control_msg() will mask negative error values into positive. Cc: Mike Thomas Reported-by: Dan Carpenter Signed-off-by: Tomas Winkler Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 72075789ea6eba8b67516c5fc7e5c12fa1dac1c3 Author: Tomas Winkler Date: Thu Feb 10 14:55:22 2011 +0200 staging/easycap: add first level indetnation for easycap_low.c Signed-off-by: Tomas Winkler Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 1b3909e5c57032d9e4d9cf6a56c9f7c46149409d Author: Aaro Koskinen Date: Thu Feb 17 23:29:17 2011 +0200 staging: xgifb: eliminate a global variable Move the XGIfb_mmio_size global variable into the video_info struct. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 45dcfaf150c4adb50149078205ad3e60bd7d789d Author: Aaro Koskinen Date: Thu Feb 17 23:29:16 2011 +0200 staging: xgifb: clean up xgifb_remove() Delete redudant comments, blank lines and a redundant semicolon. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 5c0ef2ac365ced91b819917e56dcd6795b5bef5a Author: Aaro Koskinen Date: Thu Feb 17 23:29:15 2011 +0200 staging: xgifb: release and unmap I/O memory Release and unmap memory on probe error paths and when the module is removed. The patch enables unloading and reloading the xgifb module. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit d80aaa01aec2d9b5e833fb9a26b83784e106a379 Author: Aaro Koskinen Date: Thu Feb 17 23:29:14 2011 +0200 staging: xgifb: replace XGINew_LCD_Wait_Time() with mdelay() XGINew_LCD_Wait_Time() is implemented using the I/O port 0x61, which is X86-specific and will fail on other platforms. The code did not make any sense, but I guess the intention has been to provide a function where the unit for the delay is milliseconds. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 0f07d945f490d1ba8ace3b943b2a2d13daf4c49a Author: Aaro Koskinen Date: Thu Feb 17 23:29:13 2011 +0200 staging: xgifb: copy PCI ROM properly Use proper helper functions to copy the PCI ROM. Also use dynamic memory allocation. The original code mapped incorrect amount of memory and will crash on some platforms. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit 6af8172043ddcebfcfc06a0921a10a858de45106 Author: Aaro Koskinen Date: Thu Feb 17 23:29:12 2011 +0200 staging: xgifb: fix some memory leaks Some xgifb_probe() error paths are missing proper vfree()s. Move them all into a single place. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit bb29223453061b9b738e3659f7810c1f61165df2 Author: Aaro Koskinen Date: Thu Feb 17 23:29:11 2011 +0200 staging: xgifb: xgifb_probe() error paths missing framebuffer_release() framebuffer_release() is missing from error paths. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman commit decebabf24ca179749dcac8a3fb87f7186bdf898 Author: Krzysztof Hałasa Date: Fri Feb 11 13:38:20 2011 +0100 staging: Solo6x10: Changed solo6010* -> solo*, solo6x10* etc. Signed-off-by: Krzysztof Hałasa Signed-off-by: Greg Kroah-Hartman commit ae69b22c6ca7d1d7fdccf0b664dafbc777099abe Author: Krzysztof Hałasa Date: Fri Feb 11 13:36:27 2011 +0100 staging: Solo6x10: Stripped "solo6010-" from file names. This driver supports both Solo-6010 and Solo-6110 chips anyway. Renamed solo6010.h -> solo6x10.h. Signed-off-by: Krzysztof Hałasa Signed-off-by: Greg Kroah-Hartman commit 43d1136d2c6073709db3049b3661ee662911df35 Author: Krzysztof Hałasa Date: Fri Feb 11 13:33:26 2011 +0100 staging: Solo6x10: remove unneeded __solo parameter from SOLO_*_EXT_ADDR macros. Signed-off-by: Krzysztof Hałasa Signed-off-by: Greg Kroah-Hartman commit 908113d8ebd26fea48e0d7b6e78b67ae6fc735ac Author: Krzysztof Hałasa Date: Fri Feb 11 13:32:11 2011 +0100 staging: Solo6x10: Add support for SOLO6110 chip. Signed-off-by: Krzysztof Hałasa Signed-off-by: Greg Kroah-Hartman commit 856e22d3cd3c38399be796b80bcf57769eefeee3 Author: Krzysztof Hałasa Date: Fri Feb 11 13:29:59 2011 +0100 staging: Solo6x10: Align MPEG video on 8-byte boundary instead of 32-byte. Solo-6110 only supports 8-byte alignment anyway. Signed-off-by: Krzysztof Hałasa Signed-off-by: Greg Kroah-Hartman commit c55564fdf793797dd2740a67c35a2cedc133c9ff Author: Krzysztof Hałasa Date: Fri Feb 11 13:25:00 2011 +0100 staging: Solo6x10: Build MPEG4 headers on the fly. This will make them maintainable. Also, it now works on big-endian systems. This is the slow path (done every 1+ second, per channel) so I guess there is no need to cache the results. I have removed CBR-related bits from the MPEG4 VOL header since we can't do CBR (at least yet). Signed-off-by: Krzysztof Hałasa Signed-off-by: Greg Kroah-Hartman commit 98ab1c9978f706c0ee081335f75636db22723307 Author: Krzysztof Hałasa Date: Fri Feb 11 13:10:30 2011 +0100 staging: Solo6x10: accept WxH >= screen dimentions. This makes it possible to request full resolution (704x576 or 704x480) independently of the color system used (PAL or NTSC). Signed-off-by: Krzysztof Hałasa Signed-off-by: Greg Kroah-Hartman commit 97a6688aa240e8b72aa5bf6c4a7c2b09bb117342 Author: Mike McCormack Date: Fri Feb 11 08:46:14 2011 +0900 staging: rtl8192e: Remove unused CONFIG_RTL8180_IO_MAP Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 0cfc618531e68e27339ff93371da8f2c15418851 Author: Mike McCormack Date: Fri Feb 11 08:45:45 2011 +0900 staging: rtl8192e: Don't disable interrupts in mgmt_tx_lock Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 4573d1459ce7e877b16800538ef57c95c759083b Author: Mike McCormack Date: Fri Feb 11 08:45:27 2011 +0900 staging: rtl8192e: Refactor rtl8192_ioctl into two functions Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 48f0210695ebe021b6477047794b1f004819855c Author: Mike McCormack Date: Fri Feb 11 08:45:03 2011 +0900 staging: rtl8192e: rf_ps_lock doesn't need to be IRQ safe Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 18c53dfe0311b6db7845a53a02985d363de77f86 Author: Mike McCormack Date: Fri Feb 11 08:44:44 2011 +0900 staging: rtl8192e: Remove useless TxCheckStuck function Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 3b10c0a4685d95532bdc7b2e865ace808d66295c Author: Mike McCormack Date: Fri Feb 11 08:44:29 2011 +0900 staging: rtl8192e: Make rtl8192_tx static Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 2b1a26f8d34d67104d634acc0799960ddad803ca Author: Mike McCormack Date: Fri Feb 11 08:44:09 2011 +0900 staging: rtl8192e: Enable the NIC only once Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 1b8b4969f59b4c6c426951d3a6ed3881625996f9 Author: Mike McCormack Date: Fri Feb 11 08:43:57 2011 +0900 staging: rtl8192e: Delete unused function rtl819x_ifsilentreset Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 4bbedb27d24e1f262ef3234f3faee5af0831ddb1 Author: Mike McCormack Date: Fri Feb 11 08:43:44 2011 +0900 staging: rtl8192e: Remove irq_enabled flag Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 539874106471819d4b6e52d06e14a0c3b0770a3b Author: Mike McCormack Date: Fri Feb 11 08:43:34 2011 +0900 staging: rtl8192e: Remove unused tx_lock spin lock Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit b07b846c333708ce2b95b5cd2a86f51a74331d02 Author: Andres Salomon Date: Thu Feb 10 17:56:38 2011 -0800 staging: olpc_dcon: drop CONFIG_BROKEN dependency DCON builds properly now; we can drop the config dep on CONFIG_BROKEN. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit c59eef17f1cc21a984cf077ad45a8355781881b6 Author: Andres Salomon Date: Thu Feb 10 17:56:27 2011 -0800 staging: olpc_dcon: clean up backlight handling - Move bl_val and bl_dev into dcon_priv struct.... - The only time we ever read the backlight val from the dcon is at probe time. Rather than calling dcon_get_backlight for that, just read from the register. - Drop dcon_get_backlight; it's just returning dcon->bl_val. - Rename dcon_set_backlight_hw to dcon_set_backlight, and drop the old dcon_set_backlight function. Move contents of old dcon_set_backlight function into dconbl_set. - Shuffle backlight_ops callbacks around to be closer to struct, and rename them. - Make use of new backlight_properties arg to backlight_device_register, drop old code that set this manually. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 309ef2a25e8d3d5962bb0824c58ea39c12c166ef Author: Andres Salomon Date: Thu Feb 10 17:54:58 2011 -0800 staging: olpc_dcon: move more global variables into dcon_priv Global variables dcon_switched, dcon_irq_time, and dcon_load_time can all be moved into the dcon_priv struct now that dcon_interrupt has access to dcon_priv. Signed-off-by: Greg Kroah-Hartman commit bbe963f1b98c90980e33086d726f0963e286d1b4 Author: Andres Salomon Date: Thu Feb 10 17:54:24 2011 -0800 staging: olpc_dcon: move more variables into dcon_priv This moves dcon_source and dcon_pending into the dcon_priv struct. Because these variables are used by the IRQ handler (which is registered in the model-specific callbacks), we end up needing to move dcon_priv into olpc_dcon.h. This also changes the IRQ registration to use the dcon_priv pointer as dev_id, instead of dcon_driver. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 097cd83a4c312e1ae0d9c14526f846666cab4f3a Author: Andres Salomon Date: Thu Feb 10 17:53:24 2011 -0800 staging: olpc_dcon: add config options for XO_1 and XO_1_5, drop hardcoded XO-1 stuff This adds CONFIG_FB_OLPC_DCON_1 and CONFIG_FB_OLPC_DCON_1_5 options for allowing selection of XO-1 and/or XO-1.5 DCON support. In the process, it also forces the xo_1.c and xo_1_5.c files to build as separate units, correctly selects between XO-1 and XO-1.5 at runtime, and adds some hacks to allow xo_1_5.c to build. This isn't the cleanest patch, but it'll get better as more global variables are dropped. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 8f2fb16a9cd015072b3da9038084930287e11985 Author: Andres Salomon Date: Thu Feb 10 17:49:58 2011 -0800 staging: olpc_dcon: drop XO-1.5 prototype support Remove code related to XO-1.5 prototype boards. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 31a3da4146c120e87b8d42d033760fe49704a233 Author: Marek Belisko Date: Thu Feb 10 17:49:24 2011 -0800 staging: olpc_dcon: Remove _strtoul() function. olpc_dcon driver use self invented _strtoul function which make similar check like strict_strtoul just extend for space checking at last string place. Normally access to sys file looks echo 1024 > /sys/... so space could be considered as error character and we could simplify code using just strict_strtoul function instead self invented. Signed-off-by: Marek Belisko Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 45bfe97276856b866dd73fdadb65fb928c0c9bc1 Author: Andres Salomon Date: Thu Feb 10 17:48:38 2011 -0800 staging: olpc_dcon: move fb stuff info dcon_priv, and clean up fb handling - move fbinfo and ignore_fb_events into dcon_priv - add calls to {un,}lock_fb_info before calling fb_blank - fail to load the driver if there are no registered framebuffers That last one fixes a potential oops, where if the dcon driver loads without a framebuffer registered, fb_blank will end up being passed a NULL (and will attempt to dereference it). Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit feaa98b2a5e452d95624d3f217cf1aab9cd25db0 Author: Andres Salomon Date: Thu Feb 10 17:47:16 2011 -0800 staging: olpc_dcon: move fb event notifier block into dcon_priv struct This also fixes a think-o where I was pulling the dcon struct out of thin air in the fb event callback. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 9ed62423033d167765a2c6385064acbeeadb2b14 Author: Andres Salomon Date: Thu Feb 10 17:46:07 2011 -0800 staging: olpc_dcon: don't specify single bits for bool fields Just use a regular 'bool foo', rather than 'bool foo:1'. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 6680d2cab316a0c0e4cea0727e6d63426a77bb12 Author: wwang Date: Wed Feb 16 15:56:11 2011 +0800 staging: rts_pstor: fix sparse warning Add static modifier before some functions and global variables. Signed-off-by: wwang Signed-off-by: Greg Kroah-Hartman commit 7eb90a3682fc42c5607cff931e5d0f6a9d52dc03 Author: wwang Date: Wed Feb 16 15:56:10 2011 +0800 staging: rts_pstor: delete a function Delete a function named rtsx_transfer_sglist which won't be called. Signed-off-by: wwang Signed-off-by: Greg Kroah-Hartman commit 80ae3fa5d6712ef3625eff617f72e190645d6361 Merge: 59db5b2 85e2efb Author: Greg Kroah-Hartman Date: Fri Feb 18 12:11:27 2011 -0800 Merge 2.6.38-rc5 into staging-next This is to resolve a merge conflict with: drivers/staging/zram/zram_drv.c as pointed out by Stephen Rothwell Cc: Stephen Rothwell Cc: Nitin Gupta Cc: Robert Jennings Signed-off-by: Greg Kroah-Hartman commit 924941444b481fc862b2de5e1dd7692ca85274d7 Author: James Smart Date: Wed Feb 16 12:39:44 2011 -0500 [SCSI] lpfc 8.3.21: FC Discovery changes FC Discovery changes - Treat received PLOGI while logged in as a relogin (unregister and reregister). - Added a timer to delay Nport discovery when clean bit is cleared and Fabric portname/nodename/FCID is changed. - Invalidate Port's DID when receiving PLOGI from p2p port with CONFIG_PORT mailbox command. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 1151e3ec15c32021a8a12a123459ab5e41692898 Author: James Smart Date: Wed Feb 16 12:39:35 2011 -0500 [SCSI] lpfc 8.3.21: RRQ Implementation fixes RRQ Implementation fixes - Added checks to prevent a call to findnode_did in clr_active_rrq - Added the del_sync_timer call for the rrq_tmr to the stop_hba_timers routine. - Added a check in __lpfc_set_active_rrq for the driver unloading to prevent adding an rrq when the driver is being removed. - Add code to scsi_iocb_cmpl to check for the remote stop and add the rrq. - Added the same check to els retry. - Added code to compare the source did in the els rrq to the vports did and chose the right exchange ID. - Initialize the start_cmd pointer to indicate when we have looped through all of the scsi buffers. - Remove the need for the lock around the clearing of the active bit in the rrq. - Added code to clean the els and fcp xri aborted list and remove the all of the RRQs for a deleted vport. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit fedd3b7b93302c7789bd3eeb190653cfb0fe7645 Author: James Smart Date: Wed Feb 16 12:39:24 2011 -0500 [SCSI] lpfc 8.3.21: Critical Errors and Bug Fixes Critical Errors: - Correctly handle non-zero return lpfc_workq_post_event and return ENOMEM - Save the irq level when locking the host_lock in lpfc_findnode_did Bug Fixes: - Adjust payload_length and request_length for sli4_config mailbox commands. - Add the freed sgl/XRI to the tail of the list rather than to the head. - Set the FC_VPORT_NEEDS_INIT_VPI on vport deletes and check it before issuing a fdisc on an els retry. - Only call lpfc_hba_init_link() if phba->cfg_suppress_link_up is LPFC_INITIALIZE_LINK. - Add support for SLI-4 Performance Hints Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 382be668c5a284844f9dcbb5b1cb8ffba2386d80 Author: Dan Carpenter Date: Tue Feb 15 15:33:13 2011 -0600 [SCSI] hpsa: fix bad comparison '!' has higher precedence than '&'. CFGTBL_ChangeReq is 0x1 so the original code is equivelent to if (!doorbell_value) {... Signed-off-by: Dan Carpenter Acked-by: Stephen M. Cameron Signed-off-by: James Bottomley commit ba95e2ac6bfeb9af92153058a353fc47e1addc02 Author: Stephen M. Cameron Date: Tue Feb 15 15:33:08 2011 -0600 [SCSI] hpsa: Do not attempt kdump if we detect resetting controller failed. We can get completions left over from before the attempted reset which will interfere with the kdump. Better to just not make the attempt in that case. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 960a30e7a73affcc441b9ceaff3b1b9e73e99c1f Author: Stephen M. Cameron Date: Tue Feb 15 15:33:03 2011 -0600 [SCSI] hpsa: Inform controller we are using 32-bit tags. Controller will transfer only 32-bits on completion if it knows we are only using 32-bit tags. Also, some newer controllers apparently (and erroneously) require that we only use 32-bit tags, and that we inform the controller of this. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 745a7a25bc0f6dc77db72656b7bc8d17b6ee8e53 Author: Stephen M. Cameron Date: Tue Feb 15 15:32:58 2011 -0600 [SCSI] hpsa: Add transport_mode host attribute in /sys Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a9a3a2739a44fc05dcaba0d4d36e52dc444c294f Author: Stephen M. Cameron Date: Tue Feb 15 15:32:53 2011 -0600 [SCSI] hpsa: make hpsa.hpsa_simple_mode=1 module parameter actually work It's not enough to simple avoid putting the board into performant mode, as we have to set up the interrupts differently, etc. When I originally tested this module parameter, I tested it incorrectly without realizing it, and the driver was running in performant mode the whole time unbeknownst to me. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 9e0fc764eaec082cd2ffcf82568dfdd086935934 Author: Stephen M. Cameron Date: Tue Feb 15 15:32:48 2011 -0600 [SCSI] hpsa: do not re-order commands in internal queues Driver's internal queues should be FIFO, not LIFO. This is a port of an almost identical patch from cciss by Jens Axboe. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 5767a1c498931417e69e663ddd5e110cbaabec32 Author: Kleber Sacilotto de Souza Date: Mon Feb 14 20:19:31 2011 -0200 [SCSI] ipr: Fix a race on multiple configuration changes In a multiple configuration change scenario a remove notification can be followed by an immediate add notification for the same device, which will cause the device to be removed but never added back. This patch fixes the problem by ensuring that in such situations the device will be added back. Signed-off-by: Kleber Sacilotto de Souza Acked-by: Brian King Signed-off-by: James Bottomley commit 3d74a539ae07a8f3c061332e426fc07b2310cf05 Author: Konrad Rzeszutek Wilk Date: Thu Feb 17 16:12:51 2011 -0500 pci/xen: When free-ing MSI-X/MSI irq->desc also use generic code. This code path is only run when an MSI/MSI-X PCI device is passed in to PV DomU. In 2.6.37 time-frame we over-wrote the default cleanup handler for MSI/MSI-X irq->desc to be "xen_teardown_msi_irqs". That function calls the the xen-pcifront driver which can tell the backend to cleanup/take back the MSI/MSI-X device. However, we forgot to continue the process of free-ing the MSI/MSI-X device resources (irq->desc) in the PV domU side. Which is what the default cleanup handler: default_teardown_msi_irqs did. Hence we would leak IRQ descriptors. Without this patch, doing "rmmod igbvf;modprobe igbvf" multiple times ends with abandoned IRQ descriptors: 28: 5 xen-pirq-pcifront-msi-x 29: 8 xen-pirq-pcifront-msi-x ... 130: 10 xen-pirq-pcifront-msi-x with the end result of running out of IRQ descriptors. Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit cc0f89c4a426fcd6400a89e9e34e4a8851abef76 Author: Konrad Rzeszutek Wilk Date: Thu Feb 17 12:02:23 2011 -0500 pci/xen: Cleanup: convert int** to int[] Cleanup code. Cosmetic change to make the code look easier to read. Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit fadddc8753ccfab26ee57f3205d6926fe4be1350 Author: Mark Brown Date: Thu Feb 17 16:41:42 2011 -0800 ASoC: Add kerneldoc for jack_status_check callback Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 7887ab3a274dc5f1d1d94ca0cd41ae495d01f94f Author: Mark Brown Date: Thu Feb 17 16:35:55 2011 -0800 ASoC: Allow GPIO jack detection to be configured as a wake source Some systems wish to use jacks as wake sources. Provide a wake flag in the GPIO configuration which causes the driver to enable the IRQ as a wake source. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 5a9f91ca7994bd6a7c696fd397716da3bb440921 Author: Mark Brown Date: Thu Feb 17 12:05:46 2011 -0800 ASoC: Log wm_hubs DC servo operation code when reporting a timeout Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d1118aaad2f5671d252e8dc3b07944d77099835d Author: Mark Brown Date: Wed Feb 16 19:24:39 2011 -0800 ASoC: Remove export of snd_soc_dapm_stream_event() The only thing that should ever be calling this is soc-core and that is built as part of the same module so doesn't need the export. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 4a8d929d142ae594d8a5f0e1efba1d278d07bd8b Author: Mark Brown Date: Wed Feb 16 14:57:17 2011 -0800 ASoC: Fix missing space in WM8994 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 71d642908d4e8e7a2a4a6e0490432e719ff466d5 Author: Marc Kleine-Budde Date: Wed Feb 16 23:23:27 2011 +0100 Driver core: convert platform_{get,set}_drvdata to static inline functions This patch converts the macros for platform_{get,set}_drvdata to static inline functions to add typechecking. Signed-off-by: Marc Kleine-Budde Acked-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 9194a595f756d2e428ddb8e74eb4932d39963aad Author: Harry Wei Date: Mon Feb 7 15:58:15 2011 +0800 Translate linux-2.6/Documentation/magic-number.txt into Chinese I have translated linux-2.6/Documentation/magic-number.txt into Chinese. Signed-off-by: Harry Wei Signed-off-by: Greg Kroah-Hartman commit c164cdfe23a6918725d6a91361facbaf90b27f6f Author: Harry Wei Date: Sat Feb 5 12:59:41 2011 +0800 Translat Documentation/SubmittingChecklist into Chinese I have translated linux-2.6/Documentation/SubmittingChecklist into Chinese. This patch can add translated file(SubmittingChecklist) under linux-2.6/Documentation/zh_CN/. Thanks. Signed-off-by: Harry Wei Signed-off-by: Greg Kroah-Hartman commit 25d41d8455ec1ee7433e146ee94436dc4195f420 Author: Jan Kara Date: Mon Feb 7 15:00:27 2011 +0100 debugfs: Fix filesystem reference counting on debugfs_remove() failure When __debugfs_remove() fails (because simple_rmdir() fails e.g. when a directory is not empty), we must not decrement use count of the filesystem as nothing was in fact deleted. This fixes use after free caused by debugfs in some cases. Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit b38360a284f8acab4ae431b387c05a4e19ff4129 Author: Randy Dunlap Date: Sun Feb 6 21:57:18 2011 -0800 kobject.h: fix build when CONFIG_HOTPLUG is disabled When CONFIG_HOTPLUG is not enabled, the inline function add_uevent_var() needs to have its __attribute__ before the function name/parameters, otherwise there are syntax errors. linux-next-20110207/include/linux/kobject.h:232: error: expected ',' or ';' before '{' token Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit db1c1cce4a653dcbe6949c72ae7b9f42cab1b929 Author: Richard Cochran Date: Fri Feb 18 10:07:25 2011 +0100 ntp: Remove redundant and incorrect parameter check The ADJ_SETOFFSET code redundantly checks the range of the nanoseconds field of the time value. This field is checked again in the subsequent call to timekeeping_inject_offset(). Also, as is, the check will not detect whether the number of microseconds is out of range. Let timekeeping_inject_offset() do the error checking. Signed-off-by: Richard Cochran Cc: johnstul@us.ibm.com LKML-Reference: <20110218090724.GA2924@riccoc20.at.omicron.at> Signed-off-by: Thomas Gleixner commit 13884c6680973f0ce3483dc59b636b4962d6dafe Author: Sebastian Andrzej Siewior Date: Fri Dec 17 16:33:53 2010 +0100 x86/pci: Remove unused variable |arch/x86/pci/ce4100.c: In function `ce4100_conf_read': |arch/x86/pci/ce4100.c:257:9: warning: unused variable `retval' Signed-off-by: Sebastian Andrzej Siewior Cc: dirk.brandewie@gmail.com LKML-Reference: <1292600033-12271-16-git-send-email-bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner commit 55cb8cd45e0600df1473489518d7f12ce1bbe973 Author: Konrad Rzeszutek Wilk Date: Wed Feb 16 13:43:04 2011 -0500 pci/xen: Use xen_allocate_pirq_msi instead of xen_allocate_pirq xen_allocate_pirq -> xen_map_pirq_gsi -> PHYSDEVOP_alloc_irq_vector IFF xen_initial_domain() in addition to the kernel side book-keeping side of things (set chip and handler, update irq_info etc) whereas xen_allocate_pirq_msi just does the kernel book keeping. Also xen_allocate_pirq allocates an IRQ in the 1-1 GSI space whereas xen_allocate_pirq_msi allocates a dynamic one in the >GSI IRQ space. All of this is uneccessary as this code path is only executed when we run as a domU PV guest with an MSI/MSI-X PCI card passed in. Hence we can jump straight to allocating an dynamic IRQ (and binding it to the proper PIRQ) and skip the rest. In short: this change is a cosmetic one. Reviewed-by: Ian Campbell Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk commit 1d4610527bc71d3f9eea520fc51a02d54f79dcd0 Author: Konrad Rzeszutek Wilk Date: Wed Feb 16 13:43:22 2011 -0500 xen-pcifront: Sanity check the MSI/MSI-X values Check the returned vector values for any values that are odd or plain incorrect (say vector value zero), and if so print a warning. Also fixup the return values. This patch was precipiated by the Xen PCIBack returning the incorrect values due to how it was retrieving PIRQ values. This has been fixed in the xen-pciback by "xen/pciback: Utilize 'xen_pirq_from_irq' to get PIRQ value" patch. Reviewed-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit cccad6d4b103e53fb3d1fc1467f654ecb572d047 Author: Felipe Balbi Date: Wed Sep 29 10:55:49 2010 +0300 usb: otg: notifier: switch to atomic notifier most of our notifications, will be called from IRQ context, so an atomic notifier suits the job better. Signed-off-by: Felipe Balbi commit 002eda1348788f623dc42231dcda5f591d753124 Author: Hema HK Date: Thu Feb 17 12:06:10 2011 +0530 usb: musb: OMAP4430: Fix usb device detection if connected during boot OMAP4430 is embedded with UTMI PHY. This PHY does not support the OTG features like ID pin detection and VBUS detection. This function is exported to an external companion chip TWL6030. Software must retrieve the OTG HNP and SRP status from the TWL6030 and configure the bits inside the control module that drive the related USBOTGHS UTMI interface signals. It must also read back the UTMI signals needed to configure the TWL6030 OTG module. Can find more details in the TRM[1]. [1]:http://focus.ti.com/pdfs/wtbu/OMAP4430_ES2.0_Public_TRM_vJ.pdf In OMAP4430 musb driver VBUS and ID notifications are received from the transceiver driver. If the cable/device is connected during boot, notifications from transceiver driver will be missed till musb driver is loaded. Patch to configure the transceiver in the platform_enable/disable functions and enable the vbus in the gadget driver based on the last_event of the otg_transceiver. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 647b2d9c61fe9a842dd89eb01b5f01e9d437993c Author: Hema HK Date: Thu Feb 17 12:06:09 2011 +0530 usb: otg: TWL6030 Save the last event in otg_transceiver Save the last event in the otg_transceiver so that it can used in the musb driver and gadget driver to configure the musb and enable the vbus for host mode and OTG mode, if the device is connected during boot. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 070b8ed96e01adeb978d4f8487fb1350a28fcd0d Author: Hema HK Date: Thu Feb 17 12:06:08 2011 +0530 usb: otg: TWL6030: Introduce the twl6030_phy_suspend function. Introduce the twl6030_phy_suspend function and assign to otg.set_suspend function pointer. This function is used by the musb-omap2430 platform driver during suspend/resume. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit ee896e348cf6f323a00e4ee52e6386f515f86cee Author: Hema HK Date: Thu Feb 17 12:06:07 2011 +0530 usb: otg: OMAP4430: Introducing suspend function for power management Introduced the suspend/resume function for the OMAP4430 internal PHY. This will be used by the twl6030-usb transceiver driver. Moved the clock enable/disable function calls and power on/off of the PHY code from power on/off functions to suspend/resume function. Pass the suspend function through board data for OMAP4430sdp and OMAP4panda. This will be used by the twl6030-usb transceiver driver. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit b807afe41ceefef11a0d965cd9970142afc53d25 Author: Richard Zhao Date: Fri Feb 18 12:36:17 2011 +0800 ARM: imx50: correct iomux-mx50.h wrong daisy chain settings Most fix is for uart txd/cts. They don't need to select input. And fix some other pads with wrong select input. Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 942b99f3a0497a9a53df82ad685082b2980fe75d Author: Richard Zhao Date: Fri Feb 18 12:36:16 2011 +0800 ARM: imx53_loco: add i2c device support Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit c4e942b76414367d034640835a0fcbab5d0cc434 Author: Richard Zhao Date: Fri Feb 18 12:36:15 2011 +0800 ARM: imx53_loco add uncompress print Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 6388b96e84712a2cc045e8371eabd7312ee12fc4 Author: Richard Zhao Date: Fri Feb 18 12:36:14 2011 +0800 ARM: imx53_loco: add all pad configure. Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit daa7954ccd8a0e99376d52c46978f16067f8c2de Author: Fabio Estevam Date: Thu Feb 17 18:09:53 2011 -0200 ARM: mach-mx5: Add watchdog support for MX53 based boards Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 78c73591a91c120c4be02dafc018fcd7ecc8688a Author: Fabio Estevam Date: Thu Feb 17 18:09:52 2011 -0200 ARM: mx5: Add watchdog support for MX53 Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 102c91d8c60bc40e100ead62ac1e9ba05601510c Author: Arnaud Patard (Rtp) Date: Thu Feb 17 15:31:32 2011 +0100 mx51: add support for efika smartbook Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 856e656c4a328907c2b1fdbb6523f16fe1c71b46 Author: Arnaud Patard (Rtp) Date: Thu Feb 17 15:31:31 2011 +0100 efika: enable cpufreq Enable cpufreq on Genesi efika platforms Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 2432cff0fc1c9d1a41476994b18fda04bf9f2686 Author: Arnaud Patard (Rtp) Date: Thu Feb 17 15:31:30 2011 +0100 efikamx: add mc13892 support / implement power off This patch declares regulators for the efikamx. Use it also to power off the efikamx. Unfortunately, on the efikamx to2 boards, this doesn't work but they allow to power off by setting GPIO 4 13 to high level instead of powering off through the mc13892. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 9d72af6e3582977196e3474903950206dc3c590e Author: Arnaud Patard (Rtp) Date: Thu Feb 17 15:31:29 2011 +0100 efikamx: add usb h1 support Now that usb has been fixed, we can enable usb h1 on efikamx Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 7ac18a3845145f4f48e611640e33918ae450f955 Author: Arnaud Patard (Rtp) Date: Thu Feb 17 15:31:28 2011 +0100 Introduce EFIKA_COMMON The Genesi EFIKA MX and EFIKA Smartbook are sharing a lot of things so it makes sense to create a common file for both devices and a specific file for each. No functionnal change except dropping uart 1 & 2. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit a3d1ee10d1bf4520af3d44c1aa6cd46956ec4fd7 Author: Michael Witten Date: Wed Feb 2 14:22:08 2011 -0600 perf tools: Makefile: Remove various and sundry cruft This commit squashes several commits that remove: unnecessary uname calls `sh -c' BUILT_INS and QUIET_BUILT_IN They have no effect, and the `fixup-builtins' and `check-builtins.sh' scripts don't even exist. RUNTIME_PREFIX It's currently never anything but unset, and it's apparently only meaningful when Microsoft Windows is the operating system (according to the source for git). TEST_PROGRAMS EXTRA_PROGRAMS unused SHELL_PATH_SQ portions unused test for V=2 useless exports Only when `V' is undefined (that is, only when the value of `V' is empty) is `export V' performed, which just has the effect of placing the empty-valued variable `V' in the environment. The only other script to make use of `V' is `Documentation/Makefile', which only checks whether `V' is undefined (that is, whether the value of `V' is empty); hence, the `export V' has no effect whatsoever. Similarly, `export QUIET_GEN' is useless because it will only have a non-empty value when `V' has an empty-value, and when `V' has an empty-value, `QUIET_GEN' is always explicitly set in every script in which it is used. `DESTDIR' is only ever defined by the user via the environment or the command line, both of which are automatically exported to sub-make processes. Furthermore, no non-make sub-scripts make use of `DESTDIR' as an environment variable. No other scripts use `perfexec_instdir'. unused QUIET_SUBDIR{0,1} TAR and RPMBUILD PTHREAD_LIBS Maintainer's dist rules and commands distclean target Test suite coverage testing PRINT_DIR and NO_SUBDIR `configure' target NO_CURL @@PERF_VERSION@@ substitution Without the sed command, all of the rule's commands can be reduced to a single line that copies a file and sets the permissions properly in the process. `make test' echo line template_instdir PERF-BUILD-OPTIONS double-colon rules The use of double-colon rules seems misguided or vestigial git. Essentially hard-coded $(SCRIPTS) expansion Signed-off-by: Michael Witten LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 0a54fb63600b745e060d24879ed5194382a466c5 Author: Michael Witten Date: Wed Feb 2 12:04:27 2011 -0600 perf tools: Makefile: Remove tool-specific cruft This commit squashes several commits that remove: NO_C99_FORMAT CURLDIR and EXPATDIR NO_DEFLATE_BOUND CC_LD_DYNPATH and NO_R_TO_GCC_LINKER NO_PERL_MAKEMAKER INTERNAL_QSORT NO_EXTERNAL_GREP NO_PERL SCRIPT_PERL PERL_PATH_SQ Signed-off-by: Michael Witten LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8796cb9d7dc028945af4b2ea858ae8f8f2ecbe8c Author: Michael Witten Date: Wed Feb 2 11:57:41 2011 -0600 perf tools: Makefile: Remove platform-specific cruft While it makes sense that this tool could be used on other platforms at least to parse data, there doesn't appear to be any real support for such usage. This commit squashes several commits that remove: SNPRINTF_RETURNS_BOGUS FREAD_READS_DIRECTORIES NO_D_{INO,TYPE}_IN_DIRENT NO_STRCASESTR NO_MEMMEM NO_STRTOUMAX and NO_STRTOULL NO_SETENV NO_UNSETENV NO_MKDTEMP NEEDS_LIBICONV NEEDS_SOCKET NO_MMAP NO_PTHREADS NO_PREAD NO_TRUSTABLE_FILEMODE NO_IPV6 and NO_SOCKADDR_STORAGE NO_ICONV and OLD_ICONV NO_NSEC, USE_NSEC, and USE_ST_TIMESPEC NO_ST_BLOCKS_IN_STRUCT_STAT NO_FINK and NO_DARWIN_PORTS NO_SYS_SELECT_H NO_HSTRERROR DIR_HAS_BSD_GROUP_SEMANTICS and FORCE_DIR_SET_GID NEEDS_NSL, NO_UINTMAX_T, NO_INET_{N,P}TON COMPAT_{CFLAGS,OBJS} Executable extension `X' Signed-off-by: Michael Witten LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 006cdc32618e09ffe228a7a86af044f3cc0dd714 Author: Michael Witten Date: Wed Feb 2 13:01:41 2011 -0600 perf tools: Makefile: Remove vestigial git-specific cruft This commit squashes several commits that remove: NO_SYMLINK_HEAD NO_SVN_TESTS NO_FAST_WORKING_DIRECTORY USE_STDEV SHA1/SSL cruft makefile rules Signed-off-by: Michael Witten LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 58bff947e2d164c7e5cbf7f485e4b3d4884befeb Author: Jan Beulich Date: Thu Feb 17 15:54:26 2011 +0000 x86: Eliminate pointless adjustment attempts in fixup_irqs() Not only when an IRQ's affinity equals cpu_online_mask is there no need to actually try to adjust the affinity, but also when it's a subset thereof. This particularly avoids adjustment attempts during system shutdown to any IRQs bound to CPU#0. Signed-off-by: Jan Beulich Cc: Thomas Gleixner Cc: Eric W. Biederman Cc: Suresh Siddha Cc: Gary Hade LKML-Reference: <4D5D52C2020000780003272C@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 02ca752e4181e219e243cd61a60dd1da47251f11 Author: Jan Beulich Date: Thu Feb 17 15:51:40 2011 +0000 x86: Remove die_nmi() With no caller left, the function and the DIE_NMIWATCHDOG enumerator can both go away. Signed-off-by: Jan Beulich Cc: Peter Zijlstra Cc: Don Zickus LKML-Reference: <4D5D521C0200007800032702@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit fd8fa4d3ddc4cc04ec8097e632b995d535c52beb Author: Jan Beulich Date: Thu Feb 17 15:56:58 2011 +0000 x86: Combine printk()s in show_regs_common() Printing a single character alone when there's an immediately following printk() is pretty pointless (and wasteful). Signed-off-by: Jan Beulich LKML-Reference: <4D5D535A0200007800032730@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit bb3e6251a69e67d7620373ee18e35b404964273e Author: Jan Beulich Date: Thu Feb 17 15:47:37 2011 +0000 x86: Don't call dump_stack() from arch_trigger_all_cpu_backtrace_handler() show_regs() already prints two(!) stack traces, no need for a third one. Signed-off-by: Jan Beulich LKML-Reference: <4D5D512902000078000326EE@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit e4cc9f4a207aeb819f358114eb23a04547d4807c Merge: e9345aa 668b878 Author: Ingo Molnar Date: Fri Feb 18 08:25:05 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit e9345aab675382176740bc8a2c6d3caf1510e46d Author: Ingo Molnar Date: Fri Feb 18 08:09:49 2011 +0100 Revert "tracing: Add unstable sched clock note to the warning" This reverts commit 5e38ca8f3ea423442eaafe1b7e206084aa38120a. Breaks the build of several !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK architectures. Cc: Jiri Olsa Cc: Steven Rostedt Message-ID: <20110217171823.GB17058@elte.hu> Signed-off-by: Ingo Molnar commit 3d35ac346e981162eeba391e496faceed4753e7b Author: H. Peter Anvin Date: Mon Feb 14 18:36:03 2011 -0800 x86, reboot: Move the real-mode reboot code to an assembly file Move the real-mode reboot code out to an assembly file (reboot_32.S) which is allocated using the common lowmem trampoline allocator. Signed-off-by: H. Peter Anvin LKML-Reference: <4D5DFBE4.7090104@intel.com> Cc: Stephen Rothwell Cc: Rafael J. Wysocki Cc: Matthieu Castet commit 014eea518af3d141e276664cf40ef3da899eba35 Author: H. Peter Anvin Date: Mon Feb 14 18:33:55 2011 -0800 x86: Make the GDT_ENTRY() macro in safe for assembly Make the GDT_ENTRY() macro in safe for use in assembly code by guarding the ULL suffixes with _AC() macros. Signed-off-by: H. Peter Anvin LKML-Reference: <4D5DFBE4.7090104@intel.com> Cc: Rafael J. Wysocki Cc: Matthieu Castet Cc: Stephen Rothwell commit d1ee433539ea5963a8f946f3428b335d1c5fdb20 Author: H. Peter Anvin Date: Mon Feb 14 15:42:46 2011 -0800 x86, trampoline: Use the unified trampoline setup for ACPI wakeup Use the unified trampoline allocation setup to allocate and install the ACPI wakeup code in low memory. Signed-off-by: H. Peter Anvin LKML-Reference: <4D5DFBE4.7090104@intel.com> Cc: Rafael J. Wysocki Cc: Matthieu Castet Cc: Stephen Rothwell commit 4822b7fc6d4870685a9feadfc348d48f5e47460a Author: H. Peter Anvin Date: Mon Feb 14 15:34:57 2011 -0800 x86, trampoline: Common infrastructure for low memory trampolines Common infrastructure for low memory trampolines. This code installs the trampolines permanently in low memory very early. It also permits multiple pieces of code to be used for this purpose. This code also introduces a standard infrastructure for computing symbol addresses in the trampoline code. The only change to the actual SMP trampolines themselves is that the 64-bit trampoline has been made reusable -- the previous version would overwrite the code with a status variable; this moves the status variable to a separate location. Signed-off-by: H. Peter Anvin LKML-Reference: <4D5DFBE4.7090104@intel.com> Cc: Rafael J. Wysocki Cc: Matthieu Castet Cc: Stephen Rothwell commit e49c4d27ab5ffd0d8707685af9ca2866a95660e8 Author: Nishant Kamat Date: Thu Feb 17 09:55:03 2011 -0800 omap: Add chip id recognition for OMAP4 ES2.1 and ES2.2 Allow OMAP4 ES2.1 and ES2.2 revisions to be recognized in the omap4_check_revision() function. Mainly, ES2.1 has fixes that allow LPDDR to be used at 100% OPP (400MHz). ES2.2 additionally has a couple of power management fixes (to reduce leakage), an I2C1 SDA line state fix, and a floating point write corruption fix (cortex erratum). Even though the current mainline support doesn't need to distinguish between ES2.X versions, it's still useful to know the correct silicon rev when issues are reported. Moreover, these id checks can be used by power management code that selects suitable OPPs considering the memory speed limitation on ES2.0. For details about the silicon errata on OMAP4430, refer http://focus.ti.com/pdfs/wtbu/SWPZ009A_OMAP4430_Errata_Public_vA.pdf Signed-off-by: Nishant Kamat Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 1cbb1a61d59b7552e1e3fde485d8af5699fe16e0 Author: Vasanthy Kolluri Date: Thu Feb 17 13:57:19 2011 +0000 enic: Always use single transmit and single receive hardware queues per device We believe that our earlier patch for supporting multiple hardware receive queues per enic device requires more internal testing. At this point, we think that it's best to disable the use of multiple receive queues. The current patch provides an effective means for the same. Also, we continue to disallow multiple hardware transmit queues per device. But change the way we enforce this in order to maintain consistency with the way receive queues are handled. Signed-off-by: Christian Benvenuti Signed-off-by: Danny Guo Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit adc5430b473db2842a96fcce1ffbd43049757d3b Author: Sanjeev Premi Date: Tue Feb 15 10:57:32 2011 +0000 omap3: flash: use pr_err instead of printk Change all occurences of printf() to pr_err(). Includes minor formatting changes as result of this change. Signed-off-by: Sanjeev Premi Signed-off-by: Tony Lindgren commit f69eefd18d5201cd512c862a4bd27b8e8febd20b Author: Sanjeev Premi Date: Tue Feb 15 10:57:31 2011 +0000 omap3: fix minor typos This patch fixes typos that were remaining after the file and functions were renamed. Signed-off-by: Sanjeev Premi Signed-off-by: Tony Lindgren commit 982721f3911b2619482e05910644e5699fbeb065 Author: David S. Miller Date: Wed Feb 16 21:44:24 2011 -0800 ipv4: Use const'ify fib_result deep in the route call chains. The only troublesome bit here is __mkroute_output which wants to override res->fi and res->type, compute those in local variables instead. Signed-off-by: David S. Miller commit b6bf3ca032c9cd517526178f579e7a4e395c6e45 Author: David S. Miller Date: Wed Feb 16 22:04:57 2011 -0800 ipv4: Mark fib_combine_itag()'s 'res' arg as const. Signed-off-by: David S. Miller commit 3b004569d86d02786ebae496e75dc0b625be3e9a Author: David S. Miller Date: Wed Feb 16 14:56:22 2011 -0800 ipv4: Avoid use of signed integers in fib_trie code. GCC emits all kinds of crazy zero extensions when we go from signed int, to unsigned short, etc. etc. This transformation has to be legal because: 1) In tkey_extract_bits() in mask_pfx(), the values are used to perform shifts, on which negative values are undefined by C. 2) In fib_table_lookup() we perform comparisons with unsigned values, constants, and additions. None of which should encounter negative values. Signed-off-by: David S. Miller commit 4f85f99b1e9ae9d62e3ea9f0cd3827020e0d9ba2 Author: David Cohen Date: Tue Feb 15 11:31:13 2011 +0000 omap: IOMMU: add missing function declaration Declaration of exported function 'iopgtable_lookup_entry' is missing from header file. Currently we have a sparse warning as it's not being used externally. Adding its declaration to avoid such warning and allow its usage in future. Signed-off-by: David Cohen Signed-off-by: Tony Lindgren commit c497dd5594ed3ef97bc563b07e8c050618f745a3 Author: Roman Tereshonkov Date: Mon Feb 7 10:47:01 2011 +0200 mtd: OneNAND: OMAP2: increase multiblock erase verify timeout The current multiblock erase verify read timeout 100us is the maximum for none-error case. If errors happen during multibock erase then the specification recommends to run multiblock erase verify command with maximum timeout 10ms (see specs. for KFM4G16Q2A and KFN8G16Q2A). For the most common non-error case we wait 100us in udelay polling loop. In case of timeout the interrupt mode is used to wait for the command end. Signed-off-by: Roman Tereshonkov Acked-by: Artem Bityutskiy Signed-off-by: Tony Lindgren commit 5714b7ed6b3e3c00c0d4719bb66757e64c30ecf6 Author: Adrian Hunter Date: Mon Feb 7 10:47:00 2011 +0200 OMAP: OneNAND: let boards determine OneNAND frequency OneNAND version ID may not give the highest frequency supported and some OneNAND's have setup times that are clock dependent. Let the board provide that information. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 3ad2d861362031dac8b2bba78a8f4c575300948f Author: Adrian Hunter Date: Mon Feb 7 10:46:59 2011 +0200 OMAP: OneNAND: determine frequency in one place OneNAND frequency is determined when calculating GPMC timings. Return that value instead of determining it again in the OMAP OneNAND driver. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 1435ca0fc1a269f9496343e24223a0fc430aff7a Author: Adrian Hunter Date: Mon Feb 7 10:46:58 2011 +0200 OMAP: OneNAND: fix 104MHz support 104MHz needs a latency of 8 clock cycles and the VHF flag must be set. Also t_rdyo is specified as "not applicable" so pick a lower value, and force at least 1 clk between AVD High to OE Low. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 3c7bd1a14071b99d6535b710bc998ae5d3abbb66 Author: David S. Miller Date: Wed Feb 16 14:08:44 2011 -0800 net: Add initial_ref arg to dst_alloc(). This allows avoiding multiple writes to the initial __refcnt. The most simplest cases of wanting an initial reference of "1" in ipv4 and ipv6 have been converted, the rest have been left along and kept at the existing "0". Signed-off-by: David S. Miller commit 4b087ff8572c7e7095787ca14aa72e39c80859bd Author: Rajendra Nayak Date: Thu Feb 3 12:45:21 2011 +0000 omap3sdp: Fix regulator mapping for ads7846 TS controller On the OMAP3430SDP board, the ads7846 touchscreen controller is powered by VAUX3 regulator (supplying 2.8v). Fix this mapping in the board file, and hence prevent the ads7846 driver init to fail with the below error.. ads7846 spi1.0: unable to get regulator: -19 Signed-off-by: Rajendra Nayak Reviewed-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 0c4dcd58fd69aded93b0dc6917cd88b262c8aa3f Author: David S. Miller Date: Thu Feb 17 15:42:37 2011 -0800 ipv4: Consolidate ipv4 dst allocation logic. This also allows us to combine all the dst->flags settings and avoid read/modify/write sequences to this struct member. Signed-off-by: David S. Miller commit 010c2708e536938a2f84d51d625f603b9a8f80ac Author: David S. Miller Date: Thu Feb 17 15:37:09 2011 -0800 ipv4: Move rcu_read_{lock,unlock}() into ip_route_output_slow(). Simplifies tail of __ip_route_output_key(). Signed-off-by: David S. Miller commit f040d33253b2daf6f305fc35fca2399047ced028 Author: Sukumar Ghorai Date: Fri Jan 28 15:42:09 2011 +0530 omap3: nand: making ecc layout as compatible with romcode ecc This patch overrides nand ecc layout and bad block descriptor (for 8-bit device) to support hw ecc in romcode layout. So as to have in sync with ecc layout throughout; i.e. x-loader, u-boot and kernel. This enables to flash x-loader, u-boot, kernel, FS images from kernel itself and compatiable with other tools. This patch does not enables this feature by default and need to pass from board file to enable for any board. Signed-off-by: Vimal Singh Signed-off-by: Sukumar Ghorai Signed-off-by: Tony Lindgren commit f3d73f362d689a1d044e77964864f0a8ea0217f3 Author: Sukumar Ghorai Date: Fri Jan 28 15:42:08 2011 +0530 omap3: nand: ecc layout select from board file This patch makes it possible to select sw or hw (different layout options) ecc scheme supported by omap nand driver. Signed-off-by: Vimal Singh Signed-off-by: Sukumar Ghorai Signed-off-by: Tony Lindgren commit 317379a975c07fe63bc4f86dabd668df96ff3df2 Author: Sukumar Ghorai Date: Fri Jan 28 15:42:07 2011 +0530 omap3: nand: configurable fifo threshold to gain the throughput Configure the FIFO THREASHOLD value different for read and write to keep busy both filling and to drain out of FIFO at reading and writing. Signed-off-by: Vimal Singh Signed-off-by: Sukumar Ghorai Signed-off-by: Tony Lindgren commit 4e070376165a9b7f245fada77645b81352c6ec78 Author: Sukumar Ghorai Date: Fri Jan 28 15:42:06 2011 +0530 omap3: nand: prefetch in irq mode support This patch enable prefetch-irq mode for nand transfer(read, write) Signed-off-by: Vimal Singh Signed-off-by: Sukumar Ghorai Signed-off-by: Tony Lindgren commit db97eb7dfe13f6c04f0a0e77c32e2691f563ab8b Author: Sukumar Ghorai Date: Fri Jan 28 15:42:05 2011 +0530 omap: gpmc: enable irq mode in gpmc add support the irq mode in GPMC. gpmc_init() function move after omap_init_irq() as it has dependecy on irq. Signed-off-by: Sukumar Ghorai Signed-off-by: Tony Lindgren commit 1b0b323c70cd5fdca967d89ed3a03dfebd84ada7 Author: Sukumar Ghorai Date: Fri Jan 28 15:42:04 2011 +0530 omap3: nand: configurable transfer type per board nand transfer type (sDMA, Polled, prefetch) can be select from board file, enabling all transfer type in driver, by default. this helps in multi-omap build and to select different transfer type for different board. Signed-off-by: Sukumar Ghorai Signed-off-by: Tony Lindgren commit d5ce2b6592c49935462cba7317fa67fe8ee474ec Author: Sukumar Ghorai Date: Fri Jan 28 15:42:03 2011 +0530 omap3630: nand: fix device size to work in polled mode zoom3 and 3630-sdp having the x16 nand device. This patch configure gpmc as x16 and select the currect function in driver for polled mode (without prefetch enable) transfer. Signed-off-by: Sukumar Ghorai Signed-off-by: Tony Lindgren commit 5ada552746685d558d0a8e9e979921c75a41e469 Author: David S. Miller Date: Thu Feb 17 15:29:00 2011 -0800 ipv4: Simplify output route creation call sequence. There's a lot of redundancy and unnecessary stack frames in the output route creation path. 1) Make __mkroute_output() return error pointers. 2) Eliminate ip_mkroute_output() entirely, made possible by #1. 3) Call __mkroute_output() directly and handling the returning error pointers in ip_route_output_slow(). Signed-off-by: David S. Miller commit 3a6b1676c6f27f7fad1a3d6fab5a95f90b1e7402 Author: Will Deacon Date: Tue Feb 15 17:28:28 2011 +0100 ARM: 6675/1: use phys_addr_t instead of unsigned long in conversion code The unsigned long datatype is not sufficient for mapping physical addresses >= 4GB. This patch ensures that the address conversion code in asm/memory.h casts to the correct type when handling physical addresses. The internal v2p macros only deal with lowmem addresses, so these do not need to be modified. Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King commit 4d901c4271951d110afb13ee9aa73d27a6c8e53d Author: Rob Herring Date: Wed Feb 2 16:33:17 2011 +0100 ARM: 6648/1: map ATAGs when not in first 1MB of RAM If ATAGs or DTB pointer is not within first 1MB of RAM, then the boot params will not be mapped early enough, so map the 1MB region that r2 points to. Only map the first 1MB when r2 is 0. Some assembly improvements from Nicolas Pitre. Acked-by: Tony Lindgren Acked-by: Nicolas Pitre Signed-off-by: Rob Herring Signed-off-by: Russell King commit cada3c0841e1deaec4c0f92654610b028dc683ff Author: Russell King Date: Tue Jan 4 19:39:29 2011 +0000 ARM: P2V: extend to 16-bit translation offsets MSM's memory is aligned to 2MB, which is more than we can do with our existing method as we're limited to the upper 8 bits. Extend this by using two instructions to 16 bits, automatically selected when MSM is enabled. Acked-by: Tony Lindgren Reviewed-by: Nicolas Pitre Tested-by: Nicolas Pitre Signed-off-by: Russell King commit dc21af99fadcfa0ae65b52fd0895f85824f0c288 Author: Russell King Date: Tue Jan 4 19:09:43 2011 +0000 ARM: P2V: introduce phys_to_virt/virt_to_phys runtime patching This idea came from Nicolas, Eric Miao produced an initial version, which was then rewritten into this. Patch the physical to virtual translations at runtime. As we modify the code, this makes it incompatible with XIP kernels, but allows us to achieve this with minimal loss of performance. As many translations are of the form: physical = virtual + (PHYS_OFFSET - PAGE_OFFSET) virtual = physical - (PHYS_OFFSET - PAGE_OFFSET) we generate an 'add' instruction for __virt_to_phys(), and a 'sub' instruction for __phys_to_virt(). We calculate at run time (PHYS_OFFSET - PAGE_OFFSET) by comparing the address prior to MMU initialization with where it should be once the MMU has been initialized, and place this constant into the above add/sub instructions. Once we have (PHYS_OFFSET - PAGE_OFFSET), we can calculate the real PHYS_OFFSET as PAGE_OFFSET is a build-time constant, and save this for the C-mode PHYS_OFFSET variable definition to use. At present, we are unable to support Realview with Sparsemem enabled as this uses a complex mapping function, and MSM as this requires a constant which will not fit in our math instruction. Add a module version magic string for this feature to prevent incompatible modules being loaded. Tested-by: Tony Lindgren Reviewed-by: Nicolas Pitre Tested-by: Nicolas Pitre Signed-off-by: Russell King commit 5b7de4547b388d3949620e21d072e35b6f2638fa Author: Tony Lindgren Date: Fri Feb 4 21:03:24 2011 +0100 ARM: 6651/1: omap: Fix DEBUG_LL code for p2v changes These are needed for CONFIG_ARM_PATCH_PHYS_VIRT to work. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 72a20e22f49e2dad3180c23980a9df1c63faab0a Author: Russell King Date: Tue Jan 4 19:04:00 2011 +0000 ARM: P2V: eliminate head.S use of PHYS_OFFSET for !XIP_KERNEL head.S makes use of PHYS_OFFSET. When it becomes a variable, the assembler won't understand this. Compute PHYS_OFFSET by the following method. This code is linked at its virtual address, but run at before the MMU is enabled, so at his physical address. 1: .long . .long PAGE_OFFSET adr r0, 1b @ r0 = physical ',' ldmia r0, {r1, r2} @ r1 = virtual '.', r2 = PAGE_OFFSET sub r1, r0, r1 @ r1 = physical-virtual add r2, r2, r1 @ r2 = PAGE_OFFSET + physical-virtual @ := PHYS_OFFSET. Switch XIP users of PHYS_OFFSET to use PLAT_PHYS_OFFSET - we can't use this method for XIP kernels as the code doesn't execute in RAM. Tested-by: Tony Lindgren Reviewed-by: Nicolas Pitre Signed-off-by: Russell King commit b75c178afaa975896e894bb2b6951dc4cd43c977 Author: Russell King Date: Tue Jan 4 19:03:16 2011 +0000 ARM: P2V: avoid initializers and assembly using PHYS_OFFSET As PHYS_OFFSET will be becoming a variable, we can't have it used in initializers nor assembly code. Replace those in generic code with a run-time initialization. Replace those in platform code using the individual platform specific PLAT_PHYS_OFFSET. Acked-by: Nicolas Pitre Acked-by: Tony Lindgren Acked-by: Kukjin Kim Acked-by: David Brown Acked-by: Eric Miao Signed-off-by: Russell King commit f4117ac9e237b74afdf5e001d5ea26a4d15e9847 Author: Russell King Date: Tue Jan 4 18:07:14 2011 +0000 ARM: P2V: separate PHYS_OFFSET from platform definitions This uncouple PHYS_OFFSET from the platform definitions, thereby facilitating run-time computation of the physical memory offset. Acked-by: Nicolas Pitre Acked-by: Viresh Kumar Acked-by: H Hartley Sweeten Acked-by: Magnus Damm Acked-by: Tony Lindgren Acked-by: Jean-Christophe PLAGNIOL-VILLARD Acked-by: Wan ZongShun Acked-by: Kukjin Kim Acked-by: Eric Miao Acked-by: Jiandong Zheng Signed-off-by: Russell King commit 8ffd878419839638d1aea102455b575da39c1a62 Author: Gustavo F. Padovan Date: Thu Feb 17 19:24:05 2011 -0300 Bluetooth: fix checkpatch errors in af_bluetooth.c Signed-off-by: Gustavo F. Padovan commit 602f9887cdb14851631416d64ca27b48e2dd1f92 Author: Gustavo F. Padovan Date: Thu Feb 17 19:22:19 2011 -0300 Bluetooth: Fix errors reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan commit 854c122f54d0074afb9e9a8f2ab7d6258c1f218f Author: Vaibhav Hiremath Date: Tue Jan 25 17:37:41 2011 +0000 OMAP3EVM: Set TSC wakeup option in pad config Set OMAP_PIN_OFF_WAKEUPENABLE to enable the wake-up functionality from touchscreen controller. Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit 42fc8cab020c4d848a969b7c0a80b591c35bb263 Author: Vaibhav Hiremath Date: Tue Jan 25 17:37:40 2011 +0000 OMAP3EVM: Made backlight GPIO default state to off If you choose default output to DVI, the LCD backlight used to stay on, since panel->disable function never gets called. So, during init put backlight GPIO to off state and the driver code will decide which output to enable. Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit e2174ca430ec52375a02ed20859aeceb0d455b72 Author: Gustavo F. Padovan Date: Thu Feb 17 19:16:55 2011 -0300 Bluetooth: fix errors reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan commit cf0bdefd4676ad4ad59507a058821491a40ec7e6 Author: Michał Mirosław Date: Tue Feb 15 16:59:18 2011 +0000 loopback: convert to hw_features This also enables TSOv6, TSO-ECN, and UFO as loopback clearly can handle them. Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit e83d360d9a7e5d71d55c13e96b19109a2ea23bf0 Author: Michał Mirosław Date: Tue Feb 15 16:59:18 2011 +0000 net: introduce NETIF_F_RXCSUM Introduce NETIF_F_RXCSUM to replace device-private flags for RX checksum offload. Integrate it with ndo_fix_features. ethtool_op_get_rx_csum() is removed altogether as nothing in-tree uses it. Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit da8ac86c4a56a14bf8deea7d2f92d0a453c67f91 Author: Michał Mirosław Date: Tue Feb 15 16:59:18 2011 +0000 net: use ndo_fix_features for ethtool_ops->set_flags Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 86794881c29a7ea6271644b49ad81518cabda96b Author: Michał Mirosław Date: Tue Feb 15 16:59:17 2011 +0000 net: ethtool: use ndo_fix_features for offload setting Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 5455c6998d34dc983a8693500e4dffefc3682dc5 Author: Michał Mirosław Date: Tue Feb 15 16:59:17 2011 +0000 net: Introduce new feature setting ops This introduces a new framework to handle device features setting. It consists of: - new fields in struct net_device: + hw_features - features that hw/driver supports toggling + wanted_features - features that user wants enabled, when possible - new netdev_ops: + feat = ndo_fix_features(dev, feat) - API checking constraints for enabling features or their combinations + ndo_set_features(dev) - API updating hardware state to match changed dev->features - new ethtool commands: + ETHTOOL_GFEATURES/ETHTOOL_SFEATURES: get/set dev->wanted_features and trigger device reconfiguration if resulting dev->features changed + ETHTOOL_GSTRINGS(ETH_SS_FEATURES): get feature bits names (meaning) Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 0a417704777ed29d0e8c72b7274a328e61248e75 Author: Michał Mirosław Date: Tue Feb 15 16:59:17 2011 +0000 ethtool: factorize get/set_one_feature This allows to enable GRO even if RX csum is disabled. GRO will not be used for packets without hardware checksum anyway. Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 340ae1654c0667e0cdd2a6d4dc16f7946e018881 Author: Michał Mirosław Date: Tue Feb 15 16:59:16 2011 +0000 ethtool: factorize ethtool_get_strings() and ethtool_get_sset_count() This is needed for unified offloads patch. Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 212b573f5552c60265da721ff9ce32e3462a2cdd Author: Michał Mirosław Date: Tue Feb 15 16:59:16 2011 +0000 ethtool: enable GSO and GRO by default Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 9a279ea3a77ebcc91b68f0546e7cfa5018a12513 Author: Michał Mirosław Date: Tue Feb 15 16:59:16 2011 +0000 ethtool: move EXPORT_SYMBOL(ethtool_op_set_tx_csum) to correct place Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 3c95c985fa91ecf6a0e29622bbdd13dcfc5ce9f1 Author: Kay Sievers Date: Thu Feb 17 18:39:28 2011 +0100 tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys This is useful for system management software so that it can kick off things like gettys and everything that's started from a tty, before we reuse it from/for something else or shut it down. Without this ioctl it would have to temporarily become the owner of the tty, then call vhangup() and then give it up again. Cc: Lennart Poettering Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 904c545c22dc4926e73c5c869efed0ca6a778bda Author: Vaibhav Hiremath Date: Tue Jan 25 17:37:39 2011 +0000 AM/DM37x: DSS mux configuration for >Rev-B processor cards To support higher resolution (e.g 720P@60), on OMAP36x (AM/DM37x) DSS data bus has been muxed with sys_boot pins. DSS[18-23] => DSS[0-5] sys_boot[0,1 3-5] => DSS[18-23] EVM revision >=RevB adopt this mux changes, which is going to ship outside. Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit 410491d408ee98a31c6eeff5072ae0c13e0a2324 Author: Vaibhav Hiremath Date: Tue Jan 25 17:37:38 2011 +0000 OMAP3EVM: Add vio regulator supply required for ads7846 TSC driver Add vio regulator supply, needed for ads7846 touchscreen controller driver. Tested on OMAP3 (ES3.1 Si) RevG version of EVM. Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit f186e9b24f84e771124c6ee47e19dac5de35f987 Author: Vaibhav Hiremath Date: Tue Jan 25 17:37:37 2011 +0000 omap3evm: Change TWL related gpio API's to gpio*_cansleep Since TWL GPIO's can go into sleep, and using normal gpio_get/set_value() API will lead to kernel dump (WARN_ON()). So replacing standard gpio_get/set_value() to gpio_get/set_value_cansleep(). Signed-off-by: Vaibhav Hiremath Reviewed-by: Charulatha V Signed-off-by: Tony Lindgren commit 9bc64b89cd730a09b02c66af730229e0abc9e2bb Author: Vaibhav Hiremath Date: Mon Jan 24 19:25:55 2011 +0000 OMAP3EVM: Reset the smsc911x ethernet controller in board_init With addition of hwmod support to gpio, the ethernet controller goes undetected for OMAP35xEVM. So explicitly assert the reset signal to ethernet controller smsc911x - - GPIO7 (>=RevG version of EVM's) - GPIO64 (<=RevD version of EVM's) Tested this patch on RevG version of EVM with ES3.1 Si. This patch is based on intial version from Charulatha V, reference to original discussion - http://www.mail-archive.com/linux-omap@vger.kernel.org/msg35784.html Signed-off-by: Vaibhav Hiremath Signed-off-by: Tony Lindgren commit 5990b1892bbd0bb3adfc9a09bb3bcbde32471e59 Author: Vasanthy Kolluri Date: Thu Feb 17 08:53:17 2011 +0000 enic: Clean up: Remove a not needed #ifdef Signed-off-by: Christian Benvenuti Signed-off-by: Danny Guo Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit e0afe53fbea3823a1b1faef8d7701dd73bb74d5c Author: Vasanthy Kolluri Date: Thu Feb 17 08:53:12 2011 +0000 enic: Bug fix: Reset driver count of registered unicast addresses to zero during device reset During a device reset, clear the counter for the no. of unicast addresses registered. Also, rename the routines that update unicast and multicast address lists. Signed-off-by: Christian Benvenuti Signed-off-by: Danny Guo Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit 741927f753a41c644840589a382a1d3500f86206 Author: Eyal Reizer Date: Thu Jan 27 09:49:49 2011 +0000 omap3evm: add support for the WL12xx WLAN module to the AM/DM3xx Evaluation Module Adds platform initialization for working with the WLAN module attached to the evaluation module. The patch includes MMC2 initialization, SDIO and control pins muxing and platform device registration Signed-off-by: Eyal Reizer Signed-off-by: Tony Lindgren commit 59556765cd30467ff64a391906ad8eb68f886ad3 Author: Syed Rafiuddin Date: Mon Dec 27 05:51:45 2010 +0000 OMAP4: keypad: Add the board support -Add the platform changes for the keypad driver -Register keyboard device with hwmod framework. Signed-off-by: Syed Rafiuddin Signed-off-by: Abraham Arce Signed-off-by: Shubhrajyoti D Signed-off-by: Tony Lindgren commit db2e2e6ee9ee9ce93b04c6975fdfef304771d6ad Author: Tejun Heo Date: Mon Jan 24 15:43:03 2011 +0100 xen-pcifront: don't use flush_scheduled_work() flush_scheduled_work() is scheduled for deprecation. Cancel ->op_work directly instead. Signed-off-by: Tejun Heo Cc: Ryan Wilson Cc: Jan Beulich Cc: Jesse Barnes Signed-off-by: Konrad Rzeszutek Wilk commit ddf12286951aee1e7763112cf26629de3fabe6ae Author: Alexander Kurz Date: Thu Feb 17 09:35:47 2011 +0100 Documentation/filesystems/romfs.txt: fixing link to genromfs Signed-off-by: Alexander Kurz Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina commit 64d8ad6d745bbb596bfce3c5d0157267feba7e26 Author: Ben Hutchings Date: Wed Jan 5 00:50:41 2011 +0000 sfc: Implement hardware acceleration of RFS Use the existing filter management functions to insert TCP/IPv4 and UDP/IPv4 4-tuple filters for Receive Flow Steering. For each channel, track how many RFS filters are being added during processing of received packets and scan the corresponding number of table entries for filters that may be reclaimed. Do this in batches to reduce lock overhead. Signed-off-by: Ben Hutchings commit ab532cf32b4055028ad095d3c1fee9eec28ed25e Author: Tom Herbert Date: Wed Feb 16 10:27:02 2011 +0000 bnx2x: Support for managing RX indirection table Support fetching and retrieving RX indirection table via ethtool. Signed-off-by: Tom Herbert Acked-by: Eric Dumazet Acked-by: Eilon Greenstein Signed-off-by: David S. Miller commit 9721dbb375a9db5f7f430601b7ec0393e1c59f82 Author: Uwe Kleine-König Date: Thu Feb 17 21:14:15 2011 +0100 net/fec: remove unused driver data Apart from not being used the first argument isn't even a struct platform_device *. Reported-by: Marc Kleine-Budde Signed-off-by: Uwe Kleine-König commit afaae08442d86402f9e0b63475c02a651c6f1387 Author: Alan Cox Date: Mon Feb 14 16:28:18 2011 +0000 hci_ath: Fix the mess in this driver Was this exploitable - who knows, but it was certainly totally broken Signed-of-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8d075b199b9a66ad90296f898f1f15c0ae1511b8 Author: Alan Cox Date: Mon Feb 14 16:27:53 2011 +0000 tty: add a helper for setting termios data from kernel side This basically encapsulates the small bit of locking knowledge needed. While we are at it make sure we blow up on any more abusers and unsafe misuses of ioctl for this kind of stuff. We change the function to return an argument as at some point it needs to honour the POSIX 'I asked for changes but got none of them' error reporting corner case. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 94c2273d6c1b65eaaf2a6446c7147bdf6e5ae924 Author: Greg Kroah-Hartman Date: Thu Feb 17 12:02:51 2011 -0800 tty: fix build error in vt_ioctl.c if CONFIG_COMPAT is enabled This was caused by the previous patch to remove the file pointer from the tty ioctl handler. Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6caa76b7786891b42b66a0e61e2c2fff2c884620 Author: Alan Cox Date: Mon Feb 14 16:27:22 2011 +0000 tty: now phase out the ioctl file pointer for good Only oddities here are a couple of drivers that bogusly called the ldisc helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes away. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 00a0d0d65b61241a718d0aee96f46b9a2d93bf26 Author: Alan Cox Date: Mon Feb 14 16:27:06 2011 +0000 tty: remove filp from the USB tty ioctls We don't use it so we can trim it from here as we try and stamp the file object dependencies out of the serial code. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 20b9d17715017ae4dd4ec87fabc36d33b9de708e Author: Alan Cox Date: Mon Feb 14 16:26:50 2011 +0000 tiocmset: kill the file pointer argument Doing tiocmget was such fun we should do tiocmset as well for the same reasons Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 60b33c133ca0b7c0b6072c87234b63fee6e80558 Author: Alan Cox Date: Mon Feb 14 16:26:14 2011 +0000 tiocmget: kill off the passing of the struct file We don't actually need this and it causes problems for internal use of this functionality. Currently there is a single use of the FILE * pointer. That is the serial core which uses it to check tty_hung_up_p. However if that is true then IO_ERROR is also already set so the check may be removed. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit adf9251fe9b87b5a50deebe489db2df8df4715fc Author: Tobias Klauser Date: Wed Feb 9 10:58:29 2011 +0100 MAINTAINERS: Add myself as a maintainer for altera_uart/altera_jtaguart Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 2780ad42f5fe6739882603c61c8decba6e50eaa2 Author: Tobias Klauser Date: Wed Feb 9 10:57:04 2011 +0100 tty: serial: altera_uart: Use port->regshift to store bus shift Use the regshift member of struct uart_port to store the address stride from platform data. This way we can save one dereference per call of altera_uart_readl and altera_uart_writel. This also allows us to use the driver without platform data, which is needed for device tree support in the Nios2 port. Acked-by: Anton Vorontsov Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit e96fabd8791aad30a3c8a03919893ae3e2e3df25 Author: Tobias Klauser Date: Wed Feb 9 10:56:52 2011 +0100 tty: serial: altera_uart: Handle pdev->id == -1 in altera_uart_remove Commit 6b5756f176568a710d008d3b478128fafb6707f0 introduced the possibility for pdev->id being -1 but the change was not done equally in altera_uart_remove. This patch fixes this. Acked-by: Anton Vorontsov Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit d637837583163a1a70331ce48097f697cac85e32 Author: Jiri Olsa Date: Fri Feb 11 15:39:28 2011 +0100 tty,vt: fix VT_SETACTIVATE console switch using VT_SETACTIVATE ioctl for console switch did not work, since it put wrong param to the set_console function. Also ioctl returned misleading error, because of the missing break statement. I wonder anyone has ever used this one :). Signed-off-by: Jiri Olsa Signed-off-by: Greg Kroah-Hartman commit 42bd7a4f68e7785dce656a379c3de0a74f5a4d84 Author: Viktar Palstsiuk Date: Wed Feb 9 15:26:13 2011 +0100 atmel_serial: enable PPS support Enables PPS support in atmel serial driver to make PPS API working. Signed-off-by: Viktar Palstsiuk Signed-off-by: Nicolas Ferre Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Greg Kroah-Hartman commit daaf6ff42d12c89f179868387c0107db6625f0f3 Author: Niranjana Vishwanathapura Date: Wed Feb 9 11:16:34 2011 -0800 tty: Add msm_smd_tty driver msm_smd_tty driver provides tty device interface to 'DS' and 'GPSNMEA' streaming SMD ports. Cc: Brian Swetland Signed-off-by: Niranjana Vishwanathapura Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 0d0389e5414c8950b1613e8bdc74289cde3d6d98 Author: Yin Kangkai Date: Wed Feb 9 11:35:18 2011 +0800 serial: change the divisor latch only when prescalar actually changed In 8250.c original ns16550 autoconfig code, we change the divisor latch when we goto to high speed mode, we're assuming the previous speed is legacy. This some times is not true. For example in a system with both CONFIG_SERIAL_8250 and CONFIG_SERIAL_8250_PNP set, in this case, the code (autoconfig) will be called twice, one in serial8250_init/probe() and the other is from serial_pnp_probe. When serial_pnp_probe calls the autoconfig for NS16550A, it's already in high speed mode, change the divisor latch (quot << 3) in this case will make the UART console garbled. CC: Greg Kroah-Hartman CC: David Woodhouse CC: linux-kernel@vger.kernel.org CC: stable@kernel.org Signed-off-by: Yin Kangkai Signed-off-by: Greg Kroah-Hartman commit 95926d2db6256e08d06b753752a0d903a0580acc Author: Yin Kangkai Date: Wed Feb 9 11:34:20 2011 +0800 serial: also set the uartclk value in resume after goes to highspeed For any reason if the NS16550A was not work in high speed mode (e.g. we hold NS16550A from going to high speed mode in autoconfig_16550a()), now we are resume from suspend, we should also set the uartclk to the correct value. Otherwise it is still the old 1843200 and that will bring issues. CC: Greg Kroah-Hartman CC: David Woodhouse CC: linux-kernel@vger.kernel.org CC: stable@kernel.org Signed-off-by: Yin Kangkai Signed-off-by: Greg Kroah-Hartman commit 8115be01462f8af2dc22dd65dd28268bb9b8bff6 Author: Russ Gorby Date: Mon Feb 7 12:02:32 2011 -0800 serial: ifx6x60: minor cleanup renamed spi_driver variable to not be h/w specific set driver name to use DRVNAME define removed commented-out define Signed-off-by: Russ Gorby Signed-off-by: Greg Kroah-Hartman commit 2aff8d90a073e5a07e1ff5a94779d6a21fb72dd2 Author: Russ Gorby Date: Mon Feb 7 12:02:31 2011 -0800 serial: ifx6x60: probe routine needs to call spi_setup The probe routine should call spi_setup() to configure the SPI bus so it can properly communicate with the device. E.g. the device operates in SPI mode 1. Called spi_setup to configure SPI mode, max_speed_hz, and bpw Signed-off-by: Russ Gorby Signed-off-by: Greg Kroah-Hartman commit 1b79b440576b80bace7b6fa012a57ed91d763b5f Author: Russ Gorby Date: Mon Feb 7 12:02:30 2011 -0800 serial: ifx6x60: set SPI max_speed_hz based on platform type Platforms containing the 6260 can run up to 25Mhz. For these platforms set max_speed_hz to 25Mhz. Signed-off-by: Russ Gorby Signed-off-by: Greg Kroah-Hartman commit f089140ea760b42542389c96f9a54d3076696b2c Author: Russ Gorby Date: Mon Feb 7 12:02:29 2011 -0800 serial: ifx6x60: changed internal bpw from boolean to int driver should support 32bit SPI transfers. The boolean variable only allowed 8/16. Changed to support 8/16/32 for future enabling of 32 bpw. Signed-off-by: Russ Gorby Signed-off-by: Greg Kroah-Hartman commit 5fc324952049b2e6d16a54ef89afee25611ca476 Author: Russ Gorby Date: Mon Feb 7 12:02:28 2011 -0800 serial: ifx6x60: dma_alloc_coherent must use parent dev This driver is a SPI protocol driver and has no DMA ops associated with the device so the call will fail. Furthermore, the DMA allocation made here will be used by the SPI controller driver (parent dev) so it makes sense to pass that device instead. Signed-off-by: Russ Gorby Signed-off-by: Greg Kroah-Hartman commit b68f23b24e0013d489aaa986da0210feea00d4c1 Author: Russ Gorby Date: Mon Feb 7 12:02:27 2011 -0800 serial: ifx6x60: fixed call to tty_port_init The port ops must be set AFTER calling port init as that function zeroes the structure Signed-off-by: Russ Gorby Signed-off-by: Greg Kroah-Hartman commit fcdba07ee390d9d9c15de8b2a17baef689284fcc Author: Jiri Olsa Date: Mon Feb 7 19:31:25 2011 +0100 tty,vcs removing con_buf/conf_buf_mtx seems there's no longer need for using con_buf/conf_buf_mtx as vcs_read/vcs_write buffer for user's data. The do_con_write function, that was the other user of this, is currently using its own kmalloc-ed buffer. Not sure when this got changed, as I was able to find this code in 2.6.9, but it's already gone as far as current git history goes - 2.6.12-rc2. AFAICS there's a behaviour change with the current change. The lseek is not completely mutually exclusive with the vcs_read/vcs_write - the file->f_pos might get updated via lseek callback during the vcs_read/vcs_write processing. I tried to find out if the prefered behaviour is to keep this in sync within read/write/lseek functions, but I did not find any pattern on different places. I guess if user end up calling write/lseek from different threads she should know what she's doing. If needed we could use dedicated fd mutex/buffer. Signed-off-by: Jiri Olsa Signed-off-by: Greg Kroah-Hartman commit dc1892c4bc6960121ca4c8023a07c815cfd689be Author: Jiri Olsa Date: Mon Feb 7 19:31:24 2011 +0100 tty,vcs: lseek/VC-release race fix there's a race between vcs's lseek handler and VC release. The lseek handler does not hold console_lock and touches VC's size info. If during this the VC got released, there's an access violation. Following program triggers the issue for me: [SNIP] #define _BSD_SOURCE #include #include #include #include #include #include #include #include static int run_seek(void) { while(1) { int fd; fd = open("./vcs30", O_RDWR); while(lseek(fd, 0, 0) != -1); close(fd); } } static int open_ioctl_tty(void) { return open("/dev/tty1", O_RDWR); } static int do_ioctl(int fd, int req, int i) { return ioctl(fd, req, i); } #define INIT(i) do_ioctl(ioctl_fd, VT_ACTIVATE, i) #define SHUT(i) do_ioctl(ioctl_fd, VT_DISALLOCATE, i) int main(int argc, char **argv) { int ioctl_fd = open_ioctl_tty(); if (ioctl < 0) { perror("open tty1 failed\n"); return -1; } if ((-1 == mknod("vcs30", S_IFCHR|0666, makedev(7, 30))) && (errno != EEXIST)) { printf("errno %d\n", errno); perror("failed to create vcs30"); return -1; } do_ioctl(ioctl_fd, VT_LOCKSWITCH, 0); if (!fork()) run_seek(); while(1) { INIT(30); SHUT(30); } return 0; } [SNIP] Signed-off-by: Jiri Olsa Signed-off-by: Greg Kroah-Hartman commit 1ffdda950394b6da54d68e9643bc691ebad7a6cc Author: Mandeep Singh Baines Date: Sun Feb 6 09:31:53 2011 -0800 TTY: use appropriate printk priority level printk()s without a priority level default to KERN_WARNING. To reduce noise at KERN_WARNING, this patch set the priority level appriopriately for unleveled printks()s. This should be useful to folks that look at dmesg warnings closely. Signed-off-by: Mandeep Singh Baines Signed-off-by: Greg Kroah-Hartman commit 5427bcf5e95245d3e220742ac703182bdb973769 Author: Mike Frysinger Date: Fri Feb 4 20:45:49 2011 -0500 hvc: add Blackfin JTAG console support This converts the existing bfin_jtag_comm TTY driver to the HVC layer so that the common HVC code can worry about all of the TTY/polling crap and leave the Blackfin code to worry about the Blackfin bits. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 9fc3de9c83565fcaa23df74c2fc414bb6e7efb0a Author: Arthur Taylor Date: Fri Feb 4 13:55:50 2011 -0800 vt: Add virtual console keyboard mode OFF virtual console: add keyboard mode OFF Add a new mode for the virtual console keyboard OFF in which all input other than shift keys is ignored. Prevents vt input buffers from overflowing when a program opens but doesn't read from a tty, like X11 using evdev for input. Signed-off-by: Arthur Taylor Signed-off-by: Greg Kroah-Hartman commit d8692748408fbec28dfb065f4127307e24187476 Author: Hema HK Date: Thu Feb 17 12:06:06 2011 +0530 usb: otg: OMAP4430: Add phy_suspend function pointer to twl4030_usb_data Declare the .phy_suspend function pointer to twl4030_usb_data structure. OMAP internal phy suspend function will be hooked though this function pointer to use in the transceiver driver. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 31e9992ab09264ed1372ba86a0924899ab08700b Author: Hema HK Date: Thu Feb 17 12:06:05 2011 +0530 usb: otg: Remove one unnecessary I2C read request. To get the ID status there was an I2C read transfer. Removed this I2C read transfer as this info can be used from existing variable(linkstat). Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 6dc2503b81a0171e68766f722a452e97a7da320b Author: Hema HK Date: Thu Feb 17 12:06:04 2011 +0530 usb: otg: enable regulator only on cable/device connect Remove the regulator enable while driver loading and enable it only when the cable/device is connected and disable it when disconnected. Remove the configuration of config_state and config_trans register configuration as these registers are programmed when regulator enable/disable is called. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 207b0e1f1655bd7008b7322cdc3f84fb171c546d Author: Hema HK Date: Thu Feb 17 12:07:22 2011 +0530 usb: musb: Using runtime pm APIs for musb. Calling runtime pm APIs pm_runtime_put_sync() and pm_runtime_get_sync() for enabling/disabling the clocks, sysconfig settings. Enable clock, configure no-idle/standby when active and configure force idle/standby and disable clock when idled. This is taken care by the runtime framework when driver calls the pm_runtime_get_sync and pm_runtime_put_sync APIs. Need to configure MUSB into force standby and force idle mode when usb not used Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Kevin Hilman Cc: Cousson, Benoit Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit ad1adb89a0d9410345d573b6995a1fa9f9b7c74a Author: Felipe Balbi Date: Wed Feb 16 12:40:05 2011 +0200 usb: musb: gadget: do not poke with gadget's list_head struct usb_request's list_head is supposed to be used only by gadget drivers, but musb is abusing that. Give struct musb_request its own list_head and prevent musb from poking into other driver's business. Signed-off-by: Felipe Balbi commit 63eed2b52494e35aaf38ac2db537d6ea0a55b0da Author: Felipe Balbi Date: Mon Jan 17 10:34:38 2011 +0200 usb: musb: gadget: beautify usb_gadget_probe_driver()/usb_gadget_unregister_driver Just a few cosmetic fixes to usb_gadget_probe_driver() and usb_gadget_unregister_driver(). Decreased a few indentation levels with goto statements. While at that, also add the missing call to musb_stop(). If we don't have OTG, there's no point of leaving MUSB prepared for operation if a gadget driver fails to probe. The same is valid for usb_gadget_unregister_driver(), since we are removing the gadget driver and we don't have OTG, we can completely unconfigure MUSB. Signed-off-by: Felipe Balbi commit 75a14b1434a0ca409bcc8ab9b6b2e680796c487e Author: Felipe Balbi Date: Wed Feb 16 12:27:54 2011 +0200 usb: musb: do not error out if Kconfig doesn't match board mode During development, even though board is wired to e.g. OTG, we might want to compile host-only or peripheral-only configurations. Let's allow that to happen. Signed-off-by: Felipe Balbi commit 04b31c776f34d127b422da92899272a0b8cda21d Author: Akinobu Mita Date: Wed Feb 16 23:47:51 2011 +0900 usb: isp1362-hcd: use bitmap_clear() and bitmap_set() Use bitmap_set()/bitmap_clear() to fill/zero a region of a bitmap instead of doing set_bit()/clear_bit() each bit. Signed-off-by: Akinobu Mita Signed-off-by: Greg Kroah-Hartman commit 5c8d61bfcc6396f80b884e0f23f08cbd8bf10778 Author: Matthieu CASTET Date: Tue Feb 15 18:41:54 2011 +0100 USB: make ehci msm driver use ehci_run. Now that ehci_run don't call ehci_reset, we can use ehci_run. Signed-off-by: Matthieu CASTET Signed-off-by: Greg Kroah-Hartman commit bcf40815e0cda371cecc242398fe39b873bb1047 Author: Matthieu CASTET Date: Tue Feb 15 18:40:28 2011 +0100 USB: don't run ehci_reset in ehci_run for tdi device TDI driver does the ehci_reset in their reset callback. Don't reset in ehci_run because configuration settings done in platform driver will be reset. This will allow to make msm use ehci_run. Signed-off-by: Matthieu CASTET Signed-off-by: Greg Kroah-Hartman commit e2904ee43c7009e6c4fc18738f15051312f22483 Author: Pavankumar Kondeti Date: Tue Feb 15 09:42:35 2011 +0530 USB: OTG: msm: Fix bug in msm_otg_mode_write The driver private data is retrieved incorrectly which results a crash when written into "mode" debugfs file. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 7018773aca1b46e4f29a8be2c6652448eb603099 Author: Pavankumar Kondeti Date: Tue Feb 15 09:42:34 2011 +0530 USB: OTG: msm: Fix compiler warning with CONFIG_PM disabled This patch fixes the below compiler warning drivers/usb/otg/msm72k_otg.c:257: warning: 'msm_otg_suspend' defined but not used Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 8a9e658ad3bea034d34e47acc7ea7e5e628fc893 Author: wwang Date: Tue Feb 15 17:02:47 2011 +0800 usb_storage: realtek_cr patch: add const modifier Add const modifier before global variable realtek_cr_ids. Signed-off-by: wwang Signed-off-by: Greg Kroah-Hartman commit 9812f748a149796cc0299757c3ebf49f0915dc3c Author: wwang Date: Tue Feb 15 09:38:31 2011 +0800 usb_storage: realtek_cr patch: fix sparse warning Fix some sparse warning for realtek_cr patch Signed-off-by: wwang Signed-off-by: Greg Kroah-Hartman commit b9f2e9a122a4d51dc13e2e9571034cb2d29dfe44 Author: Paul Bolle Date: Mon Feb 14 23:06:15 2011 +0100 USB: usb.h: Make comment match the defines it describes Signed-off-by: Paul Bolle Signed-off-by: Greg Kroah-Hartman commit 5b7c1178eb94f31a0199c3b361722775c54a8db3 Author: Oliver Neukum Date: Fri Feb 11 12:56:40 2011 +0100 USB: sierra: error handling in runtime PM resumption of devices can fail. Errors must be handled. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 9a91aedca2f4ef24344b7cd8f56570e620fbe4d5 Author: Oliver Neukum Date: Thu Feb 10 15:33:37 2011 +0100 usb_wwan: fix error case in close() The device never needs to be resumed in close(). But the counters must be balanced. As resumption can fail, but the counters must be balanced, use the _no_resume() version which cannot fail. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 16871dcac74c63227aa92e0012f3004a648c2062 Author: Oliver Neukum Date: Thu Feb 10 15:33:29 2011 +0100 usb_wwan: error case of resume If an error happens during resumption. The remaining data has to be cleanly discarded and the pm counters have to be adjusted. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 433508ae30f13c0bf6905e576c42899a8535f0bb Author: Oliver Neukum Date: Thu Feb 10 15:33:23 2011 +0100 usb_wwan: data consistency in error case As soon as the first error happens, the write must be stopped, lest we send mutilated messages. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 3d06bf152abcc3895a0f3afa21d762d84c9aecbc Author: Oliver Neukum Date: Thu Feb 10 15:33:17 2011 +0100 usb_wwan: fix runtime PM in error case An error in the write code path would permanently disable runtime PM in this driver Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit c9c4558f7874676e31ea7a74caafcf09ebbc03ed Author: Oliver Neukum Date: Thu Feb 10 15:33:10 2011 +0100 usb_wwan: fix error in marking device busy This fixes two errors: - the device is busy if a message was recieved even if resubmission fails - the device is not busy if resubmission fails due to -EPERM Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 8ab10400a037a516cc846c338f879e5bd62497ce Author: Rahul Ruikar Date: Wed Feb 9 13:44:28 2011 +0100 usb: gadget: at91_udc: Fix error path In function at91udc_probe() call put_device() when device_register() fails. Signed-off-by: Rahul Ruikar Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Greg Kroah-Hartman commit b14e840d04dba211fbdc930247e379085623eacd Author: Sebastian Andrzej Siewior Date: Tue Feb 8 21:07:40 2011 +0100 USB: isp1760: Implement solution for erratum 2 The document says: |2.1 Problem description | When at least two USB devices are simultaneously running, it is observed that | sometimes the INT corresponding to one of the USB devices stops occurring. This may | be observed sometimes with USB-to-serial or USB-to-network devices. | The problem is not noticed when only USB mass storage devices are running. |2.2 Implication | This issue is because of the clearing of the respective Done Map bit on reading the ATL | PTD Done Map register when an INT is generated by another PTD completion, but is not | found set on that read access. In this situation, the respective Done Map bit will remain | reset and no further INT will be asserted so the data transfer corresponding to that USB | device will stop. |2.3 Workaround | An SOF INT can be used instead of an ATL INT with polling on Done bits. A time-out can | be implemented and if a certain Done bit is never set, verification of the PTD completion | can be done by reading PTD contents (valid bit). | This is a proven workaround implemented in software. Russell King run into this with an USB-to-serial converter. This patch implements his suggestion to enable the high frequent SOF interrupt only at the time we have ATL packages queued. It goes even one step further and enables the SOF interrupt only if we have more than one ATL packet queued at the same time. Cc: # [2.6.35.x, 2.6.36.x, 2.6.37.x] Tested-by: Russell King Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman commit 4f9e6c64d1fc4668f3153f456b41cf40b30c730f Author: Maksim Rayskiy Date: Tue Feb 8 10:41:42 2011 -0800 USB: Mark EHCI LPM functions as __maybe_unused ehci_lpm_set_da and ehci_lpm_check are EHCI 1.1 specific functions which are not used on many platforms but do generate annoying gcc warnings Signed-off-by: Maksim Rayskiy Signed-off-by: Greg Kroah-Hartman commit 6b2e30c07f6c1514bb9946171770af61c305b86c Author: Dan Carpenter Date: Mon Feb 7 20:01:36 2011 +0300 usb: fusb300_udc: add more "ep%d" names We need FUSB300_MAX_NUM_EP (16) names otherwise the last 8 names get initialized to garbage values in fusb300_probe(). Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 16f08a08d8148945022eb7d5ebb89e6ee8029f91 Author: Fabian Godehardt Date: Mon Feb 7 12:53:05 2011 +0200 USB: s3c2410_udc: Add handling for S3C244X dual-packet mode This is a patch that seems to make the USB hangs on the S3C244X go away. At least a good amount of ping torture didn't make them come back so far. The issue is that, if there are several back-to-back packets, sometimes no interrupt is generated for one of them. This seems to be caused by the mysterious dual packet mode, which the USB hardware enters automatically if the endpoint size is half that of the FIFO. (On the 244X, this is the normal situation for bulk data endpoints.) There is also a timing factor in this. It seems that what happens is that the USB hardware automatically sends an acknowledgement if there is only one packet in the FIFO (the FIFO has space for two). If another packet arrives before the host has retrieved and acknowledged the previous one, no interrupt is generated for that second one. However, there may be an indication. There is one undocumented bit (none of the 244x manuals document it), OUT_CRS1_REG[1], that seems to be set suspiciously often when this condition occurs. There is also CLR_DATA_TOGGLE, OUT_CRS1_REG[7], which may have a function related to this. (The Samsung manual is rather terse on that, as usual.) This needs to be examined further. For now, the patch seems to do the trick. Signed-off-by: Vasily Khoruzhick Signed-off-by: Greg Kroah-Hartman commit c17f459c6ea5b569825445279fa21adb3cf3067f Author: Toshiharu Okada Date: Mon Feb 7 17:01:26 2011 +0900 usb: pch_udc: Fixed issue which does not work with g_ether This PCH_UDC driver does not work normally when "Ethernet gadget" is used. This patch fixed this issue. The following was modified. - The FIFO flush process. - The descriptor creation process. - The adjustment of DMA buffer align. Currently the PCH_UDC driver can work normally with "Ethernet gadget", "Serial gadget" or "File-backed Storage Gadget". Signed-off-by: Toshiharu Okada Signed-off-by: Greg Kroah-Hartman commit 4f22ce7045c16e36d391fdfe331a397d55578493 Author: Davidlohr Bueso Date: Sun Feb 6 14:13:37 2011 -0300 USB: tools: Add a Makefile Build USB tools easier. Signed-off-by: Davidlohr Bueso Signed-off-by: Greg Kroah-Hartman commit 05c3eebd50ad831c462ec264f82a87654d0ee974 Author: Jassi Brar Date: Sun Feb 6 18:47:18 2011 +0900 USB: Gadget: Reorder driver name assignment Reorder the driver->name assignment so the 'iProduct' could be initialized as well if both 'name' and 'iProduct' come as NULL by default. Also, remove the misplaced 'extern' keyword. Signed-off-by: Jassi Brar Signed-off-by: Greg Kroah-Hartman commit ff085de758ebcb2309dd013fecb7cbb3cb6c7a43 Author: Jassi Brar Date: Sun Feb 6 17:39:17 2011 +0900 USB: Gadget: Composite: Debug interface comparison While checking valid interface number we should compare MAX_CONFIG_INTERFACES with the variable 'intf' (which holds the lower 8bits of w_index) rather than 'w_index' Signed-off-by: Jassi Brar Signed-off-by: Greg Kroah-Hartman commit df7ffd317d36d36095c26bb57b3dd405274048e5 Merge: 7bb412a 1f1a438 Author: Tony Lindgren Date: Thu Feb 17 10:01:18 2011 -0800 Merge branches 'devel-hwspinlock' and 'devel-mcspi' into omap-for-linus commit 66b0835e2bb3d345f060a47bb8c8f883bd25ec2b Merge: 479b46b 85e2efb Author: Greg Kroah-Hartman Date: Thu Feb 17 09:56:40 2011 -0800 Merge 2.6.38-rc5 into usb-next This is needed to resolve some merge conflicts that were found in the USB host controller patches, and reported by Stephen Rothwell. Signed-off-by: Greg Kroah-Hartman commit b9b35ade88d5855de0ac3ebc3d66881f799114f9 Author: Santosh Shilimkar Date: Thu Feb 17 09:55:03 2011 -0800 omap4: Remove 'FIXME: omap44xx_sram_init not implemented' The omap44xx_sram_init() implements functionality to push some code on SRAM whenever the code can't be executed from external memory. The low power and DVFS code can be executed from external DDR itself thanks to OMAP4 memory controller hardware support. So on OMAP4, sram_push kind of functionality isn't needed. Hence remove the FIXME warning added for implementing sram push feature on OMAP4. Signed-off-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 7050f915c0c17a603a0a2ddf00e6edcc188789d3 Author: Santosh Shilimkar Date: Thu Feb 17 09:55:03 2011 -0800 omap2plus: omap4: Set NR_CPU to 2 instead of default 4 The omap2plus_defconfig picks default NR_CPU value as 4 which isn't correct for OMAP4430. Available CPUs are ony 2, so fix the same. Signed-off-by: Santosh Shilimkar Signed-off-by: Tony Lindgren commit 479b46b5599b1e610630d7332e168c1f9c4ee0b4 Author: Greg Kroah-Hartman Date: Thu Feb 17 09:54:16 2011 -0800 Revert "USB host: Move AMD PLL quirk to pci-quirks.c" This reverts commit b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25. It conflicts with commit baab93afc2844b68d57b0dcca5e1d34c5d7cf411 "USB: EHCI: ASPM quirk of ISOC on AMD Hudson" and merging the two just doesn't work properly. Cc: Andiry Xu Cc: David Brownell Cc: Alex He Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 1f1a4384b6500273020e48130f73601e4ba7d84b Author: Govindraj.R Date: Wed Feb 2 17:52:15 2011 +0530 OMAP: runtime: McSPI driver runtime conversion McSPI runtime conversion. Changes involves: 1) remove clock framework apis to use runtime framework apis. 2) context restore from runtime resume which is a callback for get_sync. 3) Remove SYSCONFIG(sysc) register handling (a) Remove context save and restore of sysc reg and remove soft reset done from sysc reg as this will be done with hwmod framework. (b) Also cleanup sysc reg bit macros. 4) Rename the omap2_mcspi_reset function to omap2_mcspi_master_setup function as with hwmod changes soft reset will be done in hwmod framework itself and use the return value from clock enable function to return for failure scenarios. Signed-off-by: Charulatha V Signed-off-by: Govindraj.R Acked-by: Grant Likely Reviewed-by: Partha Basak Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 1a5d81905aec1536783fb6ab875f31910f449941 Author: Charulatha V Date: Wed Feb 2 17:52:14 2011 +0530 OMAP: devices: Modify McSPI device to adapt to hwmod framework Cleans up all base address definitions for omap_mcspi and adapts the device registration and driver to hwmod framework. Changes involves: 1) Removing all base address macro defines. 2) Using omap-device layer to register device and utilizing data from hwmod data file for base address, dma channel number, Irq_number, device attribute(number of chipselect). 3) Appending base address with pdata reg_offset for omap4 boards. For omap4 all regs used in driver deviate with reg_offset_macros defined with an value of 0x100. So pass this offset through pdata and append the same to base address retrieved from hwmod data file and we are not mapping *_HL_* regs which are not used in driver. Signed-off-by: Charulatha V Signed-off-by: Govindraj.R Acked-by: Grant Likely Reviewed-by: Partha Basak Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 0f616a4e17ea244f882056656964b792edde8364 Author: Charulatha V Date: Thu Feb 17 09:53:10 2011 -0800 OMAP3: hwmod data: Add McSPI Update omap3 hwmod data file with McSPI info. Signed-off-by: Charulatha V Signed-off-by: Govindraj.R Acked-by: Grant Likely Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 7f904c78d65e5cff8d9e76567797a7a7fe2fd774 Author: Charulatha V Date: Thu Feb 17 09:53:10 2011 -0800 OMAP2430: hwmod data: Add McSPI Update the 2430 hwmod data file with McSPI info. Signed-off-by: Charulatha V Signed-off-by: Govindraj.R Acked-by: Grant Likely Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 617871deacea4e1a5713dd37564dc94a392d80c3 Author: Charulatha V Date: Thu Feb 17 09:53:09 2011 -0800 OMAP2420: hwmod data: Add McSPI Update the omap2420 hwmod data with the McSPI info. Add a device attribute structure which will be used for passing number of chipselects from hwmod data. Add revision macros to be passed from rev field from hwmod. Signed-off-by: Charulatha V Signed-off-by: Govindraj.R Acked-by: Grant Likely Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 7bb412a64281c599dcf00af2eed61ea997b282c2 Author: Simon Que Date: Thu Feb 17 09:52:03 2011 -0800 omap: add hwspinlock device Build and register an hwspinlock platform device. Although only OMAP4 supports the hardware spinlock module (for now), it is still safe to run this initcall on all omaps, because hwmod lookup will simply fail on hwspinlock-less platforms. Signed-off-by: Simon Que Signed-off-by: Hari Kanigeri Signed-off-by: Ohad Ben-Cohen Cc: Benoit Cousson Cc: Kevin Hilman Cc: Paul Walmsley Signed-off-by: Tony Lindgren commit 70ba4cc26b9f53859e863ec3b9a5f5fc0ce4d6a2 Author: Simon Que Date: Thu Feb 17 09:52:03 2011 -0800 drivers: hwspinlock: add OMAP implementation Add hwspinlock support for the OMAP4 Hardware Spinlock device. The Hardware Spinlock device on OMAP4 provides hardware assistance for synchronization between the multiple processors in the system (dual Cortex-A9, dual Cortex-M3 and a C64x+ DSP). [ohad@wizery.com: adapt to hwspinlock framework, tidy up] Signed-off-by: Simon Que Signed-off-by: Hari Kanigeri Signed-off-by: Krishnamoorthy, Balaji T Signed-off-by: Ohad Ben-Cohen Cc: Benoit Cousson Cc: Kevin Hilman Cc: Grant Likely Cc: Arnd Bergmann Cc: Paul Walmsley Cc: Russell King Signed-off-by: Tony Lindgren commit bd9a4c7df256cee4e9f6a4b56baa3b89d63f0f1e Author: Ohad Ben-Cohen Date: Thu Feb 17 09:52:03 2011 -0800 drivers: hwspinlock: add framework Add a platform-independent hwspinlock framework. Hardware spinlock devices are needed, e.g., in order to access data that is shared between remote processors, that otherwise have no alternative mechanism to accomplish synchronization and mutual exclusion operations. Signed-off-by: Ohad Ben-Cohen Cc: Hari Kanigeri Cc: Benoit Cousson Cc: Kevin Hilman Cc: Grant Likely Cc: Paul Walmsley Cc: Russell King Acked-by: Arnd Bergmann Signed-off-by: Tony Lindgren commit d9e45731debd83e2b249be349993595907dddeae Merge: 9238b6d 5844c4e Author: Tony Lindgren Date: Thu Feb 17 09:48:24 2011 -0800 Merge branch 'for_2.6.39/omap4_hwmod_data' of git://gitorious.org/omap-pm/linux into omap-for-linus commit 5844c4ead25f53a1fa92a4a8f0e363f9b6b87aea Author: Benoit Cousson Date: Thu Feb 17 12:41:05 2011 +0000 OMAP4: hwmod data: Add USBOTG OMAP4 hwmod data structures are populated with base address, L3 and L4 interface clocks, IRQs and sysconfig register details. As per OMAP USBOTG specification, need to configure the USBOTG to smart idle/standby or no idle/standby during data transfer and force idle/standby when not in use to support retention and offmode. By setting HWMOD_SWSUP_SIDLE and HWMOD_SWSUP_MSTANDBY flags,framework will take care of configuring to no idle/standby when module is enabled and force idle/standby when idled. Signed-off-by: Cousson, Benoit Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Kevin Hilman Cc: Paul Walmsley Signed-off-by: Felipe Balbi [b-cousson@ti.com: Fix position, opt_clk, and author] commit 03c2d87a2112a6548aa3f9635e76d3611c3df53c Author: Andreas Mohr Date: Thu Feb 17 00:17:53 2011 +0100 ALSA: ac97: replace open-coded, error-prone stuff with AC97 bit defines Use AC97 macros (sometimes already existing, or newly added) instead of error-prone repetition of open-coded values. Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 668b8788f497b2386402daeca583d6300240d41d Author: Arnaldo Carvalho de Melo Date: Thu Feb 17 15:38:58 2011 -0200 perf list: Allow filtering list of events The man page has the details, here are some examples: [root@emilia ~]# perf list *fault* *:*wait* List of pre-defined events (to be used in -e): page-faults OR faults [Software event] minor-faults [Software event] major-faults [Software event] alignment-faults [Software event] emulation-faults [Software event] radeon:radeon_fence_wait_begin [Tracepoint event] radeon:radeon_fence_wait_end [Tracepoint event] writeback:wbc_writeback_wait [Tracepoint event] writeback:wbc_balance_dirty_wait [Tracepoint event] writeback:writeback_congestion_wait [Tracepoint event] writeback:writeback_wait_iff_congested [Tracepoint event] sched:sched_wait_task [Tracepoint event] sched:sched_process_wait [Tracepoint event] sched:sched_stat_wait [Tracepoint event] sched:sched_stat_iowait [Tracepoint event] syscalls:sys_enter_epoll_wait [Tracepoint event] syscalls:sys_exit_epoll_wait [Tracepoint event] syscalls:sys_enter_epoll_pwait [Tracepoint event] syscalls:sys_exit_epoll_pwait [Tracepoint event] syscalls:sys_enter_rt_sigtimedwait [Tracepoint event] syscalls:sys_exit_rt_sigtimedwait [Tracepoint event] syscalls:sys_enter_waitid [Tracepoint event] syscalls:sys_exit_waitid [Tracepoint event] syscalls:sys_enter_wait4 [Tracepoint event] syscalls:sys_exit_wait4 [Tracepoint event] syscalls:sys_enter_waitpid [Tracepoint event] syscalls:sys_exit_waitpid [Tracepoint event] [root@emilia ~]# Suggested-by: Ingo Molnar Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 407a6888f7362cb3dabe69ea6d9dcf3c750dc56a Author: Benoit Cousson Date: Tue Feb 15 22:39:48 2011 +0100 OMAP4: hwmod data: Add AESS, McPDM, bandgap, counter_32k, MMC, KBD, ISS & IPU Add more hwmod structures but keep them commented out for the moment until the driver adaptation to hwmod / omap_device is done. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Cc: Kevin Hilman commit 4ddff4932b31b8f21d1c57155ca5d4088693ce4b Author: Benoit Cousson Date: Mon Jan 31 14:50:30 2011 +0000 OMAP4: hwmod data: Add McBSP Add mcbsp data including a revision member in hwmod_class in order to provide mcbsp revision information in different omap. Signed-off-by: Benoit Cousson Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Charulatha V [b-cousson@ti.com: Remove the mcbsp4 memory name, re-order properly the structures] commit 8ca476da04e452a01d984dd5b5333b3a562207a7 Author: Benoit Cousson Date: Tue Jan 25 22:01:00 2011 +0000 OMAP4: hwmod data: Add DMIC Add HWMOD entries for the OMAP DMIC. The HWMOD entires define the system resource requirements for the driver such as DMA addresses, channels, and IRQ's. Placing this information in the HWMOD database allows for more generic drivers to be written and having the specific implementation details defined in HWMOD. Signed-off-by: Benoit Cousson Signed-off-by: David Lambert [b-cousson@ti.com: Change the wrong hwmod name, add missing flag and re-order structures] commit ec5df927a8f3d3eca9514c9a9ad6db830ae20acc Author: Benoit Cousson Date: Wed Feb 2 19:27:21 2011 +0000 OMAP4: hwmod data: Add mailbox Mailbox hwmod data for omap4. Signed-off-by: Benoit Cousson Signed-off-by: Omar Ramirez Luna [b-cousson@ti.com: Re-order the structures and remove the irq line name] commit d63bd74fbb5fb2161d9cb90cd7a93a2c5db47c63 Author: Benoit Cousson Date: Thu Jan 27 11:17:03 2011 +0000 OMAP4: hwmod data: Add DSS, DISPC, DSI1&2, RFBI, HDMI and VENC Add dss, dispc, dsi1, dsi2, hdmi, rfbi and venc hwmods. In OMAP4 there are severals IPs that can be reached by differents interconnect paths depending of the access initiator (MPU vs. SDMA). In the case of the DSS, both L3 direct path and L4 CFG path can be used to access all the DSS IPs. The two ocp_ip already exists to support the two address spaces. +------------+-- L3_MAIN --+ MPU IP | | +-- L4_CFG --+ L3 main address range is specified first, since it is used by default. dss is also considered as an IP as dispc, rfbi, and named as dss_core. Signed-off-by: Benoit Cousson Signed-off-by: Mayuresh Janorkar Signed-off-by: Senthilvadivu Guruswamy Signed-off-by: Sumit Semwal [b-cousson@ti.com: Re-organize structures to match file convention and remove irq entry from dss_hwmod] commit 35d1a66a9cc03167ff5266e5fcb0dea639123d84 Author: Benoit Cousson Date: Fri Feb 11 11:17:14 2011 +0000 OMAP4: hwmod data: Add timer Add the data for the 11 timers IPs. OMAP4 contains two differents IP variants for the timers: - 8 x regular timer (3, 4, 5, 6, 7, 8, 9 & 11) - 3 x 1ms timer (1, 2 & 10) The regular timers registers programming model was changed due to the adaptation to the new IP interface. Unfortunately the 1ms version still use the previous programming model. The driver will have to take care of theses differences. Please note that the capability and the partitioning is also different depending of the instance. - timer 1 is inside the wakeup domain - timers 5, 6, 7 & 8 are inside in the ABE (audio backend) - timers 2, 3, 4, 9, 10 & 11 are inside the PER power domain The timer was previously named gptimerX or dmtimerX, it is now simply named timerX. Signed-off-by: Benoit Cousson Signed-off-by: Tarun Kanti DebBarma [b-cousson@ti.com: Fix alignement in class attribute, re-order flags and update the changelog] commit 9bcbd7f0d577b3f6d5742188563457a083b8ae7f Author: Benoit Cousson Date: Wed Feb 2 17:52:13 2011 +0530 OMAP4: hwmod data: Add McSPI Update omap4 hwmod file with McSPI info. Signed-off-by: Benoit Cousson Signed-off-by: Charulatha V Signed-off-by: Govindraj.R Acked-by: Grant Likely Reviewed-by: Kevin Hilman commit cd09b2c3d0574d17804f8a691433249fa86197d3 Author: Justin P. Mattock Date: Fri Jan 28 11:49:08 2011 -0800 drivers:scsi Change printk typo initate -> initiate Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 74cfc17dc1a69c37ce6c8a76c1ce84bcb796eb0e Author: Arnaldo Carvalho de Melo Date: Thu Feb 17 14:40:46 2011 -0200 perf report: Tell the user when a perf.data file has no samples [root@emilia ~]# perf report --stdio The perf.data file has no samples! [root@emilia ~]# The TUI shows a popup warning message with the same message. Reported-by: Ingo Molnar Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Steven Rostedt Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit f95497d9df340fa35aea01e2f2e5d31ecdf7118e Author: Jesper Juhl Date: Mon Feb 14 23:46:17 2011 +0100 serial, pch uart: Remove duplicate inclusion of linux/pci.h header Only include linux/pci.h once in drivers/tty/serial/pch_uart.c Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit bf6a41db7726e6c09b9c6ac993457b7260473406 Author: Daniel Baluta Date: Sun Jan 30 23:42:29 2011 +0200 fs/eventpoll.c: fix spelling eventpoll.c has wonderful comments but some annoying typos sneaked in: * toepoll_ctl -> to epoll_ctl * rapresent -> represents * sructure -> structure * machanism -> mechanism * trasfering -> transferring Signed-off-by: Daniel Baluta Signed-off-by: Jiri Kosina commit 138d22ef14bf00e44de7885cd03f0c3b6ac168f5 Author: Szymon Janc Date: Thu Feb 17 16:44:23 2011 +0100 Bluetooth: Fix some code style issues in hci_event.c Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 18a26892d62d2786c2b259ba4605ee10bba0ba13 Author: Hema HK Date: Thu Feb 17 12:07:21 2011 +0530 OMAP2+: musb: hwmod adaptation for musb registration Using omap_device_build API instead of platform_device_register for OMAP2430,OMAP3xxx, OMAP4430 and AM35x musb device registration. The device specific resources defined in centralized database will be used. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Kevin Hilman Cc: Cousson, Benoit Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 01df8c31d152493ddc58a0bd1719eac6759add87 Author: Szymon Janc Date: Thu Feb 17 16:46:47 2011 +0100 Bluetooth: Fix some code style issues in hci_core.c Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit adc4266d87ba95e250e5ffa217c72b4b78c2b56a Author: Szymon Janc Date: Thu Feb 17 16:42:00 2011 +0100 Bluetooth: Fix some code style issues in hci_core.h Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 712a4b6049724278121d56aba683151d86c8c35a Author: Arnaldo Carvalho de Melo Date: Thu Feb 17 12:18:42 2011 -0200 perf record: Delay setting the header writing atexit call While testing the --filter option I noticed that we were writing lots of unneeded stuff to the perf.data header when the filter ioctl fails, so move the atexit(atexit_header) call to after we create the counters successfully. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit fec9cbd15b9e99bab9bc50f1ed7e20a1087d7c6d Author: Arnaldo Carvalho de Melo Date: Thu Feb 17 10:37:23 2011 -0200 perf hists: Print number of samples, not the period sum So that we match the header where we state the number of events with the "Samples" column when using 'perf report -n/--show-nr-samples': [root@emilia ~]# perf record -a sleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.111 MB perf.data (~4860 samples) ] [root@emilia ~]# perf report --stdio --show-nr-samples # Events: 11 cycles # # Overhead Samples Command Shared Object Symbol # ........ .......... ........... .................. ............................ # 16.65% 1 sleep [kernel.kallsyms] [k] unmap_vmas 16.10% 1 perf libpthread-2.12.so [.] __pthread_cleanup_push_defer 15.79% 2 perf [kernel.kallsyms] [k] format_decode 12.88% 1 kworker/1:2 [kernel.kallsyms] [k] cache_reap 10.69% 1 swapper [kernel.kallsyms] [k] _raw_spin_lock 7.55% 1 sleep [kernel.kallsyms] [k] prepare_exec_creds 6.00% 1 perf [jbd2] [k] start_this_handle 5.29% 1 perf [kernel.kallsyms] [k] seq_read 4.75% 1 perf [kernel.kallsyms] [k] get_pid_task 4.30% 1 perf [kernel.kallsyms] [k] _raw_spin_unlock_irqrestore # # (For a higher level overview, try: perf report --sort comm,dso) # [root@emilia ~]# Reported-by: Stephane Eranian Acked-by: Stephane Eranian Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a335b2e17301afae9e794f21071a2fcdd5879c1e Author: Ryota Ozaki Date: Thu Feb 10 13:56:28 2011 +0900 mm: Fix out-of-date comments which refers non-existent functions do_file_page and do_no_page don't exist anymore, but some comments still refers them. The patch fixes them by replacing them with existing ones. Signed-off-by: Ryota Ozaki Acked-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Signed-off-by: Jiri Kosina commit ec4f2ac471e25d3e0cea05abb8da34c05a0868f9 Author: Paul Bolle Date: Fri Jan 28 23:32:04 2011 +0100 drm: Fix printk typo 'failled' Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina commit bc0b44c35928a04061e19663061af9f029dbebcc Author: Justin P. Mattock Date: Fri Jan 28 11:48:18 2011 -0800 coh901318.c: Change initate to initiate. Signed-off-by: Justin P. Mattock Acked-by: Linus Walleij Signed-off-by: Jiri Kosina commit 74ab0030b574a555a30d6520f84dd644628033a8 Author: Justin P. Mattock Date: Fri Jan 28 11:47:20 2011 -0800 mbox-db5500.c Change initate to initiate. Signed-off-by: Justin P. Mattock Acked-by: Linus Walleij Signed-off-by: Jiri Kosina commit cb60a422694e03c2a8d5d2c551a06a3039072332 Author: Arvind R Date: Tue Jan 25 22:38:53 2011 +0530 edac: correct i82975x error-info reported to edac-core fix the totally wrong info w.r.t page,row,dimm-label previously reported to edac-core by i82975x driver Signed-off-by: Arvind R. Signed-off-by: Jiri Kosina commit da95b3d21f41da39ee716e0db781de4b9ffbb233 Author: Arvind R Date: Tue Jan 25 22:38:38 2011 +0530 edac: correct i82975x mci initialisation corrected mtype, and added dev_name,scrubmode initialisers in i82975x struct mem_ctl initialisation Signed-off-by: Arvind R. Signed-off-by: Jiri Kosina commit 7ba9957581a889ce19919a0cdc1cef9f04e5e3a8 Author: Arvind R Date: Tue Jan 25 22:38:27 2011 +0530 edac: correct commented info wrong comments in i82975x driver corrected Signed-off-by: Arvind R. Signed-off-by: Jiri Kosina commit b0a4bb830e099a31bec79452268639a7d8c2c1e4 Author: Namhyung Kim Date: Sat Jan 22 15:31:32 2011 +0900 fs: update comments to point correct document dcache-locking.txt is not exist any more, and the path was not correct anyway. Fix it. Signed-off-by: Namhyung Kim Signed-off-by: Jiri Kosina commit 5629f8a7fa391e40e61d528d4f5d7850dbfdf7ae Author: Jesper Juhl Date: Mon Jan 17 22:49:36 2011 +0100 target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c drivers/target/target_core_hba.c includes target/target_core_device.h twice - the two includes are even on two lines next to each other. This patch removes the duplicate include. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 273ff8c3bc04cf358c131f49ee7a11efa7ec73d7 Author: Hema HK Date: Thu Feb 17 12:07:19 2011 +0530 AM35xx: hwmod data: Add USBOTG AM35xx hwmod data structures are populated for USBOTG with base address, L3 and L4 interface clocks and IRQ. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Kevin Hilman Cc: Cousson, Benoit Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 870ea2b8e750f40fe5681b902ce0d5445297e610 Author: Hema HK Date: Thu Feb 17 12:07:18 2011 +0530 OMAP3xxx: hwmod data: Add USBOTG OMAP3 hwmod data structures are populated for USBOTG with base address, L3 and L4 interface clocks, IRQs and sysconfig register details. This is applicable for OMAP3430 amd OMAP3630. As per OMAP USBOTG specification, need to configure the USBOTG to smart idle/standby or no idle/standby during data transfer and force idle/standby when not in use to support retention and offmode. By setting HWMOD_SWSUP_SIDLE and HWMOD_SWSUP_MSTANDBY flags, framework will take care of configuring to no idle/standby when module is enabled and force idle/standby when idled. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Kevin Hilman Cc: Cousson, Benoit Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 44d02acf54114e4d5c905b6b1a6473a7d302312d Author: Hema HK Date: Thu Feb 17 12:07:17 2011 +0530 OMAP2430: hwmod data: Add USBOTG OMAP2430 hwmod data structures are populated with base address, L3 and L4 interface clocks, IRQs and sysconfig register details. As per OMAP USBOTG specification, need to configure the USBOTG to smart idle/standby or no idle/standby during data transfer and force idle/standby when not in use to support retention and off-mode. By setting HWMOD_SWSUP_SIDLE and HWMOD_SWSUP_MSTANDBY flags, framework will take care of configuring to no idle/standby when module is enabled and force idle/standby when suspended. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: Kevin Hilman Cc: Cousson, Benoit Cc: Paul Walmsley Signed-off-by: Felipe Balbi commit 1dbea0f5e23b6c647db72fa4a048cb7140625e13 Author: Anand Gadiyar Date: Wed Feb 16 16:47:19 2011 +0530 arm: omap4: 4430sdp: drop ehci support Most revisions of the OMAP4 Blaze/SDP platform do not have the EHCI signals routed by default. The pads are routed for the alternate HSI functionality instead, and explicit board modifications are needed to route the signals to the USB PHY on the board. Also, turning on the PHY connected to the EHCI port causes a board reboot during bootup due to an unintended short on the rails - this affects many initial revisions of the board, and needs a minor board mod to fix (or as a workaround, one should not attempt to power on the USB PHY). Given that these boards need explicit board mods to even get EHCI working (separate from the accidental short above), we should not attempt to enable EHCI by default. So drop the EHCI support from the board files for the Blaze/SDP platforms. Signed-off-by: Anand Gadiyar Cc: Keshava Munegowda Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit 2aae4221eebf926ad1058546e2cb81dae8f3e696 Author: Anand Gadiyar Date: Wed Feb 16 15:42:15 2011 +0530 arm: omap4: usb: explicitly configure MUSB pads Use the mux framework APIs to explicitly configure the MUSB pads. The MUSB controller in OMAP4 can use either the old ULPI interface, or the new internal PHY. Configure the pads accordingly. Signed-off-by: Anand Gadiyar Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit fe5a4901c20c09b4380b7d4a0197efb6489c4ce8 Author: Hema HK Date: Wed Feb 16 17:34:40 2011 +0530 usb: musb: AM35x: moving internal phy functions out of usb_musb.c file Moved all the board specific internal PHY functions out of usb_musb.c file as this file is shared between the OMAP2+ and AM35xx platforms. There exists a file which has the functions specific to internal PHY used for OMAP4 platform. Moved all phy specific functions to this file and passing these functions through board data in the board file. Signed-off-by: Hema HK Cc: Paul Walmsley Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit 177b241d0ed7154417d3510695c6d14107591e80 Author: Gilles Espinasse Date: Sun Jan 9 08:59:49 2011 +0100 kbuild, mtd, net: a few comment typo fixes and rewording Signed-off-by: Gilles Espinasse Signed-off-by: Jiri Kosina commit 0786f8b7777721c0d3d5dd691692eaee696e94e1 Author: Szymon Janc Date: Thu Feb 17 14:16:33 2011 +0100 Bluetooth: Clean up hci_sniff_subrate_evt function Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 7235975383785276bdcfc13dd73cc87739cd25d0 Author: Szymon Janc Date: Thu Feb 17 14:16:32 2011 +0100 Bluetooth: Use #include instead of As warned by checkpatch.pl, use #include instead of . Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 177900e8c9ab28cdf097314fe7dd3877774df97d Author: Jiri Kosina Date: Thu Feb 17 15:12:45 2011 +0100 HID: add support for Keytouch IEC 60945 The keyboard has several bugs in its report descriptor, most importantly the Logical Min/Max are completely off. Replace it with simplified descriptor which describes it properly. Signed-off-by: Jiri Kosina commit 6d496f9f232790d44144f3784856290e0b27b8f3 Author: Yinghai Lu Date: Thu Feb 17 14:53:20 2011 +0100 x86-64, NUMA: Put dummy_numa_init() in the init section dummy_numa_init() is used only during system boot. Put it in .init like other NUMA init functions. - tj: Description update. Signed-off-by: Yinghai Lu Signed-off-by: Tejun Heo commit 2ca230baeb7c61864cab9b53e37a3da28a2ca7e5 Author: Yinghai Lu Date: Thu Feb 17 14:46:37 2011 +0100 x86-64, NUMA: Don't call __pa() with invalid address in numa_reset_distance() Do not call __pa(numa_distance) if it was not allocated before. Calling with invalid address triggers VIRTUAL_BUG_ON() in __phys_addr() if CONFIG_DEBUG_VIRTUAL. Also reported by Ingo. http://thread.gmane.org/gmane.linux.kernel/1101306/focus=1101785 - v2: Change to check existing path as tj requested. - tj: Description update. Signed-off-by: Yinghai Lu Signed-off-by: Tejun Heo Reported-by: Ingo Molnar commit da1016df85ed67b6f7dbb765532c54bc35ba08d7 Author: Akinobu Mita Date: Wed Feb 16 23:48:35 2011 +0900 x86: Use bitmap library functions Use bitmap_set()/bitmap_clear() to fill/zero a region of a bitmap instead of doing set_bit()/clear_bit() each bit. This change has been tested with ioperm() and there's no change in behavior. Signed-off-by: Akinobu Mita LKML-Reference: <1297867715-20394-1-git-send-email-akinobu.mita@gmail.com> Signed-off-by: Ingo Molnar commit bee96907383e71d3996ba2bd0682fefaa492d942 Merge: 5beda5f 8737ebd Author: Ingo Molnar Date: Thu Feb 17 14:46:35 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 5beda5f6e4e4523e8dbe596bf163a01b45776808 Merge: ba3dd36 6752ab4 Author: Ingo Molnar Date: Thu Feb 17 14:11:15 2011 +0100 Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core commit aa90eb9d9d39d6e312b822cfa1512bb76e0e1df3 Author: Rabin Vincent Date: Tue Feb 8 09:24:37 2011 +0530 mach-ux500: DB8500 PMU support DB8500 has irqs from two cores ORed into one. Implement a workaround to handle this by bouncing the interrupt by setting the affinity to the other core when the interrupt appears to be spurious on the current core. Signed-off-by: Rabin Vincent Acked-by: Lee Jones Signed-off-by: Linus Walleij commit 0e25a5c98067286fc727cf142fc0dadf95790921 Author: Rabin Vincent Date: Tue Feb 8 09:24:36 2011 +0530 ARM: perf_event: allow platform-specific interrupt handler Allow a platform-specific IRQ handler to be specified via platform data. This will be used to implement the single-irq workaround for the DB8500. Signed-off-by: Rabin Vincent Acked-by: Lee Jones Acked-by: Will Deacon Signed-off-by: Linus Walleij commit f0c55bcf4aa41b4b1dbee826513b1acb01bf65e1 Author: Stephane Eranian Date: Wed Feb 16 15:10:01 2011 +0200 perf: make perf stat print user provided full event names This patch changes the way perf stat prints event names at the end of a run. Until now, it was trying to reconstruct the event name from its encoding. The problem is that it would only print generic events without their modifiers (u, k, pp). This patch saves the event name as passed by the user in the evsel struct and uses it to print the final event name. This would also work in case perf is linked with a library (such as libpfm4) which provides full PMU event tables. $ perf stat -e cycles:u,cycles:k date Wed Feb 16 14:58:52 CET 2011 Performance counter stats for 'date': 568600 cycles:u 2779715 cycles:k 0.001908182 seconds time elapsed Cc: Arun Sharma Cc: David S. Miller Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Robert Richter Cc: Stephane Eranian LPU-Reference: <4d5bdc64.98a1df0a.7aa3.06c2@mx.google.com> Signed-off-by: Stephane Eranian [ committer note: Fixed a merge problem with 023695d "Add cgroup support" ] Signed-off-by: Arnaldo Carvalho de Melo commit 6d3bfb74341c2c1454fcf5ec9c4dd707011f78e5 Author: Alan Ott Date: Sun Jan 23 22:50:18 2011 -0500 HID: Add HID Report Descriptor to sysfs Add a new binary sysfs entry called report_descriptor which contains the HID report descriptor. Signed-off-by: Alan Ott Signed-off-by: Jiri Kosina commit 4498062e72fd55b2a9a4ac1b44fab8cb44ad5367 Author: Arnaldo Carvalho de Melo Date: Thu Feb 17 10:07:42 2011 -0200 perf python: Add cgroup.c to setup.py to get it building again The 023695d cset added a new file, util/cgroup.c, that is referenced from util/evsel.c, so it needs to be present in util/setup.py so that the python shared object binding works, fixing this: [root@emilia linux]# export PYTHONPATH=~acme/git/build/perf/python/ [root@emilia linux]# ./tools/perf/python/twatch.py Traceback (most recent call last): File "./tools/perf/python/twatch.py", line 16, in import perf ImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: close_cgroup Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 15808182ae8044a064286445bcecaee6105cd718 Author: Shawn Guo Date: Thu Feb 17 14:28:52 2011 +0800 ARM: mxs/mx28evk: add auart devices Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 2e8acbc28314ce1a0f9cc65a7e76bd24595a6bad Author: Shawn Guo Date: Thu Feb 17 14:28:51 2011 +0800 ARM: mxs/mx23evk: add auart device Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit edca314f27c984f353a5129253d8d5241b82c517 Author: Shawn Guo Date: Thu Feb 17 14:28:50 2011 +0800 ARM: mx23: dynamically allocate mx23 auart device i.MX23 Reference Manaul starts auart index from 1 than 0. Changing the index to start from 0 requires corresponding changes on base address, irq, and iomux definitions, and will probably confuse people who reads codes and hardware documents together. This patch introduced the field 'hwid' to distinguish the driver id and controller id. These two ids are different on mx23 while identical on mx28. Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 08ec1130d4652ba1cab5ce0a423bcb2229c7a60b Author: Shawn Guo Date: Thu Feb 17 14:28:49 2011 +0800 ARM: mx23: rename mx23 auart irq definition to align with mx28 i.MX23 Reference Manual names auart irq differently from i.MX28. This patch is to align the naming with mx28, so that some device registration codes can be shared. Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit d11c217f1a8f9ea2b2c89b8a533396482a36e8c0 Author: Benoit Cousson Date: Wed Feb 2 12:04:36 2011 +0000 OMAP4: hwmod data: Add hwspinlock Add hwspinlock hwmod data for OMAP4 chip Signed-off-by: Cousson, Benoit Signed-off-by: Hari Kanigeri Signed-off-by: Ohad Ben-Cohen Cc: Paul Walmsley [b-cousson@ti.com: Move the data to keep the original order and add missing SIDLE_SMART_WKUP flag] commit 689bca3bbccd41be7b256e2227ff2fd0d7aed4ee Author: Greg Thelen Date: Wed Feb 16 17:51:23 2011 -0800 memcg: clarify use_hierarchy documentation The memcg code does not allow changing memory.use_hierarchy if the parent cgroup has enabled use_hierarchy. Update documentation to match the code. Signed-off-by: Greg Thelen Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Jiri Kosina commit bd1f2996b44a1c8bde76a6fecd10f36b6eb948d7 Author: Herbert Xu Date: Thu Feb 17 14:24:45 2011 +1100 crypto: sha1 - Add test vector to test partial block processing In light of the recent discovery of the bug with partial block processing on s390, we need best test coverage for that. This patch adds a test vector for SHA1 that should catch such problems. Signed-off-by: Herbert Xu commit 405505c2b7b9f8a2d2b90e9e7fb4590b059e15dd Author: Felipe Balbi Date: Sun Jan 16 13:22:03 2011 +0200 arm: omap2: clksel: fix compile warningOrganization: Texas Instruments\n Fix the following compile warning: arch/arm/mach-omap2/clkt_clksel.c: In function '_get_div_and_fieldval': arch/arm/mach-omap2/clkt_clksel.c:100:35: warning: 'max_clkr' may be used uninitialized in this function Acked-by: Paul Walmsley Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 2ce603ebe1f1420c7c5b013638ec29b4fc975180 Author: Claudio Takahasi Date: Wed Feb 16 20:44:53 2011 -0200 Bluetooth: Send LE Connection Update Command If the new connection update parameter are accepted, the LE master host sends the LE Connection Update Command to its controller informing the new requested parameters. Signed-off-by: Claudio Takahasi Signed-off-by: Gustavo F. Padovan commit d4726051043dd270f9a161414a8d5ced76e91dff Author: Ben Hutchings Date: Tue Jan 4 15:22:36 2011 +0000 sfc: Limit filter search depth further for performance hints (i.e. RFS) Signed-off-by: Ben Hutchings commit 3449248c8731e8474980856d76bbf9bac9b0682f Author: Randy Dunlap Date: Mon Feb 14 12:27:50 2011 -0800 PCI: fix tlan build when CONFIG_PCI is not enabled When CONFIG_PCI is not enabled, tlan.c has a build error: drivers/net/tlan.c:503: error: implicit declaration of function 'pci_wake_from_d3' so add an inline function stub for this function to pci.h when PCI is not enabled, similar to other stubbed PCI functions. Signed-off-by: Randy Dunlap Acked-by: David S. Miller Acked-by: Sakari Ailus Signed-off-by: Jesse Barnes commit b99af4b002e4908d1a5cdaf424529bdf1dc69768 Author: Brandeburg, Jesse Date: Mon Feb 14 09:05:02 2011 -0800 PCI: remove quirk for pre-production systems Revert commit 7eb93b175d4de9438a4b0af3a94a112cb5266944 Author: Yu Zhao Date: Fri Apr 3 15:18:11 2009 +0800 PCI: SR-IOV quirk for Intel 82576 NIC If BIOS doesn't allocate resources for the SR-IOV BARs, zero the Flash BAR and program the SR-IOV BARs to use the old Flash Memory Space. Please refer to Intel 82576 Gigabit Ethernet Controller Datasheet section 7.9.2.14.2 for details. http://download.intel.com/design/network/datashts/82576_Datasheet.pdf Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes This quirk was added before SR-IOV was in production and now all machines that originally had this issue alreayd have bios updates to correct the issue. The quirk itself is no longer needed and in fact causes bugs if run. Remove it. Signed-off-by: Jesse Brandeburg CC: Yu Zhao CC: Jesse Barnes Signed-off-by: Jesse Barnes commit 6bd32326cdaa9b14794416150c88e4832fb7e592 Author: Ville Tervo Date: Wed Feb 16 16:32:41 2011 +0200 Bluetooth: Use proper timer for hci command timout Use proper timer instead of hci command flow control to timeout failed hci commands. Otherwise stack ends up sending commands when flow control is used to block new commands. 2010-09-01 18:29:41.592132 < HCI Command: Remote Name Request (0x01|0x0019) plen 10 bdaddr 00:16:CF:E1:C7:D7 mode 2 clkoffset 0x0000 2010-09-01 18:29:41.592681 > HCI Event: Command Status (0x0f) plen 4 Remote Name Request (0x01|0x0019) status 0x00 ncmd 0 2010-09-01 18:29:51.022033 < HCI Command: Remote Name Request Cancel (0x01|0x001a) plen 6 bdaddr 00:16:CF:E1:C7:D7 Signed-off-by: Ville Tervo Signed-off-by: Gustavo F. Padovan commit 7f4b2b04c88377af30c022f36c060190182850fb Author: Andrei Warkentin Date: Fri Feb 11 17:19:26 2011 -0600 Bluetooth: Make hci a child of the corresponding tty device. Make /sys/class/bluetooth/hciX a symlink to path under corresponding tty. Signed-off-by: Andrei Warkentin Signed-off-by: Gustavo F. Padovan commit c6f3c5f7f2938d2809bcc15889e9aa212038a554 Author: Gustavo F. Padovan Date: Tue Feb 15 20:22:03 2011 -0300 Bluetooth: Fix crash when ioctl(HCIUARTSETPROTO) fails If the fail happens the HCI del_timer may timeout after the the hci dev unregister. This lead to a kernel crash. Reported-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit de73115a7d67e1b81dbde2285a7657f3e3867703 Author: Claudio Takahasi Date: Fri Feb 11 19:28:55 2011 -0200 Bluetooth: Add connection parameter update response Implements L2CAP Connection Parameter Update Response defined in the Bluetooth Core Specification, Volume 3, Part A, section 4.21. Address the LE Connection Parameter Procedure initiated by the slave. Connection Interval Minimum and Maximum have the same range: 6 to 3200. Time = N * 1.25ms. Minimum shall be less or equal to Maximum. The Slave Latency field shall have a value in the range of 0 to ((connSupervisionTimeout / connIntervalMax) - 1). Latency field shall be less than 500. connSupervisionTimeout = Timeout Multiplier * 10 ms. Multiplier field shall have a value in the range of 10 to 3200. Signed-off-by: Claudio Takahasi Signed-off-by: Gustavo F. Padovan commit 3300d9a930a79508032e3e03ac2bde3a22dd048d Author: Claudio Takahasi Date: Fri Feb 11 19:28:54 2011 -0200 Bluetooth: Add LE signaling commands handling This patch splits the L2CAP command handling function in order to have a clear separation between the commands related to BR/EDR and LE. Commands and responses in the LE signaling channel are not being handled yet, command reject is sent to all received requests. Bluetooth Core Specification, Volume 3, Part A, section 4 defines the signaling packets formats and allowed commands/responses over the LE signaling channel. Signed-off-by: Claudio Takahasi Signed-off-by: Gustavo F. Padovan commit 03c2d0e89409b59c1ec9d9511533cedc0b7aaa69 Author: Gustavo F. Padovan Date: Mon Feb 14 18:53:43 2011 -0300 Bluetooth: Use usb_fill_int_urb() Instead set urb structure directly we call usb_fill_int_urb() to set the values to us. Signed-off-by: Gustavo F. Padovan commit aff2cae3546df9f47f9fe24f3e85a7a84e825de8 Author: Ville Tervo Date: Thu Feb 10 22:38:54 2011 -0300 Bluetooth: Add SMP command structures Add command structures for security manager protocol. Signed-off-by: Ville Tervo Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit bae1f5d9464d231148301fcbf4e425a096a5b96d Author: Ville Tervo Date: Thu Feb 10 22:38:53 2011 -0300 Bluetooth: Treat LE and ACL links separately on timeout Separate LE and ACL timeouts. Othervise ACL connections on non LE hw will time out after 45 secs. Signed-off-by: Ville Tervo Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit b92a62238ff2d3fb88cf0f6de454f3d1b4ae5d52 Author: Vinicius Costa Gomes Date: Thu Feb 10 22:38:52 2011 -0300 Bluetooth: Fix initiated LE connections Fix LE connections not being marked as master. Signed-off-by: Vinicius Costa Gomes Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 5589fa9c2d2b8c134f44db36892ccc500aac3147 Author: Ville Tervo Date: Thu Feb 10 22:38:51 2011 -0300 Bluetooth: Do not send disconn comand over LE links l2cap over LE links can be disconnected without sending disconnect command first. Signed-off-by: Ville Tervo Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit b62f328b8f20abe97cdbaaf44c6e4f5e7a610f18 Author: Ville Tervo Date: Thu Feb 10 22:38:50 2011 -0300 Bluetooth: Add server socket support for LE connection Add support for LE server sockets. Signed-off-by: Ville Tervo Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit acd7d3708555b3da7522e23c183cc21efc785f72 Author: Ville Tervo Date: Thu Feb 10 22:38:49 2011 -0300 Bluetooth: Add LE connection support to L2CAP Add basic LE connection support to L2CAP. LE connection can be created by specifying cid in struct sockaddr_l2 Signed-off-by: Ville Tervo Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 6ed58ec520ad2b2fe3f955c8a5fd0eecafccebdf Author: Ville Tervo Date: Thu Feb 10 22:38:48 2011 -0300 Bluetooth: Use LE buffers for LE traffic Bluetooth chips may have separate buffers for LE traffic. This patch add support to use LE buffers provided by the chip. Signed-off-by: Ville Tervo Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit fcd89c09a59a054fb986861e0862aa2fff7d7c40 Author: Ville Tervo Date: Thu Feb 10 22:38:47 2011 -0300 Bluetooth: Add LE connect support Bluetooth V4.0 adds support for Low Energy (LE) connections. Specification introduces new set of hci commands to control LE connection. This patch adds logic to create, cancel and disconnect LE connections. Signed-off-by: Ville Tervo Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 9238b6d8e800f01f5cb42cc8e3e7b850ca49e83e Merge: 85e2efb 37cd4fe e811d32 Author: Tony Lindgren Date: Wed Feb 16 11:32:38 2011 -0800 Merge branches 'devel-cleanup', 'devel-board', 'devel-early-init' and 'devel-ti816x' into omap-for-linus commit 63185f64ef06464706b32c9a301f71f68cd93e52 Author: Ville Tervo Date: Thu Feb 10 22:38:46 2011 -0300 Bluetooth: Add low energy commands and events Add needed HCI command and event structs to create LE connections. Signed-off-by: Ville Tervo Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 8737ebdea02315eaffaebb3b73d55f2f726a4fe0 Author: Masami Hiramatsu Date: Thu Feb 10 18:08:16 2011 +0900 perf probe: Show filename which contains target function Show filename which contains a target function with the function name on "--lines" mode, because perf-probe just shows the first function even if there are many same-name functions. Originally adopted by Franck Bui-Huu's patch which shows file name instead of function name. I've just modified it to show both of function name and file name, because of completeness of output. E.g.) $ perf probe -L t_show 0 static int t_show(struct seq_file *m, void *v) 1 { 2 struct ftrace_iterator *iter = m->private; ... $ perf probe -L t_show@trace/trace.c 0 static int t_show(struct seq_file *m, void *v) 1 { struct tracer *t = v; ... Original-patch-by: Franck Bui-Huu Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Franck Bui-Huu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <20110210090816.1809.43426.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit e116dfa1c357da49f55e1555767ec991225a8321 Author: Masami Hiramatsu Date: Thu Feb 10 18:08:10 2011 +0900 perf probe: Support function@filename syntax for --line Since "perf probe --add" supports function@filename syntax, --line option should also support it. Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Franck Bui-Huu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: linux-kernel@vger.kernel.org LKML-Reference: <20110210090810.1809.26913.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit b2e7617e09a8e774d7819c629a0989cbddb5d1ab Author: Benjamin Tissoires Date: Tue Feb 15 15:33:48 2011 +0100 HID: add IRTOUCH infrared USB to hid_have_special_driver Without this patch, the device is handled by hidinput and does not have the right behavior. Signed-off-by: Benjamin Tissoires Signed-off-by: Jiri Kosina commit 4187e262bc90369ba581ee28ec74ed416618889e Author: Jesse Brandeburg Date: Wed Feb 9 17:11:00 2011 -0800 perf tools: Update Makefile with some help The perf makefile is nicely complete except for a) an uninstall option b) a 'make help' description This patch implements b) it also comments out other non-working makefile targets Signed-off-by: Jesse Brandeburg LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit b99976e2d277c963138e090ae17bf835f8a07680 Author: Arnaldo Carvalho de Melo Date: Wed Feb 9 13:59:14 2011 -0200 perf annotate browser: Use the percent color for the whole line Not just for the percentage number, to see the hot lines more easily. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 289c082044643e55f65c6a16bb3621cf3f35a454 Author: Arnaldo Carvalho de Melo Date: Wed Feb 9 13:56:28 2011 -0200 perf annotate: Check if offset is less than symbol size Just like done on symbol__inc_addr_samples to catch misparsed offsets from objdump. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 5c35d69fb60b1dc49595f5b9a2c7158283e9eaf3 Author: Arnaldo Carvalho de Melo Date: Wed Feb 9 11:38:43 2011 -0200 perf ui: Serialize screen updates The ui operations so far were used by just one thread, but 'perf top --tui' now has two threads updating the screen, so we need to use a mutex to avoid garbling the screen. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit e811d3272dbed154b8c56a37392bb1d23c9bd71e Author: Tony Lindgren Date: Wed Feb 16 08:45:46 2011 -0800 TI816X: Update to use init_early Update to use init_early Signed-off-by: Tony Lindgren commit 4d887a250d6294d4e17851da46d6eab4de83c91e Author: Hemant Pedanekar Date: Tue Feb 15 23:06:17 2011 +0530 TI816X: Add low level debug support This patch adds support for low level debugging on TI816X boards. Currently the support for UART3 console on TI816X EVM is added. Signed-off-by: Hemant Pedanekar Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 2c87fb2e644d9141c8723a44a320bb5850790b67 Author: Hemant Pedanekar Date: Tue Feb 15 23:06:08 2011 +0530 TI816X: Create board support and enable build for TI816X EVM This patch adds minimal support and build configuration for TI816X EVM. Signed-off-by: Hemant Pedanekar Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 01001712c96f82e6317b1e09729d8fc4bcc66957 Author: Hemant Pedanekar Date: Wed Feb 16 08:31:39 2011 -0800 TI816X: Update common OMAP machine specific sources This patch updates the common machine specific source files with support for TI816X. Signed-off-by: Hemant Pedanekar Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 4bd7be22f4b25fc87e236a29da3a625621699074 Author: Hemant Pedanekar Date: Wed Feb 16 08:31:39 2011 -0800 TI816X: Update common omap platform files This patch updates the common platform files with TI816X support. The approach taken in this patch is to add TI816X as part of OMAP3 variant where the cpu class is considered as OMAP34XX and the type is TI816X. This means, both cpu_is_omap34xx() and cpu_is_ti816x() checks return success on TI816X. A kernel config option CONFIG_SOC_OMAPTI816X is added under OMAP3 to include support for TI816X build. Signed-off-by: Hemant Pedanekar Reviewed-by: Kevin Hilman Signed-off-by: Tony Lindgren commit e23bba604433a202cd301a976454a90ea6b783ef Author: Tejun Heo Date: Wed Feb 16 17:11:10 2011 +0100 x86-64, NUMA: Unify emulated distance mapping NUMA emulation needs to update node distance information. It did it by remapping apicid to PXM mapping, even when amdtopology is being used. There is no reason to go through such convolution. The generic code has all the information necessary to transform the distance table to the emulated nid space. Implement generic distance table transformation in numa_emulation() and drop private implementations in srat_64 and amdtopology_64. This makes find_node_by_addr() and fake_physnodes() and related functions unnecessary, drop them. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 6b78cb549b4105cbf7c6f7461f27a21f00c44997 Author: Tejun Heo Date: Wed Feb 16 17:11:10 2011 +0100 x86-64, NUMA: Unify emulated apicid -> node mapping transformation NUMA emulation changes node mappings and thus apicid -> node mapping needs to be updated accordingly. srat_64 and amdtopology_64 did this separately; however, all the necessary information is the mapping from emulated nodes to physical nodes which is available in emu_nid_to_phys[]. Implement common __apicid_to_node[] transformation in numa_emulation() and drop duplicate implementations. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 1cca53407336fb6a86092e36dbc5c1e4d45d912b Author: Tejun Heo Date: Wed Feb 16 17:11:10 2011 +0100 x86-64, NUMA: Emulate directly from numa_meminfo NUMA emulation built physnodes[] array which could only represent configurations from the physical meminfo and emulated nodes using the information. There's no reason to take this extra level of indirection. Update emulation functions so that they operate directly on numa_meminfo. This simplifies the code and makes emulation layout behave better with interleaved physical nodes. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 775ee85d7bff8ce7c7eccde90eda400658b650a3 Author: Tejun Heo Date: Wed Feb 16 17:11:10 2011 +0100 x86-64, NUMA: Wrap node ID during emulation Both emulation layout functions - split_nodes[_size]_interleave() - didn't wrap emulated nid while laying out the fake nodes and tried to avoid interating over the specified number of nodes, which is fragile. Now that the emulation code generates numa_meminfo, the node memblks don't need to be consecutive and emulated node IDs can simply wrap. This makes the code more robust and is necessary for updates to better handle the cases where the physical nodes are interleaved. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit c88aea7a70b0f014f98c695069ba91abc9e9b9a4 Author: Tejun Heo Date: Wed Feb 16 17:11:10 2011 +0100 x86-64, NUMA: Make emulation code build numa_meminfo and share the registration path NUMA emulation code built nodes[] array and had its own registration path to set up the emulated nodes. Update it such that it generates emulated numa_meminfo and returns control to initmem_init() and shares the same registration path with non-emulated cases. Because {acpi|amd}_fake_nodes() expect nodes[] parameter, fake_physnodes() now generates nodes[] from numa_meminfo. This will go away with further updates. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 9d073caeb372940af02a768d2b7e845ac732bda0 Author: Tejun Heo Date: Wed Feb 16 17:11:10 2011 +0100 x86-64, NUMA: Build and use direct emulated nid -> phys nid mapping NUMA emulation copied physical NUMA configuration into physnodes[] and used it to reverse-map emulated nodes to physical nodes, which is unnecessarily convoluted. Build emu_nid_to_phys[] array to map emulated nids directly to the matching physical nids and use it in numa_add_cpu(). physnodes[] will be removed with further patches. - v2: Build failure when CONFIG_DEBUG_PER_CPU_MAPS due to missing local variable definition fixed. Reported by Ingo. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit d9c515eacb3bde73f7a5ecb7e35ea6e660ad421d Author: Tejun Heo Date: Wed Feb 16 17:11:10 2011 +0100 x86-64, NUMA: Trivial changes to prepare for emulation updates * Separate out numa_add_memblk_to() from numa_add_memblk() so that different numa_meminfo can be used. * Rename cmdline to emu_cmdline. * Drop @start/last_pfn from numa_emulation() and use max_pfn directly. This patch doesn't introduce any behavior change. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit ac7136b611ee8f8bd6231ce2e1dbdd31ae3d39bc Author: Tejun Heo Date: Wed Feb 16 17:11:09 2011 +0100 x86-64, NUMA: Implement generic node distance handling Node distance either used direct node comparison, ACPI PXM comparison or ACPI SLIT table lookup. This patch implements generic node distance handling. NUMA init methods can call numa_set_distance() to set distance between nodes and the common __node_distance() implementation will report the set distance. Due to the way NUMA emulation is implemented, the generic node distance handling is used only when emulation is not used. Later patches will update NUMA emulation to use the generic distance mechanism. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 4697bdcc945c094d2c8a4876a24faeaf31a283e0 Author: Tejun Heo Date: Wed Feb 16 17:11:09 2011 +0100 x86-64, NUMA: Kill mem_nodes_parsed With all memory configuration information now carried in numa_meminfo, there's no need to keep mem_nodes_parsed separate. Drop it and use numa_nodes_parsed for CPU / memory-less nodes. A new helper numa_nodemask_from_meminfo() is added to calculate memnode mask on the fly which is currently used to set node_possible_map. This simplifies NUMA init methods a bit and removes a source of possible inconsistencies. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 92d4a4371eeb89e1e12b9ebbed0956f499b6c2c0 Author: Tejun Heo Date: Wed Feb 16 17:11:09 2011 +0100 x86-64, NUMA: Rename cpu_nodes_parsed to numa_nodes_parsed It's no longer necessary to keep both cpu_nodes_parsed and mem_nodes_parsed. In preparation for merge, rename cpu_nodes_parsed to numa_nodes_parsed. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 91556237ec872e1029e3036174bae3b1a8df65eb Author: Tejun Heo Date: Wed Feb 16 17:11:09 2011 +0100 x86-64, NUMA: Kill numa_nodes[] numa_nodes[] doesn't carry any information which isn't present in numa_meminfo. Each entry is simply min/max range of all the memblks for the node. This is not only redundant but also inaccurate when memblks for different nodes interleave - for example, find_node_by_addr() can return the wrong nodeid. Kill numa_nodes[] and always use numa_meminfo instead. * nodes_cover_memory() is renamed to numa_meminfo_cover_memory() and now operations on numa_meminfo and returns bool. * setup_node_bootmem() needs min/max range. Compute the range on the fly. setup_node_bootmem() invocation is restructured to use outer loop instead of hardcoding the double invocations. * find_node_by_addr() now operates on numa_meminfo. * setup_physnodes() builds physnodes[] from memblks. This will go away when emulation code is updated to use struct numa_meminfo. This patch also makes the following misc changes. * Clearing of nodes_add[] clearing is converted to memset(). * numa_add_memblk() in amd_numa_init() is moved down a bit for consistency. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit a844ef46fa3055165c28feede6114a711b8375ad Author: Tejun Heo Date: Wed Feb 16 17:11:09 2011 +0100 x86-64, NUMA: Add common find_node_by_addr() srat_64.c and amdtopology_64.c had their own versions of find_node_by_addr() which were basically the same. Add common one in numa_64.c and remove the duplicates. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 56e827fbde9a3cb886a2fe138db0d99e98efbfb1 Author: Tejun Heo Date: Wed Feb 16 17:11:09 2011 +0100 x86-64, NUMA: consolidate and improve memblk sanity checks memblk sanity check was scattered around and incomplete. Consolidate and improve. * Confliction detection and cutoff_node() logic are moved to numa_cleanup_meminfo(). * numa_cleanup_meminfo() clears the unused memblks before returning. * Check and warn about invalid input parameters in numa_add_memblk(). * Check the maximum number of memblk isn't exceeded in numa_add_memblk(). * numa_cleanup_meminfo() is now called before numa_emulation() so that the emulation code also uses the cleaned up version. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 2e756be44714d0ec2f9827e4f4797c60876167a1 Author: Tejun Heo Date: Wed Feb 16 17:11:09 2011 +0100 x86-64, NUMA: make numa_cleanup_meminfo() prettier * Factor out numa_remove_memblk_from(). * Hole detection doesn't need separate start/end. Calculate start/end once. * Relocate comment. * Define iterators at the top and remove unnecessary prefix increments. This prepares for further improvements to the function. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit f9c60251c3d08777db6758cafd959a55a838abd6 Author: Tejun Heo Date: Wed Feb 16 17:11:09 2011 +0100 x86-64, NUMA: Separate out numa_cleanup_meminfo() Separate out numa_cleanup_meminfo() from numa_register_memblks(). node_possible_map initialization is moved to the top of the split numa_register_memblks(). This patch doesn't cause behavior change. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 97e7b78d0674882a0aae043fda428c583dbb225d Author: Tejun Heo Date: Wed Feb 16 17:11:08 2011 +0100 x86-64, NUMA: Introduce struct numa_meminfo Arrays for memblks and nodeids and their length lived in separate variables making things unnecessarily cumbersome. Introduce struct numa_meminfo which contains all memory configuration info. This patch doesn't cause any behavior change. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 8968dab8ad90ea16ef92f2406868354ea3ab6bb9 Author: Tejun Heo Date: Wed Feb 16 17:11:08 2011 +0100 x86-64, NUMA: Remove %NULL @nodeids handling from compute_hash_shift() numa_emulation() called compute_hash_shift() with %NULL @nodeids which meant identity mapping between index and nodeid. Make numa_emulation() build identity array and drop %NULL @nodeids handling from populate_memnodemap() and thus from compute_hash_shift(). This is to prepare for transition to using memblks instead. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 5d371b08fea80c4fb7450d31e5a4e35b438ef850 Author: Tejun Heo Date: Wed Feb 16 17:11:08 2011 +0100 x86-64, NUMA: Kill {acpi|amd|dummy}_scan_nodes() They are empty now. Kill them. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit fd0435d8fb1d4e5771f9ae3af71f2a77c1f4bd09 Author: Tejun Heo Date: Wed Feb 16 17:11:08 2011 +0100 x86-64, NUMA: Unify the rest of memblk registration Move the remaining memblk registration logic from acpi_scan_nodes() to numa_register_memblks() and initmem_init(). This applies nodes_cover_memory() sanity check, memory node sorting and node_online() checking, which were only applied to acpi, to all init methods. As all memblk registration is moved to common code, active range clearing is moved to initmem_init() too and removed from bad_srat(). Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 43a662f04f731c331706456c9852ef7146ba5d85 Author: Tejun Heo Date: Wed Feb 16 17:11:08 2011 +0100 x86-64, NUMA: Unify use of memblk in all init methods Make both amd and dummy use numa_add_memblk() to describe the detected memory blocks. This allows initmem_init() to call numa_register_memblk() regardless of init method in use. Drop custom memory registration codes from amd and dummy. After this change, memblk merge/cleanup in numa_register_memblks() is applied to all init methods. As this makes compute_hash_shift() and numa_register_memblks() used only inside numa_64.c, make them static. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit ef396ec96c1a8ffd2b0bc67f1f79c7274de02b95 Author: Tejun Heo Date: Wed Feb 16 17:11:07 2011 +0100 x86-64, NUMA: Factor out memblk handling into numa_{add|register}_memblk() Factor out memblk handling from srat_64.c into two functions in numa_64.c. This patch doesn't introduce any behavior change. The next patch will make all init methods use these functions. - v2: Fixed build failure on 32bit due to misplaced NR_NODE_MEMBLKS. Reported by Ingo. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 1f169f66ddcc3b4614f840bef367de1ca20e16fe Author: Stefano Stabellini Date: Thu Feb 10 12:08:21 2011 +0000 xen: change xen/[gntdev/gntalloc] to default m When CONFIG_XEN is enabled the gntdev and gntalloc driver will be compiled as a module by default. [v2: Added the fix for the gntalloc driver as well] Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk commit 48228f7b470a74b6469a250d2977a13128d8fe96 Author: Steven Rostedt Date: Tue Feb 8 12:39:54 2011 -0500 lockdep/timers: Explain in detail the locking problems del_timer_sync() may cause Twice I had to explain the output about why lockdep gives an error with locks in IRQ context and with del_timer_sync(). Might as well write it up and place it in the comments above the code in del_timer_sync(). Perhaps the next time this lockdep dump triggers people will understand the issues. It is a ticky issue and very subtle, explaining it in detail in the code may help others understand the issue when they stumble upon the bug again. Signed-off-by: Steven Rostedt Signed-off-by: Peter Zijlstra LKML-Reference: <1297186794.23343.19.camel@gandalf.stny.rr.com> Signed-off-by: Ingo Molnar commit a3ec4a603faf4244e275bf11b467aad092dfbd8a Merge: 51563cd 85e2efb Author: Ingo Molnar Date: Wed Feb 16 13:33:35 2011 +0100 Merge commit 'v2.6.38-rc5' into core/locking Merge reason: pick up upstream fixes. Signed-off-by: Ingo Molnar commit 46e49b3836c7cd2ae5b5fe76fa981d0d292a52fe Author: Venkatesh Pallipadi Date: Mon Feb 14 14:38:50 2011 -0800 sched: Wholesale removal of sd_idle logic sd_idle logic was introduced way back in 2005 (commit 5969fe06), as an HT optimization. As per the discussion in the thread here: lkml - sched: Resolve sd_idle and first_idle_cpu Catch-22 - v1 https://patchwork.kernel.org/patch/532501/ The capacity based logic in the load balancer right now handles this in a much cleaner way, handling more than 2 SMT siblings etc, and sd_idle does not seem to bring any additional benefits. sd_idle logic also has some bugs that has performance impact. Here is the patch that removes the sd_idle logic altogether. Also, there was a dependency of sched_mc_power_savings == 2, with sd_idle logic. Signed-off-by: Venkatesh Pallipadi Acked-by: Vaidyanathan Srinivasan Signed-off-by: Peter Zijlstra LKML-Reference: <1297723130-693-1-git-send-email-venki@google.com> Signed-off-by: Ingo Molnar commit 48fa4b8ecf683f5e411303553da9e186e8b8406e Merge: d95f412 85e2efb Author: Ingo Molnar Date: Wed Feb 16 13:31:51 2011 +0100 Merge commit 'v2.6.38-rc5' into sched/core Merge reason: Pick up upstream fixes. Signed-off-by: Ingo Molnar commit ba3dd36c6775264ee6e7354ba1aabcd6e86d7298 Author: Peter Zijlstra Date: Tue Feb 15 12:41:46 2011 +0100 perf: Optimize hrtimer events There is no need to re-initialize the hrtimer every time we start it, so don't do that (shaves a few cycles). Also, since we know hrtimers run at a fixed rate (nanoseconds) we can pre-compute the desired frequency at which they tick. This avoids us having to go through the whole adaptive frequency feedback logic (shaves another few cycles). Signed-off-by: Peter Zijlstra LKML-Reference: <1297448589.5226.47.camel@laptop> Signed-off-by: Ingo Molnar commit 163ec4354a5135c6c38c3f4a9b46a31900ebdf48 Author: Peter Zijlstra Date: Wed Feb 16 11:22:34 2011 +0100 perf: Optimize throttling code By pre-computing the maximum number of samples per tick we can avoid a multiplication and a conditional since MAX_INTERRUPTS > max_samples_per_tick. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 4979d2729af22f6ce8faa325fc60a85a2c2daa02 Author: Robert Richter Date: Wed Feb 2 17:36:12 2011 +0100 perf, x86: Add support for AMD family 15h core counters This patch adds support for AMD family 15h core counters. There are major changes compared to family 10h. First, there is a new perfctr msr range for up to 6 counters. Northbridge counters are separate now. This patch only adds support for core counters. Second, certain events may only be scheduled on certain counters. For this we need to extend the event scheduling and constraints. We use cpu feature flags to calculate family 15h msr address offsets. This way we later can implement a faster ALTERNATIVE() version for this. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <20110215135210.GB5874@erda.amd.com> Signed-off-by: Ingo Molnar commit 73d6e52206a20354738418625cedc244cbfd5023 Author: Robert Richter Date: Wed Feb 2 17:40:59 2011 +0100 perf, x86: Store perfctr msr addresses in config_base/event_base Instead of storing the base addresses we can store the counter's msr addresses directly in config_base/event_base of struct hw_perf_event. This avoids recalculating the address with each msr access. The addresses are configured one time. We also need this change to later modify the address calculation. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1296664860-10886-5-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 69d8e1e8ac0a7d829f1c0fd5bd07eb3022d9a1a0 Author: Robert Richter Date: Wed Feb 2 17:40:58 2011 +0100 perf, x86: Add new AMD family 15h msrs to perfctr reservation code This patch allows the reservation of perfctrs with new msr addresses introduced for AMD cpu family 15h (0xc0010200/0xc0010201, etc). Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1296664860-10886-4-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 41bf498949a263fa0b2d32524b89d696ac330e94 Author: Robert Richter Date: Wed Feb 2 17:40:57 2011 +0100 perf, x86: Calculate perfctr msr addresses in helper functions This patch adds helper functions to calculate perfctr msr addresses. We need this to later add support for AMD family 15h cpus. For this we have to change the algorithms to generate the perfctr's msr addresses. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1296664860-10886-3-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit d45dd923fcc620c948bd1eda16cc61426ac31646 Author: Robert Richter Date: Wed Feb 2 17:40:56 2011 +0100 perf, x86: Use helper function in x86_pmu_enable_all() Use helper function in x86_pmu_enable_all() to minimize access to x86_pmu.eventsel in the fast path. The counter's msr address is now calculated using struct hw_perf_event. Later we add code that calculates the msr addresses with a table lookup which shouldn't be done in the fast path. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1296664860-10886-2-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 023695d96ee06f36cf5014e286edcd623e9fb847 Author: Stephane Eranian Date: Mon Feb 14 11:20:01 2011 +0200 perf tool: Add cgroup support This patch adds the ability to filter monitoring based on container groups (cgroups) for both perf stat and perf record. It is possible to monitor multiple cgroup in parallel. There is one cgroup per event. The cgroups to monitor are passed via a new -G option followed by a comma separated list of cgroup names. The cgroup filesystem has to be mounted. Given a cgroup name, the perf tool finds the corresponding directory in the cgroup filesystem and opens it. It then passes that file descriptor to the kernel. Example: $ perf stat -B -a -e cycles:u,cycles:u,cycles:u -G test1,,test2 -- sleep 1 Performance counter stats for 'sleep 1': 2,368,667,414 cycles test1 2,369,661,459 cycles cycles test2 1.001856890 seconds time elapsed Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4d590290.825bdf0a.7d0a.4890@mx.google.com> Signed-off-by: Ingo Molnar commit e5d1367f17ba6a6fed5fd8b74e4d5720923e0c25 Author: Stephane Eranian Date: Mon Feb 14 11:20:01 2011 +0200 perf: Add cgroup support This kernel patch adds the ability to filter monitoring based on container groups (cgroups). This is for use in per-cpu mode only. The cgroup to monitor is passed as a file descriptor in the pid argument to the syscall. The file descriptor must be opened to the cgroup name in the cgroup filesystem. For instance, if the cgroup name is foo and cgroupfs is mounted in /cgroup, then the file descriptor is opened to /cgroup/foo. Cgroup mode is activated by passing PERF_FLAG_PID_CGROUP in the flags argument to the syscall. For instance to measure in cgroup foo on CPU1 assuming cgroupfs is mounted under /cgroup: struct perf_event_attr attr; int cgroup_fd, fd; cgroup_fd = open("/cgroup/foo", O_RDONLY); fd = perf_event_open(&attr, cgroup_fd, 1, -1, PERF_FLAG_PID_CGROUP); close(cgroup_fd); Signed-off-by: Stephane Eranian [ added perf_cgroup_{exit,attach} ] Signed-off-by: Peter Zijlstra LKML-Reference: <4d590250.114ddf0a.689e.4482@mx.google.com> Signed-off-by: Ingo Molnar commit d41d5a01631af821d3a3447e6613a316f5ee6c25 Author: Peter Zijlstra Date: Mon Feb 7 17:02:20 2011 +0100 cgroup: Fix cgroup_subsys::exit callback Make the ::exit method act like ::attach, it is after all very nearly the same thing. The bug had no effect on correctness - fixing it is an optimization for the scheduler. Also, later perf-cgroups patches rely on it. Signed-off-by: Peter Zijlstra Acked-by: Paul Menage LKML-Reference: <1297160655.13327.92.camel@laptop> Signed-off-by: Ingo Molnar commit b00560f2d4de69bb12f66f9605985b516df98d77 Merge: bf1af3a 4fe757d Author: Ingo Molnar Date: Wed Feb 16 13:27:18 2011 +0100 Merge branch 'perf/urgent' into perf/core Merge reason: we need to queue up dependent patch Signed-off-by: Ingo Molnar commit 19095548704ecd0f32fd5deba01d56430ad7a344 Author: Tejun Heo Date: Wed Feb 16 12:13:07 2011 +0100 x86-64, NUMA: Kill {acpi|amd}_get_nodes() With common numa_nodes[], common code in numa_64.c can access it directly. Copy directly and kill {acpi|amd}_get_nodes(). Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 206e42087a037fa3adca8908fd318a0cb64d4dee Author: Tejun Heo Date: Wed Feb 16 12:13:07 2011 +0100 x86-64, NUMA: Use common numa_nodes[] ACPI and amd are using separate nodes[] array. Add numa_nodes[] and use them in all NUMA init methods. cutoff_node() cleanup is moved from srat_64.c to numa_64.c and applied in initmem_init() regardless of init methods. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 45fe6c78c4ccc384044d1b4877eebe7acf359e76 Author: Tejun Heo Date: Wed Feb 16 12:13:07 2011 +0100 x86-64, NUMA: Move apicid to numa mapping initialization from amd_scan_nodes() to amd_numa_init() This brings amd initialization behavior closer to that of acpi. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 99df738cd28cc39054cd1a77685d4a94ed2193a4 Author: Tejun Heo Date: Wed Feb 16 12:13:07 2011 +0100 x86-64, NUMA: Remove local variable found from amd_numa_init() Use weight count on mem_nodes_parsed instead. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit ec8cf29b1d39aeb6ef98bc589f0c9a33a8f94c49 Author: Tejun Heo Date: Wed Feb 16 12:13:07 2011 +0100 x86-64, NUMA: Use common {cpu|mem}_nodes_parsed ACPI and amd are using separate nodes_parsed masks. Add {cpu|mem}_nodes_parsed and use them in all NUMA init methods. Initialization of the masks and building node_possible_map are now handled commonly by initmem_init(). dummy_numa_init() is updated to set node 0 on both masks. While at it, move the info messages from scan to init. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit ffe77a4605fb2588f8666850ad3e3b196241658f Author: Tejun Heo Date: Wed Feb 16 12:13:06 2011 +0100 x86-64, NUMA: Restructure initmem_init() Reorganize initmem_init() such that, * Different NUMA init methods are iterated in a consistent way. * Each iteration re-initializes all the parameters and different method can be tried after a failure. * Dummy init is handled the same as other methods. Apart from how retry after failure, this patch doesn't change the behavior. The call sequences are kept equivalent across the conversion. After the change, bad_srat() doesn't need to clear apic to node mapping or worry about numa_off. Simplified accordingly. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit d8fc3afc49bb226c20e37f48a4ddd493cd092837 Author: Tejun Heo Date: Wed Feb 16 12:13:06 2011 +0100 x86, NUMA: Move *_numa_init() invocations into initmem_init() There's no reason for these to live in setup_arch(). Move them inside initmem_init(). - v2: x86-32 initmem_init() weren't updated breaking 32bit builds. Fixed. Found by Ankita. Signed-off-by: Tejun Heo Cc: Ankita Garg Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit a9aec56afac238e4ed3980bd10b22121b83866dd Author: Tejun Heo Date: Wed Feb 16 12:13:06 2011 +0100 x86-64, NUMA: Wrap acpi_numa_init() so that failure can be indicated by return value Because of the way ACPI tables are parsed, the generic acpi_numa_init() couldn't return failure when error was detected by arch hooks. Instead, the failure state was recorded and later arch dependent init hook - acpi_scan_nodes() - would fail. Wrap acpi_numa_init() with x86_acpi_numa_init() so that failure can be indicated as return value immediately. This is in preparation for further NUMA init cleanups. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 940fed2e79a15cf0d006c860d7811adbe5c19882 Author: Tejun Heo Date: Wed Feb 16 12:13:06 2011 +0100 x86-64, NUMA: Unify {acpi|amd}_{numa_init|scan_nodes}() arguments and return values The functions used during NUMA initialization - *_numa_init() and *_scan_nodes() - have different arguments and return values. Unify them such that they all take no argument and return 0 on success and -errno on failure. This is in preparation for further NUMA init cleanups. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 86ef4dbf1f736bb1a4d567e043e3dd81b8b7860c Author: Tejun Heo Date: Wed Feb 16 12:13:06 2011 +0100 x86, NUMA: Drop @start/last_pfn from initmem_init() initmem_init() extensively accesses and modifies global data structures and the parameters aren't even followed depending on which path is being used. Drop @start/last_pfn and let it deal with @max_pfn directly. This is in preparation for further NUMA init cleanups. - v2: x86-32 initmem_init() weren't updated breaking 32bit builds. Fixed. Found by Yinghai. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 13081df5dd6eae1951a3c398fa17d3ed2037a78f Author: Tejun Heo Date: Wed Feb 16 12:13:06 2011 +0100 x86-64, NUMA: Simplify hotplug node handling in acpi_numa_memory_affinity_init() Hotplug node handling in acpi_numa_memory_affinity_init() was unnecessarily complicated with storing the original nodes[] entry and restoring it afterwards. Simplify it by not modifying the nodes[] entry for hotplug nodes from the beginning. Signed-off-by: Tejun Heo Cc: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 7d36b7bc9022f35f95cd85cdf441846298e8f9fb Author: Tejun Heo Date: Wed Feb 16 12:13:06 2011 +0100 x86-64, NUMA: Make dummy node initialization path similar to non-dummy ones Dummy node initialization in initmem_init() didn't initialize apicid to node mapping and set cpu to node mapping directly by caling numa_set_node(), which is different from non-dummy init paths. Update it such that they behave similarly. Initialize apicid to node mapping and call numa_init_array(). The actual cpu to node mapping is handled by init_cpu_to_node() later. Signed-off-by: Tejun Heo Acked-by: Yinghai Lu Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Shaohui Zheng Cc: David Rientjes Cc: Ingo Molnar Cc: H. Peter Anvin commit 9035a97a32836d0e456ddafaaf249a844e6e4b5e Merge: fe16d94 4528583 Author: Chris Wilson Date: Wed Feb 16 09:36:05 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Grab the latest stabilisation bits from -fixes and some suspend and resume fixes from linus. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_irq.c commit fe16d949b45036d9f80e20e07bde1ddacc930b10 Author: Chris Wilson Date: Sat Feb 12 10:29:38 2011 +0000 drm/i915: Move the lvds OpRegion lid detection code to panel and reuse for eDP Share the lid detection code for the all panels for consistent behaviour and a single place to add the eventual quirks for crap hardware. Signed-off-by: Chris Wilson commit 452858338aec31c1f4414bf07f31663690479869 Author: Chris Wilson Date: Wed Dec 22 11:37:09 2010 +0000 agp/intel: Experiment with a 855GM GWB bit Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27187 Tested-by: Thorsten Vollmer (DFI-ACP G5M150-N w/852GME) Tested-by: Moritz Brunner <2points@gmx.org> (Asus M2400N/i855GM) Tested-by: Indan Zupancic (Thinkpad X40/855GM rev 02) Tested-by: Eric Anholt (865G) Signed-off-by: Chris Wilson commit e67189ab9a3bfb7c70ad6a22920c5797160c2eca Author: Jesse Barnes Date: Fri Feb 11 14:44:51 2011 -0800 drm/i915: don't enable FDI & transcoder interrupts after all We can enable some safely, but FDI and transcoder interrupts can occur and block other interrupts from being detected (like port hotplug events). So keep them disabled by default (they can be re-enabled for debugging display bringup, but should generally be off). Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 01eec727d974d245a4b8a909f5219eb56b6a72de Author: Chris Wilson Date: Fri Feb 11 20:47:45 2011 +0000 drm/i915: Ignore a hung GPU when flushing the framebuffer prior to a switch If the gpu is hung, then whatever was inside the render cache is lost and there is little point waiting for it. Or complaining if we see an EIO or EAGAIN instead. So, if the GPU is indeed in its death throes when we need to rewrite the registers for a new framebuffer, just ignore the error and proceed with the update. Signed-off-by: Chris Wilson commit c23cf8baf6965fc9bcffb62c92b384b0f0c78eb7 Author: Justin P. Mattock Date: Tue Feb 15 22:54:44 2011 -0800 cris: fix comment typo occationally to occasionally Signed-off-by: Justin P. Mattock Acked-by: Jesper Nilsson Signed-off-by: Jiri Kosina commit 275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092 Merge: 52b8b8d 9e81509 Author: Ingo Molnar Date: Wed Feb 16 09:45:33 2011 +0100 Merge branch 'x86/amd-nb' into x86/mm Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts with ongoing NUMA work. Signed-off-by: Ingo Molnar commit 52b8b8d7251f8f7b8ed4a6c623618106d83e18b5 Merge: 02ac81a 14392fd Author: Ingo Molnar Date: Wed Feb 16 09:44:04 2011 +0100 Merge branch 'x86/numa' into x86/mm Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts. Signed-off-by: Ingo Molnar commit 02ac81a812fe0575a8475a93bdc22fb291ebad91 Merge: 9a6d44b d2137d5 Author: Ingo Molnar Date: Wed Feb 16 09:42:50 2011 +0100 Merge branch 'x86/bootmem' into x86/mm Merge reason: the topic is ready - consolidate it into the more generic x86/mm tree and prevent conflicts. Signed-off-by: Ingo Molnar commit 41ac51eeda58a85b8a06d748cce7035cc77deebd Author: Patrick Schaaf Date: Fri Feb 11 14:01:12 2011 +0100 ipvs: make "no destination available" message more informative When IP_VS schedulers do not find a destination, they output a terse "WLC: no destination available" message through kernel syslog, which I can not only make sense of because syslog puts them in a logfile together with keepalived checker results. This patch makes the output a bit more informative, by telling you which virtual service failed to find a destination. Example output: kernel: [1539214.552233] IPVS: wlc: TCP 192.168.8.30:22 - no destination available kernel: [1539299.674418] IPVS: wlc: FWM 22 0x00000016 - no destination available I have tested the code for IPv4 and FWM services, as you can see from the example; I do not have an IPv6 setup to test the third code path with. To avoid code duplication, I put a new function ip_vs_scheduler_err() into ip_vs_sched.c, and use that from the schedulers instead of calling IP_VS_ERR_RL directly. Signed-off-by: Patrick Schaaf Signed-off-by: Simon Horman commit 0bfd95a2a104dfc2469d68de52df99939371c0d4 Author: Walter Goossens Date: Mon Feb 14 10:06:42 2011 +0800 altera_ps2: Add devicetree support Add match table for device tree binding. v2: use const and add compat version. v3: change compatible vendor to ALTR. add dts binding doc. v4: condition module device table export for of. Signed-off-by: Walter Goossens Signed-off-by: Thomas Chou Acked-by: Dmitry Torokhov [dustan.bower@gmail.com: fixed missing semicolon] Signed-off-by: Grant Likely commit c652759b6a27be04ef5d747d81e8c36cde7f55d1 Author: Julia Lawall Date: Wed Feb 16 13:05:54 2011 +1100 hwrng: omap - Convert release_resource to release_region/release_mem_region Request_region should be used with release_region, not release_resource. The local variable mem, storing the result of request_mem_region, is dropped and instead the pointer res is stored in the drvdata field of the platform device. This information is retrieved in omap_rng_remove to release the region. The drvdata field is not used elsewhere. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,E; @@ ( *x = request_region(...) | *x = request_mem_region(...) ) ... when != release_region(x) when != x = E * release_resource(x); // Signed-off-by: Julia Lawall Signed-off-by: Herbert Xu commit fc9044e2db8c13746cd886d6276028b27ed5c78e Author: Jesper Juhl Date: Wed Feb 16 13:04:09 2011 +1100 crypto: aesni-intel - Fix remaining leak in rfc4106_set_hash_key Fix up previous patch that failed to properly fix mem leak in rfc4106_set_hash_subkey(). This add-on patch; fixes the leak. moves kfree() out of the error path, returns -ENOMEM rather than -EINVAL when ablkcipher_request_alloc() fails. Signed-off-by: Jesper Juhl Signed-off-by: Herbert Xu commit 5b499f8bf376ecd1575c0cc2095555cf382063ae Author: Vinod Koul Date: Tue Feb 15 18:28:54 2011 +0530 ASoC: sst_platform: fix the pulseaudio error Pulseaudio doesnt work with current driver and it was root caused to absense of hw_params function and malloc_pages in it. This patch adds this and allows pa to work fine with these drivers Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d58198b943c7af6975dec869d75b15dd66d1495c Author: Vinod Koul Date: Tue Feb 15 18:28:55 2011 +0530 ASoC: mfld_machine: make use of soc_register_card API This patch removes the old method of soc-audio device creation in mfld machine and makes use of new soc_register_card API to register the card Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 65e9625e1f86658ee869420713be3afb9a75debd Author: Vinod Koul Date: Tue Feb 15 18:28:53 2011 +0530 ASoC: sn95031: fix the amic tlv scale The tlv scale is defined as (min, step, mute). The mute is not supported here so put the value to 0 Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a62ffc92e8332135c3dbc3351c7e90031830e2f7 Author: Vinod Koul Date: Tue Feb 15 18:28:52 2011 +0530 ASoC: sn95031: fix the DMIC path routing This patch makes the DMIC dynamically connect to TX Mux, earlier code had erroneously made this as static path Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1461d0630ef74073e308a79834ba09e1bd2df08e Author: Vinod Koul Date: Tue Feb 15 18:28:51 2011 +0530 ASoC: sn95031: make playback rails depend on actual pins they control This patch makes the codec playback rails (headset and speaker) depend on actual pins they control. This enables better power management of the codec Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d9236303d0b7ba8bbaeb6adbbf088c3fe2a9ab9e Author: Benjamin Tissoires Date: Tue Feb 15 15:41:10 2011 +0100 HID: kernel oops in out_cleanup in function hidinput_connect Goto out_cleanup infers a kernel oops: hidinput_disconnect calls input_unregister_driver to all members of hid->inputs. However, hidinput already has been added to hid->inputs even though input_register_device was not called. Signed-off-by: Benjamin Tissoires Reviewed-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit f020c39e51b1ef8389d5cf38190d32f55ff9d556 Author: Sascha Hauer Date: Tue Feb 8 21:08:59 2011 +0100 spi/imx: select master mode for all channels The hardware seems to have a race condition when the inactive channels are in slave mode. We support master mode only, so we can just switch all channels to master mode. Signed-off-by: Sascha Hauer [ukleinek: add more verbose comment about the race] Signed-off-by: Uwe Kleine-König Signed-off-by: Grant Likely commit 12e8b325f28a87ad006822d0561112c1751dfc9b Author: Linus Walleij Date: Tue Feb 8 13:03:55 2011 +0100 spi/pl022: minor kerneldoc updates Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit d63636d34761e1146fc7d4ef896ca93c8073ef88 Author: Virupax Sadashivpetimath Date: Tue Feb 8 13:03:41 2011 +0100 spi/pl022: remove dangling status check Signed-off-by: Virupax Sadashivpetimath Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit 808f1037ab3fbf75d25026ad8e175c57927cdb3a Author: Linus Walleij Date: Tue Feb 8 13:03:32 2011 +0100 spi/pl022: disable core voltage when idle This utilizes the new core voltage switch to power off the PL022 core voltage when it's not in use transmitting packets, if and only if a core voltage switch is available. Cc: Russell King Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit ecd442fd9e388a31d382a62fb43e851048c282e1 Author: Linus Walleij Date: Tue Feb 8 13:03:12 2011 +0100 spi/pl022: use dmaengine helper macros This simplifies the DMA code a bit by using the dmaengine helpers. The cookie from descriptor submission can be ignored in this case as has been established in review of the MMCI/PL180 driver. Cc: Dan Williams Cc: Russell King Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit ea3065df7ddffe4669136619ad712783ccee22c6 Author: Sascha Hauer Date: Tue Feb 8 10:46:14 2011 +0100 spi/bitbang: check for setup_transfer during initialization setup_transfer is mandatory if spi_bitbang_transfer is used, so check for it during initialization and not each time during runtime. Signed-off-by: Sascha Hauer Signed-off-by: Uwe Kleine-König Signed-off-by: Grant Likely commit 6cb90db502c5f276c8d6256762cc3acde4d3bd9d Author: Julian Anastasov Date: Wed Feb 9 02:26:38 2011 +0200 ipvs: remove extra lookups for ICMP packets Remove code that should not be called anymore. Now when ip_vs_out handles replies for local clients at LOCAL_IN hook we do not need to call conn_out_get and handle_response_icmp from ip_vs_in_icmp* because such lookups were already performed for the ICMP packet and no connection was found. Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman commit 16a7fd323f93eab88df79fc647575ae9789037c2 Author: Tinggong Wang Date: Wed Feb 9 02:21:59 2011 +0200 ipvs: fix timer in get_curr_sync_buff Fix get_curr_sync_buff to keep buffer for 2 seconds as intended, not just for the current jiffie. By this way we will sync more connection structures with single packet. Signed-off-by: Tinggong Wang Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman commit 178406195755293bf63799ae41ed0c92968ded8c Author: Jarkko Nikula Date: Mon Feb 14 17:20:22 2011 +0200 ASoC: omap: rx51: Report headset insertion instead of video out cable It is more usefull to report headset instead of video out cable in response to jack insertion as this is more usual use-case and because now the headset feature is supported. Automatic accessory detection is not possible at the moment so most sensible static accessory type have to be used. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 31164c7cf1190729292126b2d6d27d792adfcec5 Author: Jarkko Nikula Date: Mon Feb 14 17:20:21 2011 +0200 ASoC: omap: rx51: Add headset support This patch adds support for headset microphone in Nokia RX-51/N900. The mic signal from audio jack is routed to codec A LINE1L via two switches and the mic bias is coming from codec B part. First switch is the tv-out switch that is already supported and the second switch selects between voltage detection circuit and codecs. As there is no use for voltage detection at the moment the second switch is connected statically to codecs in rx51_soc_init. Headset can be active when control "Jack Function" is set to "Headset". Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit d8ec598e5d0d66e68184664073e06b432e3dd140 Author: Jarkko Nikula Date: Mon Feb 14 17:20:20 2011 +0200 ASoC: omap: rx51: Use gpio_request_one to configure tvout_sel gpio Just slight cleanup to be sync with upcoming change. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 8248779b1878f17cce2bb809831f4f2a252bdb77 Author: Florian Westphal Date: Tue Feb 15 21:59:37 2011 +0100 netfilter: nfnetlink_log: remove unused parameter Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit 1974eba605557e934764cb83c8ceb0eca78f011a Author: Sonic Zhang Date: Tue Jan 11 11:19:08 2011 -0500 spi/bfin_spi: return immediately after skipping to next transfer If there is an error with setting up a transfer, we need to return immediately rather than trying to continue to process things. We already set up the error states for the caller at this point. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Grant Likely commit 4d676fc5c39a677aa72148debd47029d8d8f0634 Author: Bob Liu Date: Tue Jan 11 11:19:07 2011 -0500 spi/bfin_spi: support for multiples of 8bits with hardware CS We can do multiples of 8bit transfers when using the hardware CS and a little bit of magic, so make it work. Signed-off-by: Bob Liu Signed-off-by: Mike Frysinger Signed-off-by: Grant Likely commit 69a19ee60d5d5adc0addbdffd254f83b60660a07 Author: Ben Hutchings Date: Tue Feb 15 20:32:04 2011 +0000 net: RPS: Make hardware-accelerated RFS conditional on NETIF_F_NTUPLE For testing and debugging purposes it is useful to be able to disable hardware acceleration of RFS without disabling RFS altogether. Since this is a similar feature to 'n-tuple' flow steering through the ethtool API, test the same feature flag that controls that. Signed-off-by: Ben Hutchings commit f878b995b0f746f5726af9e66940f3bf373dae91 Merge: 29e1846 94b274b Author: David S. Miller Date: Tue Feb 15 12:25:19 2011 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 commit 29e1846a6ba84e0c6e257dd5b1231ed53b98fe9b Merge: f39925d cd1f402 Author: David S. Miller Date: Tue Feb 15 12:08:24 2011 -0800 Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6 commit 94b274bf5fba6c75b922c8a23ad4b5639a168780 Author: Ben Hutchings Date: Mon Jan 10 21:18:20 2011 +0000 sfc: Add TX queues for high-priority traffic Implement the ndo_setup_tc() operation with 2 traffic classes. Current Solarstorm controllers do not implement TX queue priority, but they do allow queues to be 'paced' with an enforced delay between packets. Paced and unpaced queues are scheduled in round-robin within two separate hardware bins (paced queues with a large delay may be placed into a third bin temporarily, but we won't use that). If there are queues in both bins, the TX scheduler will alternate between them. If we make high-priority queues unpaced and best-effort queues paced, and high-priority queues are mostly empty, a single high-priority queue can then instantly take 50% of the packet rate regardless of how many of the best-effort queues have descriptors outstanding. We do not actually want an enforced delay between packets on best- effort queues, so we set the pace value to a reserved value that actually results in a delay of 0. Signed-off-by: Ben Hutchings commit 525da9072c28df815bff64bf00f3b11ab88face8 Author: Ben Hutchings Date: Mon Feb 7 23:04:38 2011 +0000 sfc: Distinguish queue lookup from test for queue existence efx_channel_get_{rx,tx}_queue() currently return NULL if the channel isn't used for traffic in that direction. In most cases this is a bug, but some callers rely on it as an existence test. Add existence test functions efx_channel_has_{rx_queue,tx_queues}() and use them as appropriate. Change efx_channel_get_{rx,tx}_queue() to assert that the requested queue exists. Remove now-redundant initialisation from efx_set_channels(). Signed-off-by: Ben Hutchings commit 60031fcc17057e21566ed34ba23e93fffda1aa27 Author: Ben Hutchings Date: Wed Jan 12 18:39:40 2011 +0000 sfc: Move TX queue core queue mapping into tx.c efx_hard_start_xmit() needs to implement a mapping which is the inverse of tx_queue::core_txq. Move the initialisation of tx_queue::core_txq next to efx_hard_start_xmit() to make the connection more obvious. Signed-off-by: Ben Hutchings commit 5c56580b74e57e56f30e3c5bbc9d7ab487858497 Author: Ben Hutchings Date: Tue Feb 15 19:39:21 2011 +0000 net: Adjust TX queue kobjects if number of queues changes during unregister If the root qdisc for a net device is mqprio, and the driver's ndo_setup_tc() operation dynamically adds and remvoes TX queues, netif_set_real_num_tx_queues() will be called during device unregistration to remove the extra TX queues when the qdisc is destroyed. Currently this causes the corresponding kobjects to be leaked, and the device's reference count never drops to 0. Signed-off-by: Ben Hutchings commit 18fd7315cc475ff53c60e5e7b3bad126c0163527 Author: Jesper Juhl Date: Mon Feb 14 23:54:00 2011 +0100 Freescale STMP37XX/STMP378X Application UART driver: remove duplicate linux/device.h include Do not include linux/device.h twice in drivers/tty/serial/mxs-auart.c . Once is enough. Signed-off-by: Jesper Juhl Signed-off-by: Sascha Hauer commit 6fc31d54443bdc25a8166be15e3920a7e39d195d Author: Russell King Date: Wed Jan 12 17:50:42 2011 +0000 ARM: Defer lookup of machine_type to setup.c Since the debug macros no longer depend on the machine type information, the machine type lookup can be deferred to setup_arch() in setup.c which simplifies the code somewhat. We also move the __error_a functionality into setup.c for displaying a message when a bad machine ID is passed to the kernel via the LL debug code. We also log this into the kernel ring buffer which makes it possible to retrieve the message via a debugger. Original idea from Grant Likely. Acked-by: Grant Likely Tested-by: Tony Lindgren Signed-off-by: Russell King commit cae6292b653f5e3308bf2787a54b7dcd2cc7e2b3 Author: Will Deacon Date: Tue Feb 15 12:42:57 2011 +0100 ARM: 6672/1: LPAE: use phys_addr_t instead of unsigned long in mapping functions The unsigned long datatype is not sufficient for mapping physical addresses >= 4GB. This patch ensures that the phys_addr_t datatype is used to represent physical addresses when converting from a PFN. Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King commit ad6b9c9d78b9beebef02ac7f566a08db7be3c320 Author: Will Deacon Date: Tue Feb 15 12:41:49 2011 +0100 ARM: 6671/1: LPAE: use phys_addr_t instead of unsigned long in outercache functions The unsigned long datatype is not sufficient for mapping physical addresses >= 4GB. This patch ensures that the phys_addr_t datatype is used to represent physical addresses when passed to the outer cache functions. Note that the definitions in struct outer_cache_fns remain as unsigned long because there are currently no outer cache implementations supporting physical addresses wider than 32-bits. Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King commit 29a38193c15bd72ba96c57a805443ef46ea6a6ac Author: Will Deacon Date: Tue Feb 15 14:31:37 2011 +0100 ARM: 6674/1: LPAE: use long long format when printing physical addresses and ptes For the Kernel to support 2 level and 3 level page tables, physical addresses (and also page table entries) need to be 32 or 64-bits depending upon the configuration. This patch uses the %08llx conversion specifier for physical addresses and page table entries, ensuring that they are cast to (long long) so that common code can be used regardless of the datatype widths. Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King commit 903d343e202e51059e7d20524010ef54a6087aed Author: Gustavo F. Padovan Date: Thu Feb 10 14:16:06 2011 -0200 Bluetooth: Add L2CAP mode to debugfs output Signed-off-by: Gustavo F. Padovan commit c531a12ae63b6438a7859994aca23859f5706010 Author: Gustavo F. Padovan Date: Mon Feb 7 20:19:30 2011 -0200 Bluetooth: remove l2cap_load() hack l2cap_load() was added to trigger l2cap.ko module loading from the RFCOMM and BNEP modules. Now that L2CAP module is gone, we don't need it anymore. Signed-off-by: Gustavo F. Padovan commit 7bb2e269aefe4539313922ab4a89367cd52a51d1 Author: Robert Richter Date: Mon Feb 14 19:08:33 2011 +0100 oprofile, s390: Fix section mismatch of function hws_cpu_callback() Fixes the following section mismatch: Section mismatch in reference from the variable hws_cpu_notifier to the function .cpuinit.text:hws_cpu_callback() Acked-by: Heiko Carstens Signed-off-by: Robert Richter commit a0d76247e07abd14968adc4486aaa8e270e9c209 Author: Robert Richter Date: Fri Feb 11 17:31:44 2011 +0100 oprofile, s390: Rework hwsampler implementation This patch is a rework of the hwsampler oprofile implementation that has been applied recently. Now there are less non-architectural changes. The only changes are: * introduction of oprofile_add_ext_hw_sample(), and * removal of section attributes of oprofile_timer_init/_exit(). To setup hwsampler for oprofile we need to modify start()/stop() callbacks and additional hwsampler control files in oprofilefs. We do not reinitialize the timer or hwsampler mode by restarting calling init/exit() anymore, instead hwsampler_running is used to switch the mode directly in oprofile_hwsampler_start/_stop(). For locking reasons there is also hwsampler_file that reflects the value in oprofilefs. The overall diffstat of the oprofile s390 hwsampler implemenation shows the low impact to non-architectural code: arch/Kconfig | 3 + arch/s390/Kconfig | 1 + arch/s390/oprofile/Makefile | 2 +- arch/s390/oprofile/hwsampler.c | 1256 ++++++++++++++++++++++++++++++++++ arch/s390/oprofile/hwsampler.h | 113 +++ arch/s390/oprofile/hwsampler_files.c | 162 +++++ arch/s390/oprofile/init.c | 6 +- drivers/oprofile/cpu_buffer.c | 24 +- drivers/oprofile/timer_int.c | 4 +- include/linux/oprofile.h | 7 + 10 files changed, 1567 insertions(+), 11 deletions(-) Acked-by: Heiko Carstens Signed-off-by: Robert Richter commit 997dbb4967da248808850c250182ef2528fff2d1 Author: Heinz Graalfs Date: Fri Jan 21 10:06:53 2011 +0000 oprofile, s390: Enhance OProfile to support System zs hardware sampling feature OProfile is enhanced to export all files for controlling System z's hardware sampling, and to invoke hwsampler exported functions to initialize and use System z's hardware sampling. The patch invokes hwsampler_setup() during oprofile init and exports following hwsampler files under oprofilefs if hwsampler's setup succeeded: A new directory for hardware sampling based files /dev/oprofile/hwsampling/ The userland daemon must explicitly write to the following files to disable (or enable) hardware based sampling /dev/oprofile/hwsampling/hwsampler to modify the actual sampling rate /dev/oprofile/hwsampling/hw_interval to modify the amount of sampling memory (measured in 4K pages) /dev/oprofile/hwsampling/hw_sdbt_blocks The following files are read only and show the possible minimum sampling rate /dev/oprofile/hwsampling/hw_min_interval the possible maximum sampling rate /dev/oprofile/hwsampling/hw_max_interval The patch splits the oprofile_timer_[init/exit] function so that it can be also called through user context (oprofilefs) to avoid kernel oops. Applied with following changes: * whitespace changes in Makefile and timer_int.c Signed-off-by: Mahesh Salgaonkar Signed-off-by: Maran Pakkirisamy Signed-off-by: Heinz Graalfs Acked-by: Heiko Carstens Signed-off-by: Robert Richter commit ec6a3df1c008d9e8664e53b0363f6847c5c0dc3f Author: Heinz Graalfs Date: Fri Jan 21 10:06:52 2011 +0000 oprofile, s390: Add support for hardware based sampling on System z processors This adds support for hardware based sampling on System z processors (models z10 and up). System z's hardware sampling is described in detail in: SA23-2260-01 "The Load-Program-Parameter and CPU-Measurement Facilities" The patch introduces - support for System z's hardware sampler in OProfile's kernel module - it adds functions that control all hardware sampling related operations as: - checking if hardware sampling feature is available, i.e.: on System z models z10 and up, in LPAR mode only, and authorised during LPAR activation - allocating memory for the hardware sampling feature - starting/stopping hardware sampling All functions required to start and stop hardware sampling have to be invoked by the oprofile kernel module as provided by the other patches of this patch set. In case hardware based sampling cannot be setup standard timer based sampling is used by OProfile. Applied with following changes: * enable compilation in Makefile Signed-off-by: Mahesh Salgaonkar Signed-off-by: Maran Pakkirisamy Signed-off-by: Heinz Graalfs Acked-by: Heiko Carstens Signed-off-by: Robert Richter commit 54ebbe7ba51d97a28a9a406203d171d61858e4b9 Author: Heinz Graalfs Date: Fri Jan 21 10:06:54 2011 +0000 oprofile: Introduce new oprofile sample add function (oprofile_add_ext_hw_sample) This patch introduces a new oprofile sample add function (oprofile_add_ext_hw_sample) that can also take task_struct as an argument, which is used by the hwsampler kernel module when copying hardware samples to OProfile buffers. Applied with following changes: * removed #include * whitespace changes * removed conditional compilation (CONFIG_HAVE_HWSAMPLER) * modified order of functions * fix missing function definition in header file Signed-off-by: Mahesh Salgaonkar Signed-off-by: Maran Pakkirisamy Signed-off-by: Heinz Graalfs Acked-by: Heiko Carstens Signed-off-by: Robert Richter commit 6497dc3a5473a0a7948765c45c3dad9ef0395b28 Author: Steffen Barszus Date: Mon Feb 14 19:53:48 2011 +0100 HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE) This patch adds support for 5 keys which can be found only on the EU version of the gyration remote, which has been not mapped before. Signed-off-by: Steffen Barszus Signed-off-by: Jiri Kosina commit fd018fe8234e84e05ab05d4176525817c8779cd6 Author: Paul Bolle Date: Tue Feb 15 00:05:43 2011 +0100 ext4: fix comment typo uninitized Signed-off-by: Paul Bolle Reviewed-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 68ba69740ba910caeff35452f991d25372dd0f96 Author: Paul Bolle Date: Tue Feb 15 00:05:59 2011 +0100 doc: Fix numbering of KVM API description sections Signed-off-by: Paul Bolle Reviewed-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 8272f4c9c5a46049a66dad5924850de5d1ef2269 Author: Paul Bolle Date: Tue Feb 15 00:05:34 2011 +0100 fuse/cuse: fix comment typo initilaization Signed-off-by: Paul Bolle Reviewed-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 1752a373c4c567445057f1f51d8558ec8cf5d641 Author: Paul Bolle Date: Tue Feb 15 00:05:23 2011 +0100 mISDN: fix printk typo fushing Signed-off-by: Paul Bolle Reviewed-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 46a1ca7068c4dc278ebefd573f571f5e503ce6fc Author: Paul Bolle Date: Tue Feb 15 00:05:01 2011 +0100 hvcs: fix typo in comment Signed-off-by: Paul Bolle Reviewed-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 Merge: a23ce6d 795abaf Author: Jiri Kosina Date: Tue Feb 15 10:24:31 2011 +0100 Merge branch 'master' into for-next commit cd1f402c18cf31b38bb304bc0c320669762ac50b Author: Uwe Kleine-König Date: Tue Jan 25 22:11:25 2011 +0100 net/fec: enable flow control and length check on enet-mac Also optimize not to reread the value written to FEC_R_CNTRL. Signed-off-by: Uwe Kleine-König commit b3cde36cf1e19f696cb302ea426b5cf6ab4afb8a Author: Uwe Kleine-König Date: Tue Jan 25 18:03:37 2011 +0100 net/fec: postpone unsetting driver data until the hardware is stopped Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit d1ab1f54a1b0fb0ae6479fad6e26983f09fd263a Author: Uwe Kleine-König Date: Thu Jan 20 09:26:38 2011 +0100 net/fec: provide device for dma functions and matching sizes for map and unmap This fixes warnings when CONFIG_DMA_API_DEBUG=y: NULL NULL: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x000000004781a020] [size=64 bytes] net eth0: DMA-API: device driver frees DMA memory with different size [device address=0x000000004781a020] [map size=2048 bytes] [unmap size=64 bytes] Moreover pass the platform device to dma_{,un}map_single which makes more sense because the logical network device doesn't know anything about dma. Passing the platform device was a suggestion by Lothar Waßmann. Signed-off-by: Uwe Kleine-König commit 45993653bd5935dbf975bc26a834f2ff23c9f914 Author: Uwe Kleine-König Date: Wed Jan 19 20:47:04 2011 +0100 net/fec: reorder functions a bit allows removing forward declarations Signed-off-by: Uwe Kleine-König commit db8880bc92657559320ba8384acb2547d4255521 Author: Uwe Kleine-König Date: Wed Jan 19 20:26:39 2011 +0100 net/fec: some whitespace cleanup A few of these were found and reported by Lothar Waßmann. Signed-off-by: Uwe Kleine-König commit c556167f819160e157b4d73937885de8754ea53c Author: Uwe Kleine-König Date: Wed Jan 19 11:58:12 2011 +0100 net/fec: consistenly name struct net_device pointers "ndev" A variable named "dev" usually (usually subjective) points to a struct device. Signed-off-by: Uwe Kleine-König commit e497ba825b60727f02d8bc21869f445c5aad34e2 Author: Uwe Kleine-König Date: Mon Jan 17 20:04:23 2011 +0100 net/fec: add phy_stop to fec_enet_close This undoes the effects of phy_start in fec_enet_open. Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit 085e79ed88351d2f3cbf257ff4fc00394792da18 Author: Uwe Kleine-König Date: Mon Jan 17 09:52:18 2011 +0100 net/fec: consolidate all i.MX options to CONFIG_ARM Moreover stop listing all i.MX platforms featuring a FEC, and use the platform's config symbol that selects registration of a fec device instead. This might make it easier to add new platforms. Set default = y for ARMs having a fec to reduce defconfig sizes. Signed-off-by: Uwe Kleine-König commit 24e531b401752995493fa36ee8d8f10c45038e75 Author: Uwe Kleine-König Date: Thu Jan 13 22:29:05 2011 +0100 net/fec: put the ioremap cookie immediately into a void __iomem pointer Saving it first into struct net_device->base_addr (which is an unsigned long) is pointless and only needs to use more casts than necessary. Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit 8b06dc2b1cdc33f6426bc4b0d58b357146d739f9 Author: Uwe Kleine-König Date: Thu Jan 13 21:56:14 2011 +0100 net/fec: no need to memzero private data alloc_etherdev internally uses kzalloc, so the private data is already zerod out. Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit 04e5216d44e173fab619d03e2f746f444ea21ebd Author: Uwe Kleine-König Date: Thu Jan 13 21:53:40 2011 +0100 net/fec: no need to check for validity of ndev in suspend and resume dev_set_drvdata is called unconditionally in the probe function and so it cannot be NULL. Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit b2b09ad63cc09448e49f6a4addae6e078c0e5e36 Author: Uwe Kleine-König Date: Thu Jan 13 21:49:05 2011 +0100 net/fec: don't free an irq that failed to be requested Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit 28e2188efc614c714c69dd5c3f063e066e80d3ba Author: Uwe Kleine-König Date: Thu Jan 13 21:44:18 2011 +0100 net/fec: release mem_region requested in probe in error path and remove Reported-by: Lothar Waßmann Signed-off-by: Uwe Kleine-König commit 8a73b0bc86366113e13d079b3de76df6e94a4a5c Author: Uwe Kleine-König Date: Thu Jan 13 21:34:31 2011 +0100 net/fec: no need to cast arguments for memcpy memcpy takes a const void * as 2nd argument. So the argument is converted automatically to void * anyhow. Signed-off-by: Uwe Kleine-König commit 18e9550273b8a4d28044202f51cb2c3c9254d7c6 Merge: 17292ec d4f7e51 Author: Paul Mundt Date: Tue Feb 15 16:48:28 2011 +0900 Merge branch 'sh/st-integration' into sh-latest commit d4f7e513234019a005c4d33477189f2a4e53bb9c Author: Chris Smith Date: Fri Nov 12 16:26:54 2010 +0100 sh: Enable CONFIG_GCOV_PROFILE_ALL for sh This patch enables gcov kernel profiling over the whole kernel for sh. Profiling of specific files individually already worked. A handful of files have to be explicitly excluded from the profiling to avoid breaking things, notably pmb.c. Signed-off-by: Chris Smith Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt commit f39925dbde7788cfb96419c0f092b086aa325c0f Author: David S. Miller Date: Wed Feb 9 22:00:16 2011 -0800 ipv4: Cache learned redirect information in inetpeer. Note that we do not generate the redirect netevent any longer, because we don't create a new cached route. Instead, once the new neighbour is bound to the cached route, we emit a neigh update event instead. Signed-off-by: David S. Miller commit 2c8cec5c10bced2408082a6656170e74ac17231c Author: David S. Miller Date: Wed Feb 9 20:42:07 2011 -0800 ipv4: Cache learned PMTU information in inetpeer. The general idea is that if we learn new PMTU information, we bump the peer genid. This triggers the dst_ops->check() code to validate and if necessary propagate the new PMTU value into the metrics. Learned PMTU information self-expires. This means that it is not necessary to kill a cached route entry just because the PMTU information is too old. As a consequence: 1) When the path appears unreachable (dst_ops->link_failure or dst_ops->negative_advice) we unwind the PMTU state if it is out of date, instead of killing the cached route. A redirected route will still be invalidated in these situations. 2) rt_check_expire(), rt_worker_func(), et al. are no longer necessary at all. Signed-off-by: David S. Miller commit 9e81509efc4fefcdd75cc6a4121672fa71ae8745 Author: Borislav Petkov Date: Mon Feb 14 18:14:51 2011 +0100 x86, amd: Initialize variable properly Commit d518573de63f ("x86, amd: Normalize compute unit IDs on multi-node processors") introduced compute unit normalization but causes a compiler warning: arch/x86/kernel/cpu/amd.c: In function 'amd_detect_cmp': arch/x86/kernel/cpu/amd.c:268: warning: 'cores_per_cu' may be used uninitialized in this function arch/x86/kernel/cpu/amd.c:268: note: 'cores_per_cu' was declared here The compiler is right - initialize it with a proper value. Also, fix up a comment while at it. Reported-by: Andrew Morton Signed-off-by: Borislav Petkov Cc: Andreas Herrmann LKML-Reference: <20110214171451.GB10076@kryptos.osrc.amd.com> Signed-off-by: Ingo Molnar commit d606ef3fe0c57504b8e534c58498f73a6abc049a Author: Baruch Siach Date: Mon Feb 14 02:05:33 2011 +0000 phy/micrel: add ability to support 50MHz RMII clock on KZS8051RNL Platform code can now set the MICREL_PHY_50MHZ_CLK bit of dev_flags in a fixup routine (registered with phy_register_fixup_for_uid()), to make the KZS8051RNL PHY work with 50MHz RMII reference clock. Cc: David J. Choi Signed-off-by: Baruch Siach Signed-off-by: David S. Miller commit e7c7d760859e78a4f47e7be647df683491e420fb Author: Tony Lindgren Date: Mon Feb 14 15:40:21 2011 -0800 omap: hwmod: Populate _mpu_rt_va later on in omap_hwmod_late_init Otherwise ioremap can fail with early_init patch unless we have a static mapping for everything. Signed-off-by: Tony Lindgren commit 3e16f92536334ccb464ed88cf4d8cc0dd43da106 Author: Tony Lindgren Date: Mon Feb 14 15:40:20 2011 -0800 omap2+: Fix omap_serial_early_init to work with init_early hook The new init_early hook happens at the end of setup_arch, which is too early for kzalloc. However, there's no need to call omap_serial_early_init that early, so fix this by setting it up as a core_initcall. Signed-off-by: Tony Lindgren Tested-by: Kevin Hilman commit 44dc046e93eb98d41048954f700b1927f7e288ed Author: Tony Lindgren Date: Mon Feb 14 15:40:20 2011 -0800 omap2+: Make omap_hwmod_late_init into core_initcall Otherwise things will fail with early_init changes. Signed-off-by: Tony Lindgren commit 3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4 Author: Russell King - ARM Linux Date: Mon Feb 14 15:40:20 2011 -0800 ARM: OMAP2: use early init hook Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook. Signed-off-by: Russell King Signed-off-by: Tony Lindgren commit 37cd4fef6ebfa76acc6ef6de911123739098cff4 Author: Kishon Vijay Abraham I Date: Fri Feb 4 09:15:09 2011 +0000 omap: McBSP: Remove unused audio macros in mcbsp.h Some macros defined in mcbsp.h related to audio, which are never being used is removed. Signed-off-by: Kishon Vijay Abraham I Reviewed-by: Charulatha V Cc: Jarkko Nikula Acked-by: Jarkko Nikula Acked-by: Peter Ujfalusi Acked-by: G, Manjunath Kondaiah Signed-off-by: Tony Lindgren commit 8d689218568174955129d0f0e9e4370a391b3609 Author: Jesper Juhl Date: Mon Feb 14 23:38:18 2011 +0100 batman-adv: Remove two duplicate includes. Remove duplicate inclusion of "send.h" and "routing.h" from net/batman-adv/soft-interface.c Signed-off-by: Jesper Juhl Signed-off-by: Sven Eckelmann commit 7358cf2073e1abcfb85bb2829f73b2a12b909de6 Merge: 2ff9870 6499f0a Author: David Brown Date: Mon Feb 14 13:43:54 2011 -0800 Merge branch 'msm-core' into for-next * msm-core: msm: iommu: Enable IOMMU support for MSM8960 msm: iommu: Generalize platform data for multiple targets msm: iommu: Create a Kconfig item for the IOMMU driver commit 6499f0a8b3f44141431df79923fb8f1d8017e139 Author: Stepan Moskovchenko Date: Fri Feb 11 12:28:18 2011 -0800 msm: iommu: Enable IOMMU support for MSM8960 Allow IOMMU to be selected for MSM8960 now that the platform data has been generalized. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 69e213637538e749f6d22d2f426bcafa39eb5261 Author: Stepan Moskovchenko Date: Fri Feb 11 12:28:17 2011 -0800 msm: iommu: Generalize platform data for multiple targets Make the IOMMU platform data target-independent in preparation for adding MSM8960 IOMMU support. The IOMMU configuration on MSM8x60 and MSM8960 is identical and the same platform data can be used for both. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 24f6173c44a3f921f4fc4b8afc1e3980cbba6528 Author: Stepan Moskovchenko Date: Fri Feb 11 12:28:16 2011 -0800 msm: iommu: Create a Kconfig item for the IOMMU driver Break the IOMMU driver out as a Kconfig item. Initially it was decided to always build this in for 8x60, but this driver is not strictly necessary and should be optionally selectable. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 68aa3fd551e9d54d98794852714dc1edbb21df77 Author: Bernard Pidoux Date: Mon Feb 14 13:33:49 2011 -0800 ROSE: AX25: finding routes simplification With previous patch, rose_get_neigh() routine investigates the full list of neighbor nodes until it finds or not an already connected node whether it is called locally or through a level 3 transit frame. If no routes are opened through an adjacent connected node then a classical connect request is attempted. Then there is no more reason for an extra loop such as the one removed by this patch. Signed-off-by: Bernard Pidoux Signed-off-by: David S. Miller commit c5d8b24ad0a9a45e163a6769b4eb7e7f1fb9aa7f Author: Bernard Pidoux Date: Mon Feb 14 13:31:09 2011 -0800 ROSE: rose AX25 packet routing improvement FPAC AX25 packet application is using Linux kernel ROSE routing skills in order to connect or send packets to remote stations knowing their ROSE address via a network of interconnected nodes. Each FPAC node has a ROSE routing table that Linux ROSE module is looking at each time a ROSE frame is relayed by the node or when a connect request to a neighbor node is received. A previous patch improved the system time response by looking at already established routes each time the system was looking for a route to relay a frame. If a neighbor node routing the destination address was already connected, then the frame would be sent through him. If not, a connection request would be issued. The present patch extends the same routing capability to a connect request asked by a user locally connected into an FPAC node. Without this patch, a connect request was not well handled unless it was directed to an immediate connected neighbor of the local node. Implemented at a number of ROSE FPAC node stations, the present patch improved dramatically FPAC ROSE routing time response and efficiency. Signed-off-by: Bernard Pidoux Signed-off-by: David S. Miller commit c269a20393500e84e8cbae23ca6d65e1107433c4 Author: Johannes Berg Date: Mon Feb 14 12:20:22 2011 +0100 mac80211: reply to directed probes in IBSS WFA certification and the WMM spec require that we always reply to unicast probe requests, so do that. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 05e051d8ae3472302ec7c510ab6d4d85551bd1ea Author: Christian Lamparter Date: Sat Feb 12 22:53:00 2011 +0100 p54spi: update sample eeprom Commit: "p54: enhance rssi->dBm database import" changed the way how the driver deals with the rssical data. A new data format was necessary and hence this patch. NOTE: (for users with a custom eeprom binary) I spent some time updating p54tools to support the new format too: => (git available from) http://git.kernel.org/?p=linux/kernel/git/chr/p54tools.git It now comes with a simplistic script "n800_rssi2v2.sh" which can be used to automate the conversion. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 7a047f4f2f3a812f09f42aa784499a54dc4afcf2 Author: Christian Lamparter Date: Sat Feb 12 22:32:49 2011 +0100 p54: enhance rssi->dBm database import This patch fixes several shortcomings of the previous implementation. Features of the rewrite include: * handles undocumented "0x0000" word at the start of the frequency table. (Affected some early? DELL 1450 USB devices and my Symbol 5GHz miniPCI card.) * supports more than just one reference point per band. (Also needed for the Symbol card.) * ships with default values in case the eeprom data is damaged, absent or unsupported. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit a3162eed04ae76be710d895978478aa6d849de41 Author: Christian Lamparter Date: Sat Feb 12 22:14:38 2011 +0100 p54: p54_generate_band cleanup Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 192abece7565ab37048dfd5eced966cfb2fda6f5 Author: Christian Lamparter Date: Sat Feb 12 21:49:38 2011 +0100 p54: sort channel list by frequency instead of channel index Some channel indices of the low 5GHz band clash with those of the 2.4GHz band. Therefore we should go with the channel's center frequency. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 91f71fa5da00ff50398d8592f304cfec54eed550 Author: Jussi Kivilinna Date: Sat Feb 12 20:43:51 2011 +0200 zd1211rw: add unlikely to ZD_ASSERT Case assert is violated should be quite unlikely. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 8662b2518ff7995002378058488326ef7cb80de8 Author: Jussi Kivilinna Date: Sat Feb 12 20:43:42 2011 +0200 zd1211rw: move async iowrite16v up to callers Writing beacon to device happen through multiple write command calls. zd_usb_iowrite16v uses synchronous urb call and with multiple write commands in row causes high CPU usage. Make asynchronous zd_usb_iowrite16v_async available outside zd_usb.c and use where possible. This lower CPU usage from ~10% to ~2% on Intel Atom when running AP-mode with 100 TU beacon interval. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit eefdbec1ea8b7093d2c09d1825f68438701723cf Author: Jussi Kivilinna Date: Sat Feb 12 20:43:32 2011 +0200 zd1211rw: use async urb for write command Writing beacon to device happen through multiple write command calls. zd_usb_iowrite16v uses synchronous urb call and with multiple write commands in row causes high CPU usage. This patch makes zd_usb_iowrite16v use asynchronous urb submit within zd_usb.c. zd_usb_iowrite16v_async_start is used to initiate writing multiple commands to device using zd_usb_iowrite16v_async. Each URB is delayed and submitted to device by next zd_usb_iowrite16v_async call or by call to zd_usb_iowrite16v_async_end. URBs submitted by zd_usb_iowrite16v_async have URB_NO_INTERRUPT set and last URB send by zd_usb_iowrite16v_async_end does not. This lower CPU usage when doing writes that require multiple URBs. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 37939810b937aba830dd751291fcdc51cae1a6cb Author: Jussi Kivilinna Date: Sat Feb 12 20:43:23 2011 +0200 zd1211rw: correct use of usb_bulk_msg on interrupt endpoints zd1211rw is using usb_bulk_msg() with usb_sndbulkpipe() on interrupt endpoint. However usb_bulk_msg() internally corrects this and makes interrupt URB. It's better to change usb_bulk_msgs in zd1211rw to usb_interrupt_msg for less confusion. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 0c2530cec5672f38f8ab834ee53d17175d3bca95 Author: Helmut Schaa Date: Sat Feb 12 14:17:15 2011 +0100 mac80211: Remove superfluous if clause ieee80211_rx_h_check returned RX_DROP_MONITOR in case the if statement in question was true but the same return value is also used directly after the if clause. Hence, we can just drop the whole if clause and as such simplify the code. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 014cf3bb1e19a61c53666d7f990f584f1b7af364 Author: Rajkumar Manoharan Date: Wed Feb 9 17:46:39 2011 +0530 ath9k: disable beaconing before stopping beacon queue Beaconing should be disabled before stopping beacon queue. Not doing so could queue up beacons in hw that causes failure to stop Tx DMA, due to pending frames in hw and also unnecessary beacon tasklet schedule. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit d76dfc612b40b6a9de0a3fe57fe1fa3db7a1ae3b Author: Seth Forshee Date: Mon Feb 14 08:52:25 2011 -0600 rt2x00: Check for errors from skb_pad() calls Commit 739fd94 ("rt2x00: Pad beacon to multiple of 32 bits") added calls to skb_pad() without checking the return value, which could cause problems if any of those calls does happen to fail. Add checks to prevent this from happening. Signed-off-by: Seth Forshee Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 642745184f82688eb3ef0cdfaa4ba632055be9af Author: Gustavo F. Padovan Date: Mon Feb 7 20:08:52 2011 -0200 Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko Actually doesn't make sense have these modules built separately. The L2CAP layer is needed by almost all Bluetooth protocols and profiles. There isn't any real use case without having L2CAP loaded. SCO is only essential for Audio transfers, but it is so small that we can have it loaded always in bluetooth.ko without problems. If you really doesn't want it you can disable SCO in the kernel config. Signed-off-by: Gustavo F. Padovan commit 410f14837a92177242a403c20d0a0906fe357019 Author: Catalin Marinas Date: Mon Feb 14 12:58:04 2011 +0100 ARM: 6667/1: Fix early_pte_alloc() assumption about the Linux PTE With LPAE we no longer have software bits in a separate Linux PTE and the early_pte_alloc() function should pass PTE_HWTABLE_OFF + PTE_HWTABLE_SIZE to early_alloc() to avoid allocating extra memory. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 31d409373cca3517a30540b51f55dcb1f5af0d49 Author: Eric Dumazet Date: Mon Feb 14 11:23:04 2011 -0800 ipv4: fix rcu lock imbalance in fib_select_default() Commit 0c838ff1ade7 (ipv4: Consolidate all default route selection implementations.) forgot to remove one rcu_read_unlock() from fib_select_default(). Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9960be970cea52c1cb7d7c747ff6da367e1c01b5 Author: Daniel De Graaf Date: Wed Feb 9 18:15:50 2011 -0500 xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit 12996fc38a2d760f3b30c9ceae26d0eeb92fe52d Author: Daniel De Graaf Date: Wed Feb 9 16:11:32 2011 -0500 xen-gntdev: Avoid double-mapping memory If an already-mapped area of the device was mapped into userspace a second time, a hypercall was incorrectly made to remap the memory again. Avoid the hypercall on later mmap calls, and fail the mmap call if a writable mapping is attempted on a read-only range. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit b57c18694ea1641b691fa05ed8af0ce339fa430b Author: Daniel De Graaf Date: Wed Feb 9 15:12:00 2011 -0500 xen-gntdev: Avoid unmapping ranges twice In paravirtualized domains, mn_invl_page or mn_invl_range_start can unmap a segment of a mapped region without unmapping all pages. When the region is later released, the pages will be unmapped twice, leading to an incorrect -EINVAL return. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit 84e4075d60fc8f1c0b937765620bc784dd0c3d39 Author: Daniel De Graaf Date: Wed Feb 9 15:11:59 2011 -0500 xen-gntdev: Use map->vma for checking map validity The is_mapped flag used to be set at the completion of the map operation, but was not checked in all error paths. Use map->vma instead, which will now be cleared if the initial grant mapping fails. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit 0ea22f072fb1b3da4307573c280ce904f0bf1589 Author: Daniel De Graaf Date: Tue Feb 8 09:14:06 2011 -0500 xen-gntdev: Fix unmap notify on PV domains In paravirtualized guests, the struct page* for mappings is only a placeholder, and cannot be used to access the granted memory. Use the userspace mapping that we have set up in order to implement UNMAP_NOTIFY_CLEAR_BYTE. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit 90b6f30548a52f3a59cda5c7db0b9c2a99ebb156 Author: Daniel De Graaf Date: Thu Feb 3 14:16:54 2011 -0500 xen-gntdev: Fix memory leak when mmap fails The error path did not decrement the reference count of the grant structure. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit bdc612dc6903c4ea06e40d02f84ad5e25d93459d Author: Daniel De Graaf Date: Thu Feb 3 12:19:04 2011 -0500 xen/gntalloc,gntdev: Add unmap notify ioctl This ioctl allows the users of a shared page to be notified when the other end exits abnormally. [v2: updated description in structs] Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit dd3140588d9551235ebc2a0dacdca098e7677573 Author: Daniel De Graaf Date: Mon Feb 7 17:23:05 2011 -0500 xen-gntalloc: Userspace grant allocation driver This allows a userspace application to allocate a shared page for implementing inter-domain communication or device drivers. These shared pages can be mapped using the gntdev device or by the kernel in another domain. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit aab8f11a6b4641fcb8c139420f2eae879b5d1698 Author: Daniel De Graaf Date: Thu Feb 3 12:19:02 2011 -0500 xen-gntdev: Support mapping in HVM domains HVM does not allow direct PTE modification, so instead we request that Xen change its internal p2m mappings on the allocated pages and map the memory into userspace normally. Note: The HVM path for map and unmap is slightly different: HVM keeps the pages mapped until the area is deleted, while the PV case (use_ptemod being true) must unmap them when userspace unmaps the range. In the normal use case, this makes no difference to users since unmap time is deletion time. [v2: Expanded commit descr.] Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit 68b025c813c2eb41ff25628e3d4952d5185eb1a4 Author: Daniel De Graaf Date: Thu Feb 3 12:19:01 2011 -0500 xen-gntdev: Add reference counting to maps This allows userspace to perform mmap() on the gntdev device and then immediately close the filehandle or remove the mapping using the remove ioctl, with the mapped area remaining valid until unmapped. This also fixes an infinite loop when a gntdev device is closed without first unmapping all areas. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit a879211bf1d70339e429603805c014450c275f2a Author: Daniel De Graaf Date: Thu Feb 3 12:19:00 2011 -0500 xen-gntdev: Use find_vma rather than iterating our vma list manually This should be faster if many mappings exist, and also removes the only user of map->vma not related to PTE modification. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit ef91082e90491ac99343a13f9aeff4669835c6cc Author: Daniel De Graaf Date: Thu Feb 3 12:18:59 2011 -0500 xen-gntdev: Change page limit to be global instead of per-open Because there is no limitation on how many times a user can open a given device file, an per-file-description limit on the number of pages granted offers little to no benefit. Change to a global limit and remove the ioctl() as the parameter can now be changed via sysfs. Xen tools changeset 22768:f8d801e5573e is needed to eliminate the error this change produces in xc_gnttab_set_max_grants. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit ac7100ba93428a26cde8e47dfcfcfbfbfcce66de Author: Ben Hutchings Date: Mon Feb 14 19:02:23 2011 +0000 sch_mqprio: Always set num_tc to 0 in mqprio_destroy() All the cleanup code in mqprio_destroy() is currently conditional on priv->qdiscs being non-null, but that condition should only apply to the per-queue qdisc cleanup. We should always set the number of traffic classes back to 0 here. Signed-off-by: Ben Hutchings commit 53c39ce56d203d80ba8217a16bb024b25185fb7e Author: Thomas Gleixner Date: Sun Feb 6 22:45:38 2011 +0000 um: Select GENERIC_HARDIRQS_NO_DEPRECATED irq chips converted and proper accessor functions used. Signed-off-by: Thomas Gleixner Cc: Jeff Dike Cc: Andrew Morton LKML-Reference: <20110206224515.430825903@linutronix.de> commit d5b4eea1c575b78448fd5dc54d250ff302ca22f9 Author: Thomas Gleixner Date: Sun Feb 6 22:45:36 2011 +0000 um: Use proper accessors in show_interrupts() Signed-off-by: Thomas Gleixner Cc: Jeff Dike Cc: Andrew Morton LKML-Reference: <20110206224515.322707425@linutronix.de> commit 1d119aa06fb2b2608151a162f15c480d46694b65 Author: Thomas Gleixner Date: Sun Feb 6 22:45:34 2011 +0000 um: Convert irq_chips to new functions Signed-off-by: Thomas Gleixner Cc: Jeff Dike Cc: Andrew Morton LKML-Reference: <20110206224515.224027758@linutronix.de> commit 6ea96e7e4946f790330557e4b7c4c8a174c1c6d2 Author: Thomas Gleixner Date: Sun Feb 6 22:45:31 2011 +0000 um: Remove stale irq_chip.end irq_chip.end got obsolete with the remnoval of __do_IRQ(). Signed-off-by: Thomas Gleixner Cc: Jeff Dike Cc: Peter Zijlstra Cc: Andrew Morton LKML-Reference: <20110206224515.135703209@linutronix.de> commit b214b7bbffca8ac6a6f1dad46408f7a9d4219098 Merge: 7d48ec3 100b33c Author: Grant Likely Date: Mon Feb 14 11:08:53 2011 -0700 Merge commit 'v2.6.38-rc4' into spi/next commit 168202c7bf89d7a2abaf8deaf4bbed18a1f7b3a3 Author: Feng Tang Date: Tue Feb 15 00:13:32 2011 +0800 mrst/vrtc: Avoid using cmos rtc ops If we don't assign Moorestown specific wallclock init and ops function the rtc/persisent clock code will use cmos rtc for access, this will crash Moorestown in that the ioports are not present. Also in vrtc driver, should avoid using cmos access to check UIP status. [feng.tang@intel.com: use set_fixmap_offset_nocache() to simplify code] Signed-off-by: Jacob Pan Signed-off-by: Feng Tang Signed-off-by: Alan Cox Signed-off-by: Thomas Gleixner commit 6b617e224dfac0b64ed70dacdac50be6eb78a6a1 Author: Feng Tang Date: Tue Feb 15 00:13:31 2011 +0800 x86/platform: Add a wallclock_init func to x86_init.timers ops Some wall clock devices use MMIO based HW register, this new function will give them a chance to do some initialization work before their get/set_time service get called, which is usually in early kernel boot phase. Signed-off-by: Feng Tang Signed-off-by: Jacob Pan Signed-off-by: Alan Cox Signed-off-by: Thomas Gleixner commit a2361c8735e07322023aedc36e4938b35af31eb0 Author: Jan Engelhardt Date: Mon Feb 14 17:28:55 2011 +0100 netfilter: xt_conntrack: warn about use in raw table nfct happens to run after the raw table only. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 2822084607c41ca3a2eb70e804aebaddcfdbe5a6 Author: Raymond Yau Date: Tue Feb 8 19:58:25 2011 +0800 ALSA: hda - simplify multistreaming playback model of ad1988 Signed-off-by: Raymond Yau Signed-off-by: Takashi Iwai commit 3347b26cab60e20534b9a46ceea70b9fb74297fb Author: Daniel Mack Date: Fri Feb 11 11:34:12 2011 +0000 ALSA: usb-audio: reconstruct some dispatcher functions to use switch-case The number of cases has increased so use switch-case rather than if-statements. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 54a8c500d5b80c83e0f14cbcfcfd4a84abff8a80 Author: Daniel Mack Date: Fri Feb 11 11:08:06 2011 +0000 ALSA: usb-audio: add support for Native Instruments MK2 devices The MK2 generation of Native Instruments' sound cards are in fact compliant to the USB audio standard of version 2 and other approved USB standards. However, they come up as vendor-specific device when first connected but can be told to come up with a new set of descriptors upon their next enumeration. The interfaces announced by the new descriptors will be handled by the kernel's class drivers. This is done by issuing a vendor specific device request and sending the device to reset. There are also some vendor-specific USB requests for some mixer elements that can't be exported in a standard compliant way. The driver now supports them with quirks handling mechanisms. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit df8d81a32fa0309d64726fc62d83cb70adc899e8 Author: Daniel Mack Date: Wed Sep 1 16:23:46 2010 +0800 ALSA: snd-usb-caiaq: Add support for Traktor Audio 2 Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit fea952e5cc23ea94b4677ca20774cdc3cea014e2 Author: Clemens Ladisch Date: Mon Feb 14 11:00:47 2011 +0100 ALSA: core: sparse cleanups Change the core code where sparse complains. In most cases, this means just adding annotations to confirm that we indeed want to do the dirty things we're doing. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 20b7975e5aefc7fd08b7f582f3901b1669725cd0 Author: Stefan Berger Date: Mon Feb 14 16:54:33 2011 +0100 Revert "netfilter: xt_connlimit: connlimit-above early loop termination" This reverts commit 44bd4de9c2270b22c3c898310102bc6be9ed2978. I have to revert the early loop termination in connlimit since it generates problems when an iptables statement does not use -m state --state NEW before the connlimit match extension. Signed-off-by: Stefan Berger Signed-off-by: Patrick McHardy commit d846f71195d57b0bbb143382647c2c6638b04c5a Author: Vasiliy Kulikov Date: Mon Feb 14 16:49:23 2011 +0100 bridge: netfilter: fix information leak Struct tmp is copied from userspace. It is not checked whether the "name" field is NULL terminated. This may lead to buffer overflow and passing contents of kernel stack as a module name to try_then_request_module() and, consequently, to modprobe commandline. It would be seen by all userspace processes. Signed-off-by: Vasiliy Kulikov Signed-off-by: Patrick McHardy commit 3ff84a7f36554b257cd57325b1a7c1fa4b49fbe3 Author: Pekka Enberg Date: Mon Feb 14 17:46:21 2011 +0200 Revert "slab: Fix missing DEBUG_SLAB last user" This reverts commit 5c5e3b33b7cb959a401f823707bee006caadd76e. The commit breaks ARM thusly: | Mount-cache hash table entries: 512 | slab error in verify_redzone_free(): cache `idr_layer_cache': memory outside object was overwritten | Backtrace: | [] (dump_backtrace+0x0/0x110) from [] (dump_stack+0x18/0x1c) | [] (dump_stack+0x0/0x1c) from [] (__slab_error+0x28/0x30) | [] (__slab_error+0x0/0x30) from [] (cache_free_debugcheck+0x1c0/0x2b8) | [] (cache_free_debugcheck+0x0/0x2b8) from [] (kmem_cache_free+0x3c/0xc0) | [] (kmem_cache_free+0x0/0xc0) from [] (ida_get_new_above+0x19c/0x1c0) | [] (ida_get_new_above+0x0/0x1c0) from [] (alloc_vfsmnt+0x54/0x144) | [] (alloc_vfsmnt+0x0/0x144) from [] (vfs_kern_mount+0x30/0xec) | [] (vfs_kern_mount+0x0/0xec) from [] (kern_mount_data+0x1c/0x20) | [] (kern_mount_data+0x0/0x20) from [] (sysfs_init+0x68/0xc8) | [] (sysfs_init+0x0/0xc8) from [] (mnt_init+0x90/0x1b0) | [] (mnt_init+0x0/0x1b0) from [] (vfs_caches_init+0x100/0x140) | [] (vfs_caches_init+0x0/0x140) from [] (start_kernel+0x2e8/0x368) | [] (start_kernel+0x0/0x368) from [] (__enable_mmu+0x0/0x2c) | c0113268: redzone 1:0xd84156c5c032b3ac, redzone 2:0xd84156c5635688c0. | slab error in cache_alloc_debugcheck_after(): cache `idr_layer_cache': double free, or memory outside object was overwritten | ... | c011307c: redzone 1:0x9f91102ffffffff, redzone 2:0x9f911029d74e35b | slab: Internal list corruption detected in cache 'idr_layer_cache'(24), slabp c0113000(16). Hexdump: | | 000: 20 4f 10 c0 20 4f 10 c0 7c 00 00 00 7c 30 11 c0 | 010: 10 00 00 00 10 00 00 00 00 00 c9 17 fe ff ff ff | 020: fe ff ff ff fe ff ff ff fe ff ff ff fe ff ff ff | 030: fe ff ff ff fe ff ff ff fe ff ff ff fe ff ff ff | 040: fe ff ff ff fe ff ff ff fe ff ff ff fe ff ff ff | 050: fe ff ff ff fe ff ff ff fe ff ff ff 11 00 00 00 | 060: 12 00 00 00 13 00 00 00 14 00 00 00 15 00 00 00 | 070: 16 00 00 00 17 00 00 00 c0 88 56 63 | kernel BUG at /home/rmk/git/linux-2.6-rmk/mm/slab.c:2928! Reference: https://lkml.org/lkml/2011/2/7/238 Cc: # 2.6.35.y and later Reported-and-analyzed-by: Russell King Signed-off-by: Pekka Enberg commit c4c896e1471aec3b004a693c689f60be3b17ac86 Author: Vasiliy Kulikov Date: Mon Feb 14 13:54:26 2011 +0300 Bluetooth: sco: fix information leak to userspace struct sco_conninfo has one padding byte in the end. Local variable cinfo of type sco_conninfo is copied to userspace with this uninizialized one byte, leading to old stack contents leak. Signed-off-by: Vasiliy Kulikov Signed-off-by: Gustavo F. Padovan commit 43629f8f5ea32a998d06d1bb41eefa0e821ff573 Author: Vasiliy Kulikov Date: Mon Feb 14 13:54:31 2011 +0300 Bluetooth: bnep: fix buffer overflow Struct ca is copied from userspace. It is not checked whether the "device" field is NULL terminated. This potentially leads to BUG() inside of alloc_netdev_mqs() and/or information leak by creating a device with a name made of contents of kernel stack. Signed-off-by: Vasiliy Kulikov Signed-off-by: Gustavo F. Padovan commit bf1af3a809506645b9130755b713b008da14737f Merge: 0de4b34 868baf0 Author: Ingo Molnar Date: Mon Feb 14 15:15:16 2011 +0100 Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core commit 14392fd329eca9b59d51c0aa5d0acfb4965424d1 Author: David Rientjes Date: Mon Feb 7 14:08:53 2011 -0800 x86, numa: Add error handling for bad cpu-to-node mappings CONFIG_DEBUG_PER_CPU_MAPS may return NUMA_NO_NODE when an early_cpu_to_node() mapping hasn't been initialized. In such a case, it emits a warning and continues without an issue but callers may try to use the return value to index into an array. We can catch those errors and fail silently since a warning has already been emitted. No current user of numa_add_cpu() requires this error checking to avoid a crash, but it's better to be proactive in case a future user happens to have a bug and a user tries to diagnose it with CONFIG_DEBUG_PER_CPU_MAPS. Reported-by: Jesper Juhl Signed-off-by: David Rientjes Cc: Tejun Heo LKML-Reference: Signed-off-by: Ingo Molnar commit b366801c95bdbeda811ac9668a3943051a18c188 Merge: eff9073 100b33c Author: Ingo Molnar Date: Mon Feb 14 13:28:29 2011 +0100 Merge commit 'v2.6.38-rc4' into x86/numa Merge reason: Merge latest fixes before applying new patch. Signed-off-by: Ingo Molnar commit e5fea868e6c04343e501176a373d568c1c0094aa Author: Yinghai Lu Date: Tue Feb 8 23:22:17 2011 -0800 x86: Fix and clean up generic_processor_info() One of the error printouts in generic_processor_info() prints out the APIC version instead of the cpu index the warning text describes. Move version validation down, after we get the right cpu index. -v2: add comments about reason why we can have cpu=0 there. Signed-off-by: Yinghai Lu LKML-Reference: <4D5240A9.4080703@kernel.org> [ Cleaned up and made the BIOS bug printouts more consistent ] Signed-off-by: Ingo Molnar commit 91e04ec05838a5b2c790decf2a91af98cb1666e8 Merge: 792363d 100b33c Author: Ingo Molnar Date: Mon Feb 14 13:18:51 2011 +0100 Merge commit 'v2.6.38-rc4' into x86/cpu Merge reason: pick up the latest fixes. Signed-off-by: Ingo Molnar commit 9a6d44b9adb777ca9549e88cd55bd8f2673c52a2 Author: Kamal Mostafa Date: Thu Feb 3 17:38:05 2011 -0800 x86: Emit "mem=nopentium ignored" warning when not supported Emit warning when "mem=nopentium" is specified on any arch other than x86_32 (the only that arch supports it). Signed-off-by: Kamal Mostafa BugLink: http://bugs.launchpad.net/bugs/553464 Cc: Yinghai Lu Cc: Len Brown Cc: Rafael J. Wysocki LKML-Reference: <1296783486-23033-2-git-send-email-kamal@canonical.com> Signed-off-by: Ingo Molnar Cc: commit 77eed821accf5dd962b1f13bed0680e217e49112 Author: Kamal Mostafa Date: Thu Feb 3 17:38:04 2011 -0800 x86: Fix panic when handling "mem={invalid}" param Avoid removing all of memory and panicing when "mem={invalid}" is specified, e.g. mem=blahblah, mem=0, or mem=nopentium (on platforms other than x86_32). Signed-off-by: Kamal Mostafa BugLink: http://bugs.launchpad.net/bugs/553464 Cc: Yinghai Lu Cc: Len Brown Cc: Rafael J. Wysocki Cc: # .3x: as far back as it applies LKML-Reference: <1296783486-23033-1-git-send-email-kamal@canonical.com> Signed-off-by: Ingo Molnar commit 7064d865af804b9b841e7b9a3e9b653e40c3e5ca Author: Shaohua Li Date: Mon Jan 17 10:52:10 2011 +0800 x86: Avoid tlbstate lock if not enough cpus This one isn't related to previous patch. If online cpus are below NUM_INVALIDATE_TLB_VECTORS, we don't need the lock. The comments in the code declares we don't need the check, but a hot lock still needs an atomic operation and expensive, so add the check here. Uses nr_cpu_ids here as suggested by Eric Dumazet. Signed-off-by: Shaohua Li Acked-by: Eric Dumazet Cc: Andi Kleen LKML-Reference: <1295232730.1949.710.camel@sli10-conroe> Signed-off-by: Ingo Molnar commit 70e4a369733a21e3d16b059a6ccdad22a344bf57 Author: Shaohua Li Date: Mon Jan 17 10:52:07 2011 +0800 x86: Scale up the number of TLB invalidate vectors with NR_CPUs, up to 32 Make the maxium TLB invalidate vectors depend on NR_CPUS linearly, with a maximum of 32 vectors. We currently only have 8 vectors for TLB invalidation and that is clearly inadequate. If we have a lot of CPUs, the CPUs need share the 8 vectors and tlbstate_lock is used to protect them. flush_tlb_page() is heavily used in page reclaim, which will cause a lot of lock contention for tlbstate_lock. Andi Kleen suggested increasing the vectors number to 32, which should be good for current typical systems to reduce the tlbstate_lock contention. My test system has 4 sockets and 64G memory, and 64 CPUs. My workload creates 64 processes. Each process mmap reads a big empty sparse file. The total size of the files are 2*total_mem, so this will cause a lot of page reclaim. Below is the result I get from perf call-graph profiling: without the patch: ------------------ 24.25% usemem [kernel] [k] _raw_spin_lock | --- _raw_spin_lock | |--42.15%-- native_flush_tlb_others with the patch: ------------------ 14.96% usemem [kernel] [k] _raw_spin_lock | --- _raw_spin_lock |--13.89%-- native_flush_tlb_others So this heavily reduces the tlbstate_lock contention. Suggested-by: Andi Kleen Signed-off-by: Shaohua Li Cc: Eric Dumazet Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Peter Zijlstra LKML-Reference: <1295232727.1949.709.camel@sli10-conroe> Signed-off-by: Ingo Molnar commit 3a09fb4570a1cce11472b8e5da3f6ee409f529d5 Author: Shaohua Li Date: Mon Jan 17 10:52:05 2011 +0800 x86: Allocate 32 tlb_invalidate_interrupt handler stubs Add up to 32 invalidate_interrupt handlers. How many handlers are added depends on NUM_INVALIDATE_TLB_VECTORS. So if NUM_INVALIDATE_TLB_VECTORS is smaller than 32, we reduce code size. Signed-off-by: Shaohua Li Cc: Andi Kleen Cc: Eric Dumazet LKML-Reference: <1295232725.1949.708.camel@sli10-conroe> Signed-off-by: Ingo Molnar commit 60f6e65d7887c257392313755f95540ef5e7ea89 Author: Shaohua Li Date: Mon Jan 17 10:52:02 2011 +0800 x86: Cleanup vector usage Cleanup the vector usage and make them continuous if possible. Signed-off-by: Shaohua Li Cc: Andi Kleen Cc: Eric Dumazet LKML-Reference: <1295232722.1949.707.camel@sli10-conroe> Signed-off-by: Ingo Molnar commit 0670e7157f75ec6d2231fbc6f67b075d6b6d486f Merge: 80cc07a 4aa5f36 Author: Dan Williams Date: Mon Feb 14 03:36:51 2011 -0800 Merge branch 'dw_dmac' into dmaengine commit 80cc07af0f6692a7d8fdc5087594d1988a701266 Merge: e19d1d4 0c842b5 Author: Dan Williams Date: Mon Feb 14 03:36:44 2011 -0800 Merge branch 'dma40' into dmaengine commit 0de4b34d466bae571b50f41c7296b85248205e35 Author: Masami Hiramatsu Date: Mon Feb 14 14:48:07 2011 +0900 tracing/kprobe: Fix NULL pointer deref check Add NULL check for avoiding NULL pointer deref. This bug has been introduced by: 1ff511e35ed8: tracing/kprobes: Add bitfield type which causes a null pointer dereference bug when kprobe-tracer parses an argument without type. Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Masami Hiramatsu Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Peter Zijlstra LKML-Reference: <20110214054807.8919.69740.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar Reported-by: Arnaldo Carvalho de Melo commit d2137d5af4259f50c19addb8246a186c9ffac325 Merge: f005fe1 795abaf Author: Ingo Molnar Date: Mon Feb 14 11:55:18 2011 +0100 Merge branch 'linus' into x86/bootmem Conflicts: arch/x86/mm/numa_64.c Merge reason: fix the conflict, update to latest -rc and pick up this dependent fix from Yinghai: e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base() Signed-off-by: Ingo Molnar commit 881ff67ad45041f6ff08441aa17302aea77bd054 Author: Bhupesh Sharma Date: Sun Feb 13 22:51:44 2011 -0800 can: c_can: Added support for Bosch C_CAN controller Bosch C_CAN controller is a full-CAN implementation which is compliant to CAN protocol version 2.0 part A and B. Bosch C_CAN user manual can be obtained from: http://www.semiconductors.bosch.de/media/en/pdf/ipmodules_1/c_can/users_manual_c_can.pdf This patch adds the support for this controller. The following are the design choices made while writing the controller driver: 1. Interface Register set IF1 has be used only in the current design. 2. Out of the 32 Message objects available, 16 are kept aside for RX purposes and the rest for TX purposes. 3. NAPI implementation is such that both the TX and RX paths function in polling mode. Signed-off-by: Bhupesh Sharma Signed-off-by: David S. Miller commit c906041412a3b3eae2323408e26547ca60d94b89 Author: Guo-Fu Tseng Date: Sun Feb 13 19:27:18 2011 +0000 jme: Advance driver version Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit c00cd82641023ade3c44b4f11140a8afad460415 Author: Guo-Fu Tseng Date: Sun Feb 13 19:27:17 2011 +0000 jme: Don't show UDP Checksum error if HW misjudged Some JMicron Chip treat 0 as error checksum for UDP packets. Which should be "No checksum needed". Reported-by: Adam Swift Confirmed-by: "Aries Lee" Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 8b53abae582cee9a17320460e0f05474097192b6 Author: Guo-Fu Tseng Date: Sun Feb 13 18:27:40 2011 +0000 jme: Refill receive unicase MAC addr after resume The value of the register which holds receive Unicast MAC Address sometimes get messed-up after resume. This patch refill it before enabling the hardware filter. Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 854a2e7c331a36244169626ba8e11e15d134cb5f Author: Guo-Fu Tseng Date: Sun Feb 13 18:27:39 2011 +0000 jme: Safer MAC processor reset sequence Adding control to clk_rx, and makes the control of clk_{rx|tx|tcp} with safer sequence. This sequence is provided by JMicron. Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 3903c023570446303a10f152cfc120dcbf9a4ccf Author: Guo-Fu Tseng Date: Sun Feb 13 18:27:38 2011 +0000 jme: Fix hardware action of full-duplex Clear Transmit Timer/Retry setting while full-duplex. Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 51754572371491b63f70aae41dab70dfcaf771b2 Author: Guo-Fu Tseng Date: Sun Feb 13 18:27:37 2011 +0000 jme: Rename phyfifo function for easier understand Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 3c2368d96fd9a5828b260dfec59ae9a5352cd598 Author: Guo-Fu Tseng Date: Sun Feb 13 18:27:36 2011 +0000 jme: Fix bit typo of JMC250A2 workaround Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 4872b11fdbbf78665230b2bb5864b1611dcb4a25 Author: Guo-Fu Tseng Date: Sun Feb 13 18:27:35 2011 +0000 jme: PHY Power control for new chip After main chip rev 5, the hardware support more power saving control registers. Some Non-Linux drivers might turn off the phy power with new interfaces, this patch makes it possible for Linux to turn it on again. Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 19d96017d1b5b1c9b709bc21a398ea793256644c Author: Guo-Fu Tseng Date: Sun Feb 13 18:27:34 2011 +0000 jme: Extract main and sub chip revision Get the main and sub chip revision for later workaround use. Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit afc6151a78a43bdca5f64a8bd3e3c13837580c54 Author: Jiri Pirko Date: Sun Feb 13 09:33:42 2011 +0000 bridge: implement [add/del]_slave ops add possibility to addif/delif via rtnetlink Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 9232ecca3ecd2e32140118c8fdabd7f8fb9ef4d5 Author: Jiri Pirko Date: Sun Feb 13 09:33:01 2011 +0000 bond: implement [add/del]_slave ops allow enslaving/releasing using netlink interface Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit fbaec0ea54f7d9131891ff98744e82c073ce03b1 Author: Jiri Pirko Date: Sun Feb 13 10:15:37 2011 +0000 rtnetlink: implement setting of master device This patch allows userspace to enslave/release slave devices via netlink interface using IFLA_MASTER. This introduces generic way to add/remove underling devices. Signed-off-by: Jiri Pirko Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit f98dedcefdbcbe8d51e77d911583ecc2c2668174 Merge: 905f695 3017358 Author: Mark Brown Date: Sun Feb 13 19:51:04 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 905f6952c5bc8126f1d82c2eb8a699271080b57e Author: Mark Brown Date: Fri Feb 11 14:39:13 2011 +0000 ASoC: Warn if WM8903 platform data is used to enable microphone IRQ The WM8903 interrupts are clear on read so if the WM8903 detection is enabled from platform data when the IRQ is in use (rather than using a direct signal from a GPIO) status may be lost during startup. Help users spot this misconfiguration by adding a WARN_ON(). Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 8eb34207c8cf90bc991f0141f7d3fa614429a00b Author: Stephen Warren Date: Thu Feb 10 15:37:19 2011 -0700 ASoC: Tegra: Add MODULE_ALIAS With the appropriate MODULE_ALIAS in place, the audio modules will be automatically loaded; there is no longer a need for manual modprobes. Signed-off-by: Stephen Warren Signed-off-by: Mark Brown commit bf1b1328360d53a41cdf3f8639a5f38cb9537f1c Author: Stephen Warren Date: Thu Feb 10 15:37:18 2011 -0700 ASoC: Tegra: Harmony: Explicitly set mic enables Harmony has both an external mic (a regular mic jack) and an internal mic (a 0.1" two-pin header on the board). The external mic is connected to the WM8903's IN1L pin, and is supported by the current driver. The internal mic is connected to the WM8903's IN1R pin, and is not supported by the current driver. It appears that no Harmony systems were shipped with any internal mic connected; users were expected to provide their own. This makes the internal mic connection less interesting. The WM8903's Mic Bias signal is used for both of these mics. For each mic, a GPIO drives a transistor which gates whether the mic bias signal is actively connected to that mic, or isolated from it. The dual use of the mic bias for both mics makes a general-purpose complete implementation of mic detection using the mic bias complex. So, for simplicity, the internal mic is currently ignored by the driver. This patch configures the relevant GPIOs to enable the mic bias connection to the external mic, and disable the mic bias connection to the internal mic. Note that in practice, this is the default state if these GPIOs aren't configured. Signed-off-by: Stephen Warren Signed-off-by: Mark Brown commit 0d6cdca7199fbc93a8f29369f2b1e750d346ac8f Author: Stephen Warren Date: Thu Feb 10 15:37:17 2011 -0700 ASoC: Harmony: Call snd_soc_dapm_nc_pin Signed-off-by: Stephen Warren Signed-off-by: Mark Brown commit 41b5f9b349617a42696b6783a86cfa8226044c6f Author: Stephen Warren Date: Thu Feb 10 15:37:16 2011 -0700 ASoC: Tegra: Harmony: Implement mic detection * Add jack definition for mic jack * Request wm8903 to enable mic detection * Force mic bias on, since it's required for mic detection Signed-off-by: Stephen Warren Signed-off-by: Mark Brown commit c299190b9398d4edfbf80a749875d5bac199bfdc Author: James Bottomley Date: Sun Jan 23 09:44:12 2011 -0600 [SCSI] libsas: convert to libata new error handler The conversion is quite complex given that the libata new error handler has to be hooked into the current libsas timeout and error handling. The way this is done is to process all the failed commands via libsas first, but if they have no underlying sas task (and they're on a sata device) assume they are destined for the libata error handler and send them accordingly. Finally, activate the port recovery of the libata error handler for each port known to the host. This is somewhat suboptimal, since that port may not need recovering, but given the current architecture of the libata error handler, it's the only way; and the spurious activation is harmless. Signed-off-by: James Bottomley commit 64878c0eff5737e15b3ff06d02e7227eda4aa04c Author: James Bottomley Date: Sun Jan 23 09:42:50 2011 -0600 [SCSI] libata: separate error handler into usable components Right at the moment, the libata error handler is incredibly monolithic. This makes it impossible to use from composite drivers like libsas and ipr which have to handle error themselves in the first instance. The essence of the change is to split the monolithic error handler into two components: one which handles a queue of ata commands for processing and the other which handles the back end of readying a port. This allows the upper error handler fine grained control in calling libsas functions (and making sure they only get called for ATA commands whose lower errors have been fixed up). Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: James Bottomley commit 4451ef63e1a881eb275eb16dd1980491eea709de Author: James Bottomley Date: Sun Jan 23 08:31:14 2011 -0600 [SCSI] libata: fix eh locking The SCSI host eh_cmd_q should be protected by the host lock (not the port lock). This probably doesn't matter that much at the moment, since we try to serialise the add and eh pieces, but it might matter in future for more convenient error handling. Plus this switches libata to the standard eh pattern where you lock, remove from the cmd queue to a local list and unlock and then operate on the local list. Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: James Bottomley commit b8784f77455124ceb4746e798f7aaf5b3b8a5406 Author: James Bottomley Date: Sun Jan 23 08:30:00 2011 -0600 [SCSI] libata: fix locking for sas paths For historical reasons, libsas uses the scsi host lock as the ata port lock, and libata always uses the ata host. For the old eh, this was largely irrelevant since the two locks were never mixed inside the code. However, the new eh has a case where it nests acquisition of the host lock inside the port lock (this does look rather deadlock prone). Obviously this would be an instant deadlock if the port lock were the host lock, so switch the libsas paths to use the ata host lock as well. Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: James Bottomley commit 1f723867e650e5e021445eea34fddeffca9c4faa Author: James Bottomley Date: Sun Jan 23 08:28:33 2011 -0600 [SCSI] libata: plumb sas port scan into standard libata paths The function ata_sas_port_init() has always really done its own thing. However, as a precursor to moving to the libata new eh, it has to be properly using the standard libata scan paths. This means separating the current libata scan paths into pieces which can be shared with libsas and pieces which cant (really just the async call and the host scan). Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: James Bottomley commit f45437efff460aa033978180da88229c5fc68455 Author: Sakari Ailus Date: Wed Feb 9 10:25:06 2011 +0000 tlan: Fix bugs introduced by the last tlan cleanup patch Fix two bugs introduced by the commit c659c38b2796578638548b77ef626d93609ec8ac ("tlan: Code cleanup: checkpatch.pl is relatively happy now.") In that change, TLAN_CSTAT_READY was considered as a bit mask containing a single bit set while it was actually had two set instead. Many thanks to Dan Carpenter for finding the mistake. Signed-off-by: Sakari Ailus Signed-off-by: David S. Miller commit 1765a575334f1a232c1478accdee5c7d19f4b3e3 Author: Jiri Pirko Date: Sat Feb 12 06:48:36 2011 +0000 net: make dev->master general dev->master is now tightly connected to bonding driver. This patch makes this pointer more general and ready to be used by others. - netdev_set_master() - bond specifics moved to new function netdev_set_bond_master() - introduced netif_is_bond_slave() to check if device is a bonding slave Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit d59cfde2fb960b5970ccb5a38cea25d38b37a8e8 Author: Jiri Pirko Date: Sat Feb 12 00:46:06 2011 +0000 net: remove the unnecessary dance around skb_bond_should_drop No need to check (master) twice and to drive in and out the header file. Signed-off-by: Jiri Pirko Reviewed-by: Nicolas de Pesloüan Signed-off-by: David S. Miller commit 8ef395310852710bb4237d918bbac53b22622ef0 Author: Chris Schlund Date: Mon Feb 7 17:53:10 2011 +0100 HID: hid-lcpower: fix key mapping I already got some feedback for this module, telling me red and blue keys are exchanged. I checked it, and they are right. Due to my incorrect userspace settings I missed this during my testing. Signed-off-by: Chris Schlund Signed-off-by: Jiri Kosina commit a0b990c62c8915bb0c4ba55cf5d3da3c8fa74413 Author: Moger, Babu Date: Fri Feb 11 16:12:44 2011 -0700 [SCSI] scsi_dh_rdac : Adding MODULE VERSION for rdac device handler Adding MODULE_VERSION for scsi_dh_rdac. This will be helpful sometimes to get the code level without looking at the code. Signed-off-by: Babu Moger Signed-off-by: James Bottomley commit 9dfeb3157e34315b8ca27d816a79358698a999ac Author: Hillf Danton Date: Fri Feb 11 15:17:33 2011 -0700 [SCSI] scsi_dh: cosmetic change to sizeof() instead of doing sizeof(struct X) it's better to do sizeof(*v) where v is the variable pointing to struct X. Signed-off-by: Hillf Danton Signed-off-by: Babu Moger Signed-off-by: James Bottomley commit 04b6e153b64471ff43dde82b0122e67cf491f2f5 Author: Moger, Babu Date: Fri Feb 11 15:14:08 2011 -0700 [SCSI] scsi_dh_rdac: fix for lun_table update for rdac device handler During one of our testing, we noticed that mode select command sent from the host did not have the lun_table updated. Problem is root caused to the way lun table is updated. Lun table update was done after the call to blk_rq_map_kern is made. This was causing problem because kernel uses bounce buffer(bio_copy_kern) if the address is not aligned. The command buffer updated after the call(blk_rq_map_kern) was not going on the wire. Moved the code to update the lun_table before the call to fix the problem. Signed-off-by: Babu Moger Signed-off-by: Somasundaram Krishnasamy Signed-off-by: Yanling Qi Signed-off-by: James Bottomley commit 3487735aa54407565278a5a1288119c45210b86c Author: Kashyap, Desai Date: Thu Feb 10 11:51:24 2011 +0530 [SCSI] mptfusion: Remove bus reset for mptsas module Bus reset is not required for SAS Controller. It is valid for mptspi and mptfc, but for mptsas it is not required. It is an extra work for Error handling escallation for mptsas. Removing bus reset from error handling will eventually speedup Error handling for SAS controller. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit d75733d51fdab5c99a0d9491b25f22e13b39cdc1 Author: Kashyap, Desai Date: Thu Feb 10 11:50:39 2011 +0530 [SCSI] mptfusion: Support SAS2.0 Devices with SAS1.0 Controllers SAS1.0 Controller was not able to detect SAS2.0 Expanders due to Link RATE detection was limited to 1.5 Gbps and 3.0 Gbps for SAS1 controllers. Added detection for 6.0 Gbps link. Now, user can mix-up 6.0 Gpbs links with SAS1.0 controller. e.g SAS1.0 HBA <----> SAS2.0 Expander <------> SAS2.0 Expander <--------> SAS1.0 Drive. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 8597ae8bfe35f5e438b00ba5df852e97ebe1ac23 Author: Bhanu Prakash Gollapudi Date: Fri Jan 28 16:05:37 2011 -0800 [SCSI] libfcoe: Move common code from fcoe to libfcoe module To facilitate LLDDs to reuse the code, skb queue related functions are moved to libfcoe, so that both fcoe and bnx2fc drivers can use them. The common structures fcoe_port, fcoe_percpu_s are moved to libfcoe. fcoe_port will now have an opaque pointer that points to corresponding driver's interface structure. Also, fcoe_start_io and fcoe_fc_crc are moved to libfcoe. As part of this change, fixed fcoe_start_io to return ENOMEM if skb_clone fails. Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 2ca32b4848a865fb088e8c00af0dc194701c373a Author: Tejun Heo Date: Fri Jan 28 16:05:32 2011 -0800 [SCSI] fcoe: use dedicated workqueue instead of system_wq fcoe uses the system_wq to destroy ports and the work items need to be flushed before the driver is unloaded. As the work items free the containing data structure, they can't be flushed directly. The workqueue should be flushed instead. Also, the destruction works can be chained - ie. destruction of a port may lead to destruction of another port where the work item for the former queues the work for the latter. Currently, the depth of chain can be at most two and fcoe_exit() makes sure everything is complete by calling flush_scheduled_work() twice. With commit c8efcc25 (workqueue: allow chained queueing during destruction), destroy_workqueue() can take care of chained works on workqueue destruction. Add and use fcoe_wq instead. Simply destroying fcoe_wq on driver unload takes care of flushing. Signed-off-by: Tejun Heo Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 75a2792df296c77004a72056c76628a1f835bc93 Author: Bhanu Prakash Gollapudi Date: Fri Jan 28 16:05:27 2011 -0800 [SCSI] libfc: introduce LLD event callback This patch enables LLD to listen to rport events and perform LLD specific operations based on the rport event. This patch also stores sp_features and spp_type in rdata for further reference by LLD. Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit acc1a921659561c4ea97eca6e3c2633adecbcd81 Author: Kiran Patil Date: Fri Jan 28 16:05:22 2011 -0800 [SCSI] libfc: Extending lport's roles for target if there is a registered target. Problem: From initaitor machine, when queried role of target (other end of connection), it is "initiator", hence SCSI-ml doesn't send any LUN Inquiry commands. Fix: If there is a registered target for FC_TYPE_FCP, extend lport's params (capability) to be target as well, By default lport params are INITIATOR only. Having this fix, caused initiator to send SCSI LUN inquiry command to target. Signed-off-by: Kiran Patil Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 78a582463c1e3a262aeaf2a291e06a93a7b34212 Author: Yi Zou Date: Fri Jan 28 16:05:16 2011 -0800 [SCSI] fcoe: convert fcoe.ko to become an fcoe transport provider driver Remove the existing sysfs entry points of the fcoe.ko module parameters that are used to create/destroy/enable/disable an FCoE instance, rather, use the newly added fcoe transport code to attach itself as an FCoE transport provider when fcoe.ko gets loaded. There is no functionality change on the logic of fcoe interacts with upper libfc and lower netdev. The fcoe transport only acts as thin layer to provide a unified interface for all fcoe transport providers so all FCoE instances on any network interfaces from all vendors can be managed through the same Open-FCoE.org's user space tool package, which also has full DCB support. Signed-off-by: Yi Zou Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 8ca86f84dd5fc881012b2940ce4eab1fa57680e5 Author: Yi Zou Date: Fri Jan 28 16:05:11 2011 -0800 [SCSI] fcoe: prepare fcoe for using fcoe transport Prepare the fcoe to convert it to use the newly added fcoe transport, making it as the default fcoe transport provider for libfcoe. This patch is to rename some of the variables to avoid any confusing names later as now there are several transports in the same file. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit e01efc33bc4a248b1f9bfb972e156c76125fc914 Author: Yi Zou Date: Fri Jan 28 16:05:06 2011 -0800 [SCSI] libfcoe: include fcoe_transport.c into kernel libfcoe module Now we can include the fcoe_transport.c to the build of the kernel libfcoe module. Move the module information to fcoe_transport, and it will have all the module parameters later for the create/destroy/enable/disable of an FCoE instance. Signed-off-by: Yi Zou Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 0095a9213324a4466c10de98837a27ab1b7e72be Author: Yi Zou Date: Fri Jan 28 16:05:00 2011 -0800 [SCSI] libfcoe: rename libfcoe.c to fcoe_cltr.c for the coming fcoe_transport.c The existing libfcoe.c is mostly for FIP support, rename it to reflect that fact and so we can add fcoe_transport.c to the make file to include both into the libfcoe kernel module. [ Minor modifications by Robert Love converting a few "__attribute__((packed))" modifiers to "__packed" to remove new checkpatch.pl WARNINGS ] Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit fdecf31b7c7b9bb79516344884388f660fd5d5a7 Author: Yi Zou Date: Fri Jan 28 16:04:55 2011 -0800 [SCSI] libfcoe: add implementation to support fcoe transport Add the new fcoe_transport.c file that implements basic fcoe transport interface. Eventually, the sysfs entries to create/destroy/enable/disable an FCoE instance will be coming to the fcoe transport layer, who does a look-up to find the corresponding transport provide and pass the corresponding action over to the identified provider. The fcoe.ko will become the default fcoe transport provider that can support FCoE on any given netdev interfaces, as the Open-FCoE.org's default software FCoE HBA solution. Any vendor specific FCoE HBA driver that is built on top of Open-FCoE's kernel stack of libfc & libfcoe as well as the user land tool of fcoe-utils can easily plug-in and start running FCoE on their network interfaces. The fcoe.ko will be converted to act as the default provider if no vendor specific transport provider is found, as it is always added to the very end of the list of attached transports. Signed-off-by: Yi Zou Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 0ade7d290b6aa8b1626a4077b853c02cd12415c2 Author: Yi Zou Date: Fri Jan 28 16:04:50 2011 -0800 [SCSI] libfcoe: add fcoe_transport structure defines to include/scsi/libfcoe.h add the fcoe_transport struct to the common libfcoe.h header so all fcoe transport provides can use it to attach itself as an fcoe transport. This is the header part, and the next patch will be the transport code itself. Signed-off-by: Yi Zou Signed-off-by: Bhanu Prakash Gollapudi Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 21b7b2f557f4b105a4b7d739671d1ce6b867d3e6 Author: Yi Zou Date: Fri Jan 28 16:04:45 2011 -0800 [SCSI] libfcoe: move logging macros into the local libfcoe.h header file libfcoe kernel module debug macros will used by the fcoe transport code as well when later it gets added. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 6c8cc1c003cee1c4290f5d8c684912d60354056a Author: Kiran Patil Date: Fri Jan 28 16:04:39 2011 -0800 [SCSI] libfc: Enhanced exchange ID selection mechanism and fix related EMA selection logic. Problem: In case of exchange responder case, EMA selection was defaulted to the last EMA from EMA list (lport.ema_list). If exchange ID is selected from offload pool and not setup DDP, resulting into incorrect selection of EMA, and eventually dropping the packet because unable to find exchange. Fix: Enhanced the exchange ID selection (depending upon request type and exchange responder) Made necessary enhancement in EMA selection algorithm. Signed-off-by: Kiran Patil Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 62bdb6455e8326f864ae1b43b4c4db7f630edc1c Author: Joe Eykholt Date: Fri Jan 28 16:04:34 2011 -0800 [SCSI] libfc: export seq_release() for users of seq_assign() Target modules using lport->tt.seq_assign() get a hold on the exchange but have no way of releasing it. Add that. Signed-off-by: Joe Eykholt Signed-off-by: James Bottomley commit 04885b16a1ec86b4670702b99a81805e66bf9f30 Author: Robert Love Date: Fri Jan 28 16:04:29 2011 -0800 [SCSI] libfc: Remove usage of the Scsi_Host's host_lock This patch removes the use of the Scsi_Host's host_lock within fc_queuecommand. It also removes the DEF_SCSI_QCMD usage so that libfc has fully moved on to the new queuecommand interface. Signed-off-by: Robert Love Tested-by: Ross Brattain Reviewed-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 925cedae2b223d44d59a02df1b35902fc8bdd6d2 Author: Joe Eykholt Date: Fri Jan 28 16:04:23 2011 -0800 [SCSI] libfc: use PRLI hook to get parameters when sending outgoing PRLI When sending an outgoing PRLI as an initiator, get the parameters from registered providers so that they all get a chance to decide on roles. The passive provider is called last, and could override the initiator role. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 70d53b046a6221e3ceb3bd8eaa807ef6a1c53762 Author: Joe Eykholt Date: Fri Jan 28 16:04:18 2011 -0800 [SCSI] libfc: add hook to notify providers of local port changes When an SCST provider is registered, it needs to know what local ports are available for configuration as targets. Add a notifier chain that is invoked when any local port that is added or deleted. Maintain a global list of local ports and add an interator function that calls a given function for every existing local port. This is used when first loading a provider. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit baf9fdf076a8976431b5de565aef2b98816caecf Author: Joe Eykholt Date: Fri Jan 28 16:04:13 2011 -0800 [SCSI] libfc: add local port hook for provider session lookup The target provider needs a per-instance lookup table or other way to lookup sessions quickly without going through a linear list or serializing too much. Add a simple void * array indexed by FC-4 type to the fc_lport. Signed-off-by: Joe Eykholt Committed-by: Nicholas A. Bellinger Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 1a5c2d7e5c8ef239804cb08b68363e0cd2f74a3d Author: Joe Eykholt Date: Fri Jan 28 16:04:08 2011 -0800 [SCSI] libfc: add method for setting handler for incoming exchange Add a method for setting handler for incoming exchange. For multi-sequence exchanges, this allows the target driver to add a response handler for handling subsequent sequences, and exchange manager resets. The new function is called fc_seq_set_resp(). Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 96ad846445ae33dcae1805b68752e3d5c840e3ed Author: Joe Eykholt Date: Fri Jan 28 16:04:02 2011 -0800 [SCSI] libfc: add hook for FC-4 provider registration Allow FC-4 provider modules to hook into libfc, mostly for targets. This should allow any FC-4 module to handle PRLI requests and maintain process-association states. Each provider registers its ops with libfc and then will be called for any incoming PRLI for that FC-4 type on any instance. The provider can decide whether to handle that particular instance using any method it likes, such as ACLs or other configuration information. A count is kept of the number of successful PRLIs from the remote port. Providers are called back with an implicit PRLO when the remote port is about to be deleted or has been reset. fc_lport_recv_req() now sends incoming FC-4 requests to FC-4 providers, and there is a built-in provider always registered for handling incoming ELS requests. The call to provider recv() routines uses rcu_read_lock() so that providers aren't removed during the call. That lock is very cheap and shouldn't affect any performance on ELS requests. Providers can rely on the RCU lock to protect a session lookup as well. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 55204909bb687c997d5601e9f24a25cf9e915d78 Author: Randy Dunlap Date: Fri Jan 28 16:03:57 2011 -0800 [SCSI] libfc: fix sparse static and non-ANSI warnings Fix sparse warning for non-ANSI function declaration. Declare workqueue structs as static. Signed-off-by: Randy Dunlap Cc: Robert Love Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 52ee832195b0ae33f12e334e61cf43d1087f24d6 Author: Vasu Dev Date: Fri Jan 28 16:03:52 2011 -0800 [SCSI] fcoe: drop FCoE LOGO in FIP mode Allowing FCoE LOGO followed by CVL in this case prevents FIP login back to the FCF and then keeps lport offline, only FIP LOGO and CLV needs to be processed while in FIP mode, therefore this patch drops FCoE LOGO in FIP mode. Added fcoe_filter_frames() to filter out above mentioned LOGO in fcoe rx path along with other existing filtering in code for bad CRC frames. Adding separate fcoe_filter_frames function helped with better code indentations and if needed then same will allow adding more filters at one place in future. This LOGO drop is added after FCP frames passed up to avoid any additional checks on fast path for this. Signed-off-by: Vasu Dev Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 7287fb9114096503eddfffb7b2ed691c809a6106 Author: Robert Love Date: Fri Jan 28 16:03:47 2011 -0800 [SCSI] fcoe: Fix module reference count for vports vports are not grabbing module references but are releasing them. This causes the module reference count to decrement too many times and it wraps around past 0. The solution is to do a module_put() in fcoe_interface_release() so that the reference is only released when the fcoe_interface is released. There is a one-to-one relationship between the N_Port and the fcoe_interface, so the module reference will only be dropped when the N_Port is destroyed To create symetry in the code this patch moves the try_module_get() call into fcoe_interface_create(). This means that only the N_Port will grab a reference to the module when its corresponding fcoe_interface is created. This patch also makes it so that the fcoe_interface_create() routine encodes any error codes in the fcoe_interface pointer returned. This way its caller, fcoe_create(), can return an accurate error code. Signed-off-by: Robert Love Tested-by: Ross Brattain Signed-off-by: James Bottomley commit 6da92d3463cd60f5b804475f70f659dc07331929 Author: Venkata Siva Vijayendra Bhamidipati Date: Fri Jan 28 16:03:42 2011 -0800 [SCSI] fnic: Bumping up fnic version from 1.4.0.145 to 1.5.0.1. Signed-off-by: Venkata Siva Vijayendra Bhamidipati Signed-off-by: Robert Love Signed-off-by: James Bottomley commit c954f8aed44686569347087a57c75c590ce2782d Author: Venkata Siva Vijayendra Bhamidipati Date: Fri Jan 28 16:03:36 2011 -0800 [SCSI] fnic: fix memory leak Fix memory leak arising due to incorrect freeing of allocated memory for vnic stats when unregistering a vnic. Signed-off-by: Abhijeet Joglekar Signed-off-by: Venkata Siva Vijayendra Bhamidipati Signed-off-by: Robert Love Signed-off-by: James Bottomley commit e4a9a98289606392f2b1b24b4ca4e29154ec4d15 Author: Dan Carpenter Date: Fri Jan 28 16:03:31 2011 -0800 [SCSI] libfc:prevent dereferencing ERR_PTR in fc_tm_done() If we goto out, then it tries to call kfree_skb() on an ERR_PTR which will oops. Just return directly. Signed-off-by: Dan Carpenter Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 28a4af1e43047531ab612564e32ab9969c9dd965 Author: Hillf Danton Date: Fri Jan 28 16:03:26 2011 -0800 [SCSI] libfc: Cleanup return paths in fc_rport_error_retry This patch makes it so that we only have one call to fc_rport_error. This patch does not completely consolidate return statements, there is still one return used when not calling fc_rport_error, but alternative solutions made the code more confusing. [ Patch modified by Robert Love ] [ Patch title and commit message edited by Robert Love to make it more relevant ] Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit fa79dbdbdd166025b5835bddaff152bb57c4440a Author: Hillf Danton Date: Fri Jan 28 16:03:21 2011 -0800 [SCSI] libfc: Return a valid return code in fc_fcp_pkt_abort() Here ticks_left is added to record the result of wait_for_completion_timeout(). [ Patch title and description edited by Robert Love to make it more descriptive ] Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit f56635a8695f6b4fccf546cb2d5cf246d1892a0f Author: Yi Zou Date: Fri Jan 28 16:03:15 2011 -0800 [SCSI] libfc: always initialize the FCoE DDP exchange id for fsp as FC_XID_UNKNOWN The fsp's xfer_ddp is used as indication of the exchange id for the DDPed I/O. We should always initialize it as FC_XID_UNKNOWN for a newly allocated fsp, otherwise the fsp allocated in fc_fcp, i.e., not from queuecommand like LUN RESET that is not doing DDP may still think DDP is setup for it since xid 0 is valid and goes on to call fc_fcp_ddp_done() in fc_fcp_resp() from fc_tm_done(). So, set xfer_ddp as FC_XID_UNKNOWN in fc_fcp_pkt_alloc() now. Also removes the setting of fsp->lp as it's already done when fsp is allocated. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 79775567e0439ca47eb9f501e52c4b713d44cf89 Author: Hannes Reinecke Date: Tue Jan 18 10:13:13 2011 +0100 [SCSI] block: improve detail in I/O error messages Classify severity of I/O errors for target, nexus, and transport errors. Signed-off-by: Mike Snitzer Signed-off-by: Hannes Reinecke Acked-by: Jens Axboe Signed-off-by: James Bottomley commit 751b2a7d623ead9e55f751a6087efeab454b5659 Author: Hannes Reinecke Date: Tue Jan 18 10:13:12 2011 +0100 [SCSI] dm mpath: propagate target errors immediately DM now has more information about the nature of the underlying storage failure. Path failure is avoided if a request failed due to a target error. Instead the target error is immediately passed up the stack. Discard requests that fail due to non-target errors may now be retried. Errors restricted to the path will be retried or returned if no paths are available, irregarding the no_path_retry setting. Signed-off-by: Mike Snitzer Signed-off-by: Hannes Reinecke Acked-by: Alasdair G Kergon Signed-off-by: James Bottomley commit 63583cca745f440167bf27877182dc13e19d4bcf Author: Hannes Reinecke Date: Tue Jan 18 10:13:11 2011 +0100 [SCSI] Add detailed SCSI I/O errors Instead of just passing 'EIO' for any I/O error we should be notifying the upper layers with more details about the cause of this error. Update the possible I/O errors to: - ENOLINK: Link failure between host and target - EIO: Retryable I/O error - EREMOTEIO: Non-retryable I/O error - EBADE: I/O error restricted to the I_T_L nexus 'Retryable' in this context means that an I/O error _might_ be restricted to the I_T_L nexus (vulgo: path), so retrying on another nexus / path might succeed. 'Non-retryable' in general refers to a target failure, so this error will always be generated regardless of the I_T_L nexus it was send on. I/O errors restricted to the I_T_L nexus might be retried on another nexus / path, but they should _not_ be queued if no paths are available. Signed-off-by: Hannes Reinecke Signed-off-by: Mike Snitzer Signed-off-by: James Bottomley commit 7a1e9d829f8bd821466c5ea834ad6f378740d2be Author: Mike Snitzer Date: Tue Jan 25 11:52:17 2011 -0500 [SCSI] scsi_dh_hp_sw: fix deadlock in start_stop_endio The use of blk_execute_rq_nowait() implies __blk_put_request() is needed in start_stop_endio() rather than blk_put_request() -- blk_finish_request() is called with queue lock already held. Signed-off-by: Mike Snitzer Signed-off-by: James Bottomley commit 98cb7e4413d189cd2b54daf993a4667d9788c0bb Author: Bjørn Mork Date: Wed Jan 19 10:01:14 2011 +0100 [SCSI] megaraid_sas: Sanity check user supplied length before passing it to dma_alloc_coherent() The ioc->sgl[i].iov_len value is supplied by the ioctl caller, and can be zero in some cases. Assume that's valid and continue without error. Fixes (multiple individual reports of the same problem for quite a while): http://marc.info/?l=linux-ide&m=128941801715301 http://bugs.debian.org/604627 http://www.mail-archive.com/linux-poweredge@dell.com/msg02575.html megasas: Failed to alloc kernel SGL buffer for IOCTL and [ 69.162538] ------------[ cut here ]------------ [ 69.162806] kernel BUG at /build/buildd/linux-2.6.32/lib/swiotlb.c:368! [ 69.163134] invalid opcode: 0000 [#1] SMP [ 69.163570] last sysfs file: /sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map [ 69.163975] CPU 0 [ 69.164227] Modules linked in: fbcon tileblit font bitblit softcursor vga16fb vgastate ioatdma radeon ttm drm_kms_helper shpchp drm i2c_algo_bit lp parport floppy pata_jmicron megaraid_sas igb dca [ 69.167419] Pid: 1206, comm: smartctl Tainted: G W 2.6.32-25-server #45-Ubuntu X8DTN [ 69.167843] RIP: 0010:[] [] map_single+0x255/0x260 [ 69.168370] RSP: 0018:ffff88081c0ebc58 EFLAGS: 00010246 [ 69.168655] RAX: 000000000003bffc RBX: 00000000ffffffff RCX: 0000000000000002 [ 69.169000] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88001dffe000 [ 69.169346] RBP: ffff88081c0ebcb8 R08: 0000000000000000 R09: ffff880000030840 [ 69.169691] R10: 0000000000100000 R11: 0000000000000000 R12: 0000000000000000 [ 69.170036] R13: 00000000ffffffff R14: 0000000000000001 R15: 0000000000200000 [ 69.170382] FS: 00007fb8de189720(0000) GS:ffff88001de00000(0000) knlGS:0000000000000000 [ 69.170794] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 69.171094] CR2: 00007fb8dd59237c CR3: 000000081a790000 CR4: 00000000000006f0 [ 69.171439] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 69.171784] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 69.172130] Process smartctl (pid: 1206, threadinfo ffff88081c0ea000, task ffff88081a760000) [ 69.194513] Stack: [ 69.205788] 0000000000000034 00000002817e3390 0000000000000000 ffff88081c0ebe00 [ 69.217739] <0> 0000000000000000 000000000003bffc 0000000000000000 0000000000000000 [ 69.241250] <0> 0000000000000000 00000000ffffffff ffff88081c5b4080 ffff88081c0ebe00 [ 69.277310] Call Trace: [ 69.289278] [] swiotlb_alloc_coherent+0xec/0x130 [ 69.301118] [] x86_swiotlb_alloc_coherent+0x61/0x70 [ 69.313045] [] megasas_mgmt_fw_ioctl+0x1ae/0x690 [megaraid_sas] [ 69.336399] [] megasas_mgmt_ioctl_fw+0x198/0x240 [megaraid_sas] [ 69.359346] [] megasas_mgmt_ioctl+0x35/0x50 [megaraid_sas] [ 69.370902] [] vfs_ioctl+0x22/0xa0 [ 69.382322] [] ? alloc_fd+0x10a/0x150 [ 69.393622] [] do_vfs_ioctl+0x81/0x410 [ 69.404696] [] ? do_page_fault+0x153/0x3b0 [ 69.415761] [] sys_ioctl+0x81/0xa0 [ 69.426640] [] system_call_fastpath+0x16/0x1b [ 69.437491] Code: fe ff ff 48 8b 3d 74 38 76 00 41 bf 00 00 20 00 e8 51 f5 d7 ff 83 e0 ff 48 05 ff 07 00 00 48 c1 e8 0b 48 89 45 c8 e9 13 fe ff ff <0f> 0b eb fe 0f 1f 80 00 00 00 00 55 48 89 e5 48 83 ec 20 4c 89 [ 69.478216] RIP [] map_single+0x255/0x260 [ 69.489668] RSP [ 69.500975] ---[ end trace 6a2181b634e2abc7 ]--- Reported-by: Bokhan Artem Reported by: Marc-Christian Petersen Signed-off-by: Bjørn Mork Cc: "Benz, Michael" Signed-off-by: James Bottomley commit 429305e4650c5d3395c21ca183455a3f3e3568af Author: Tejun Heo Date: Mon Jan 24 14:57:29 2011 +0100 [SCSI] pm8001: simplify workqueue usage pm8001 manages its own list of pending works and cancel them on device free. It is unnecessarily complex and has a race condition - the works are canceled but not synced, so the work could still be running during and after the data structures are freed. This patch simplifies workqueue usage. * A driver specific workqueue pm8001_wq is created to serve these work items. * To avoid confusion, the "queue" suffixes are dropped from work items and functions. * Delayed queueing was never used. pm8001_work now uses work_struct instead. * The driver no longer keeps track of pending works. All pm8001_works are queued to pm8001_wq and the workqueue is flushed as necessary. flush_scheduled_work() usage is removed during conversion. Signed-off-by: Tejun Heo Acked-by: Jack Wang Signed-off-by: James Bottomley commit a684b8da35a429a246ec2a91e2742bdff5209709 Author: Tejun Heo Date: Mon Jan 24 14:57:28 2011 +0100 [SCSI] remove flush_scheduled_work() usages Simple conversions to drop flush_scheduled_work() usages in drivers/scsi. More involved ones will be done in separate patches. * NCR5380, megaraid_sas: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync(). * mpt2sas_scsih: drop unnecessary flush_scheduled_work(). * arcmsr_hba, ipr, pmcraid: flush the used work explicitly instead of using flush_scheduled_work(). Signed-off-by: Tejun Heo Signed-off-by: James Bottomley commit 753790e713d80b50b867fa1ed32ec0eb5e82ae8e Author: Russell King Date: Sun Feb 6 15:32:24 2011 +0000 ARM: move cache/processor/fault glue to separate include files This allows the cache/processor/fault glue to be more easily used from assembler code. Tested on Assabet and Tegra 2. Tested-by: Colin Cross Signed-off-by: Russell King commit d5e219c3a2389f31b18e4ca55c33a12adaadf565 Author: hartleys Date: Fri Feb 11 12:14:06 2011 +0000 phy: Remove unneeded depends on PHYLIB Remove unneeded depends on PHYLIB. The config selection is already in an if PHYLIB / endif block. Signed-off-by: H Hartley Sweeten Cc: "David S. Miller" Signed-off-by: David S. Miller commit 57f89bfa21403d902ee176ef988136b75d9ab30b Author: Ben Greear Date: Fri Feb 11 09:35:18 2011 +0000 network: Allow af_packet to transmit +4 bytes for VLAN packets. This allows user-space to send a '1500' MTU VLAN packet on a 1500 MTU ethernet frame. The extra 4 bytes of a VLAN header is not usually charged against the MTU when other parts of the network stack is transmitting vlans... Signed-off-by: Ben Greear Reviewed-by: Eric Dumazet Signed-off-by: David S. Miller commit ab889e6607f6e3d52a76c5a43c8c4ad1d354da36 Merge: dcf96f1 3878f1f Author: David S. Miller Date: Fri Feb 11 21:20:27 2011 -0800 Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge commit dcf96f1ff66f328fecf1e14437ac73db71b08c03 Author: Ajit Khaparde Date: Fri Feb 11 13:39:30 2011 +0000 be2net: restrict WOL to PFs only. WOL is not supported for Vrtual Functions. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 9b037f3811acb0e613fae0fdf74e717f259b5b51 Author: Ajit Khaparde Date: Fri Feb 11 13:38:29 2011 +0000 be2net: detect a UE even when a interface is down. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 7acc2087fa204461871eccfdc913eef15ffd5c8f Author: Ajit Khaparde Date: Fri Feb 11 13:38:17 2011 +0000 be2net: gracefully handle situations when UE is detected Avoid accessing the hardware when UE is detected. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit a4ca055fc3124e1b6aee6b491a157cd242ee5226 Author: Ajit Khaparde Date: Fri Feb 11 13:38:03 2011 +0000 be2net: fix be_suspend/resume/shutdown > call pci msix disable in be_suspend > call pci msix enable in be_resume > stop worker thread in be_suspend > start worker thread in be_resume > stop worker thread in be_shutdown Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit fae21a4da5767db0c0b481360780d6e8c7f906ae Author: Ajit Khaparde Date: Fri Feb 11 13:37:42 2011 +0000 be2net: pass proper hdr_size while flashing redboot. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 60964dd7087fa252c16022a7590e385294c5472a Author: Ajit Khaparde Date: Fri Feb 11 13:37:25 2011 +0000 be2net: Fix broken priority setting when vlan tagging is enabled. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit a4b4dfab6ca808a5d1073cdfb7f39e8ce59f71e2 Author: Ajit Khaparde Date: Fri Feb 11 13:36:57 2011 +0000 be2net: Allow VFs to call be_cmd_reset_function. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit f8617e0860f2b23797431b5ec3a46668eb0f7925 Author: Ajit Khaparde Date: Fri Feb 11 13:36:37 2011 +0000 be2net: pass domain numbers for pmac_add/del functions be_cmd_pmac_add/del functions need to pass domain number to the firmware. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 7a2414a50b071d84dae8fbca51d10009e07e535f Author: Ajit Khaparde Date: Fri Feb 11 13:36:18 2011 +0000 be2net: For the VF MAC, use the OUI from current MAC address Currently we are always using the Emulex OUI for a VF MAC address while generating MAC for a VF. Use OUI from current MAC instead. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 7ab8b0b432cf5110624858e23ef264982e542f17 Author: Ajit Khaparde Date: Fri Feb 11 13:35:56 2011 +0000 be2net: Cleanup the VF interface handles The PF needs to cleanup all the interface handles that it created for the VFs. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit e63193652bfbea40e33b3a4cf4d338f9c82fbc05 Author: Ajit Khaparde Date: Fri Feb 11 13:35:41 2011 +0000 be2net: call be_vf_eth_addr_config() after register_netdev This is to avoid the completion processing for be_vf_eth_addr_config to consume the link status notification before netdev_register. Otherwise this causes the PF miss its first link status update. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit c99ac3e7e47ffb9e504d9b08f608e9d7519a6b4f Author: Ajit Khaparde Date: Fri Feb 11 13:35:02 2011 +0000 be2net: Initialize and cleanup sriov resources only if pci_enable_sriov has succeeded. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 658681f72589b95b7ab340b4f644783d263b5200 Author: Ajit Khaparde Date: Fri Feb 11 13:34:46 2011 +0000 be2net: Use domain id when be_cmd_if_destroy is called. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 6bff57a7a6b97f2bf98cb96e56db1ec02a29d135 Author: Ajit Khaparde Date: Fri Feb 11 13:33:02 2011 +0000 be2net: endianness fix in be_cmd_set_qos(). Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 856c40125acf63f93aab5bc18ff9e627beeb0a3d Author: Ajit Khaparde Date: Fri Feb 11 13:32:32 2011 +0000 be2net: While configuring QOS for VF, pass proper domain id While configuring QOS for VFs, the VF number should be translated to domain number correctly. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 58bb4bd0e0b1ab560a7320a760141ba52db68791 Merge: dd68153 1b1c0a4 Author: David S. Miller Date: Fri Feb 11 21:09:04 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit 40262a71536d0b4a7486b279fa39463cfffabcc2 Merge: 3e86858 0849327 Author: Ingo Molnar Date: Sat Feb 12 02:24:52 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 3e86858133c632060b290985837a11dbe2e0cc0e Merge: d5e3d74 100b33c Author: Ingo Molnar Date: Sat Feb 12 02:24:23 2011 +0100 Merge commit 'v2.6.38-rc4' into perf/core Merge reason: pick up the latest fixes. Signed-off-by: Ingo Molnar commit 3878f1f075470990d9c2418b53f31694e774f743 Author: Linus Lüssing Date: Mon Feb 7 00:14:40 2011 +0000 batman-adv: Disallow originator addressing within mesh layer For a host in the mesh network, the batman layer should be transparent. However, we had one exception, data packets within the mesh network which have the same destination as a originator are being routed to that node, although there is no host that node's bat0 interface and therefore gets dropped anyway. This commit removes this exception. Signed-off-by: Linus Lüssing Signed-off-by: Sven Eckelmann commit ee1e884194eb19574898ce6d5eaef5e8afdec7f2 Author: Linus Lüssing Date: Sun Feb 6 23:08:37 2011 +0000 batman-adv: Remove duplicate types.h inclusions types.h is included by main.h, which is included at the beginning of any other c-file anyway. Therefore this commit removes those duplicate inclussions. Signed-off-by: Linus Lüssing Signed-off-by: Sven Eckelmann commit 14062064167ecdda4a17ec9190740c189223550a Author: Marek Lindner Date: Tue Feb 8 12:43:54 2011 +0000 batman-adv: Split combined variable declarations Multiple variable declarations in a single statements over multiple lines can be split into multiple variable declarations without changing the actual behavior. Signed-off-by: Marek Lindner Signed-off-by: Sven Eckelmann commit 868baf07b1a259f5f3803c1dc2777b6c358f83cf Author: Steven Rostedt Date: Thu Feb 10 21:26:13 2011 -0500 ftrace: Fix memory leak with function graph and cpu hotplug When the fuction graph tracer starts, it needs to make a special stack for each task to save the real return values of the tasks. All running tasks have this stack created, as well as any new tasks. On CPU hot plug, the new idle task will allocate a stack as well when init_idle() is called. The problem is that cpu hotplug does not create a new idle_task. Instead it uses the idle task that existed when the cpu went down. ftrace_graph_init_task() will add a new ret_stack to the task that is given to it. Because a clone will make the task have a stack of its parent it does not check if the task's ret_stack is already NULL or not. When the CPU hotplug code starts a CPU up again, it will allocate a new stack even though one already existed for it. The solution is to treat the idle_task specially. In fact, the function_graph code already does, just not at init_idle(). Instead of using the ftrace_graph_init_task() for the idle task, which that function expects the task to be a clone, have a separate ftrace_graph_init_idle_task(). Also, we will create a per_cpu ret_stack that is used by the idle task. When we call ftrace_graph_init_idle_task() it will check if the idle task's ret_stack is NULL, if it is, then it will assign it the per_cpu ret_stack. Reported-by: Benjamin Herrenschmidt Suggested-by: Peter Zijlstra Cc: Stable Tree Signed-off-by: Steven Rostedt commit a3dc5e881a8a5199bf371fdd4530cfa18280ca83 Author: Larry Finger Date: Fri Feb 11 14:27:58 2011 -0600 rtlwifi: rtl8192ce: Rework rtl8192ce/phy.c Make the phy.c codes for rtl8192ce and rtl8192cu be as alike as possible. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 25b2bc30865e3ca1a9a2116788bb2e82be5b1a99 Author: Larry Finger Date: Fri Feb 11 14:34:03 2011 -0600 rtlwifi: rtl8192ce: Refactor rtl8192ce/fw Make rtlwifi/rtl8192ce/fw.{h,c} match what will be needed for rtlwifi/rtl8192cu.{h,c}. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 8c96fcf7212bd58f28cf7e96b13b1e2161637f3b Author: Larry Finger Date: Fri Feb 11 14:33:58 2011 -0600 rtlwifi: rtl8192ce: Refactor rtl8192ce/dm To reuse as much code as possible when adding additional drivers to the rtlwifi tree, the common parts of various routines are moved to drivers/net/wireless/rtlwifi. This patch does that for the version of dm.{h,c} used by rtl8192ce. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 2ca20f79e0d895489ae2f79fa321077e5ee2981d Author: George Date: Fri Feb 11 14:27:49 2011 -0600 rtlwifi: Add usb driver Signed-off-by: Larry Finger Signed-off-by: George Signed-off-by: John W. Linville commit 62e63975f47fcc0ebcaca04669098fe3ca7b20a2 Author: Larry Finger Date: Fri Feb 11 14:27:46 2011 -0600 rtlwifi: Modify core routines The rtlwifi core needs some changes before inclusion of a driver for the RTL8192CU USB device. Signed-off-by: Larry Finger Signed-off-by: Signed-off-by: Signed-off-by: John W. Linville commit 47a05eca72991039e788b25232061f9c9df9ec23 Author: Jesse Barnes Date: Mon Feb 7 13:46:40 2011 -0800 drm/i915: disable PCH ports if needed when disabling a CRTC Disable any PCH ports associated with a pipe when disabling it. This should prevent transcoder disable failures due to ports still being on. Signed-off-by: Jesse Barnes [ickle: introduce *_PIPE_ENABLED() macro] Signed-off-by: Chris Wilson commit bed636abeaa3d8e8279e95380cb10ecb20d1b276 Author: Chris Wilson Date: Fri Feb 11 20:31:19 2011 +0000 drm/i915: i915_mutex_interruptible() returns -EINTR ... so we handle that for i915_gem_fault() in the same manner as ERESTARTSYS, or we send a SIGBUS to the faulting application. Signed-off-by: Chris Wilson commit caebbb7a4ac3e31b259954b757b15b8f0ac708d5 Author: Wey-Yi Guy Date: Sun Feb 6 11:29:42 2011 -0800 iwlagn: handle bt defer work in 2000 series For 2000 series, need to handle bt traffic changes when receive notification from uCode Signed-off-by: Wey-Yi Guy commit c4197c6298750d308fc819c0525902f49ab920fb Author: Wey-Yi Guy Date: Sun Feb 6 08:56:35 2011 -0800 iwlagn: donot process bt update when bt coex disable If bt coex is disabled, do not process any bt related information from uCode even received. Signed-off-by: Wey-Yi Guy commit 44b46c3ef805793ab3a7730dc71c72d0f258ea8e Author: Ian Campbell Date: Fri Feb 11 16:37:41 2011 +0000 xen: annotate functions which only call into __init at start of day Both xen_hvm_init_shared_info and xen_build_mfn_list_list can be called at resume time as well as at start of day but only reference __init functions (extend_brk) at start of day. Hence annotate with __ref. WARNING: arch/x86/built-in.o(.text+0x4f1): Section mismatch in reference from the function xen_hvm_init_shared_info() to the function .init.text:extend_brk() The function xen_hvm_init_shared_info() references the function __init extend_brk(). This is often because xen_hvm_init_shared_info lacks a __init annotation or the annotation of extend_brk is wrong. xen_hvm_init_shared_info calls extend_brk() iff !shared_info_page and initialises shared_info_page with the result. This happens at start of day only. WARNING: arch/x86/built-in.o(.text+0x599b): Section mismatch in reference from the function xen_build_mfn_list_list() to the function .init.text:extend_brk() The function xen_build_mfn_list_list() references the function __init extend_brk(). This is often because xen_build_mfn_list_list lacks a __init annotation or the annotation of extend_brk is wrong. (this warning occurs multiple times) xen_build_mfn_list_list only calls extend_brk() at boot time, while building the initial mfn list list Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 6b08cfebd3bd346d8a2fd68a2265fc7736849802 Author: Ian Campbell Date: Fri Feb 11 15:23:58 2011 +0000 xen p2m: annotate variable which appears unused CC arch/x86/xen/p2m.o arch/x86/xen/p2m.c: In function 'm2p_remove_override': arch/x86/xen/p2m.c:460: warning: 'address' may be used uninitialized in this function arch/x86/xen/p2m.c: In function 'm2p_add_override': arch/x86/xen/p2m.c:426: warning: 'address' may be used uninitialized in this function In actual fact address is inialised in one "if (!PageHighMem(page))" statement and used in a second and so is always initialised before use. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit b052181a985592f81767f631f9f42accb4b436cd Author: Ian Campbell Date: Fri Feb 11 15:23:56 2011 +0000 xen: events: mark cpu_evtchn_mask_p as __refdata This variable starts out pointing at init_evtchn_mask which is marked __initdata but is set to point to a non-init data region in xen_init_IRQ which is itself an __init function so this is safe. Signed-off-by: Ian Campbell Tested-and-acked-by: Andrew Jones Signed-off-by: Konrad Rzeszutek Wilk commit dd68153def6b890a23288776cbd5bd2bad223a3f Author: Rafael J. Wysocki Date: Thu Feb 10 06:55:19 2011 +0000 atl1: Do not use legacy PCI power management The atl1 driver uses the legacy PCI power management, so it has to do some PCI-specific things in its ->suspend() and ->resume() callbacks, which isn't necessary and should better be done by the PCI subsystem-level power management code. Convert atl1 to the new PCI power management framework and make it let the PCI subsystem take care of all the PCI-specific aspects of device handling during system power transitions. Tested-by: Thomas Fjellstrom Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit 0303adeee3d6740cd78a71c0f40946b4886ceaa3 Author: Rafael J. Wysocki Date: Thu Feb 10 06:54:04 2011 +0000 atl1c: Do not call device_init_wakeup() in atl1c_probe() The atl1c driver shouldn't call device_init_wakeup() in its probe routine with the second argument equal to 1, because for PCI devices the wakeup capability setting is initialized as appropriate by the PCI subsystem. Remove the potentially harmful call. Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit 43067ed8aecac4410a0a629e504629ebece35206 Author: Rafael J. Wysocki Date: Thu Feb 10 06:53:09 2011 +0000 tg3: Avoid setting power.can_wakeup for devices that cannot wake up The tg3 driver uses device_init_wakeup() in such a way that the device's power.can_wakeup flag may be set even though the PCI subsystem cleared it before, in which case the device cannot wake up the system from sleep states. Modify the driver to only change the power.can_wakeup flag if the device is not capable of generating wakeup signals. Signed-off-by: Rafael J. Wysocki Acked-by: Matt Carlson Signed-off-by: David S. Miller commit 124c13b9a34267bfae9c1bb0bdf4a8a6c1cc1df1 Author: Julien Boibessot Date: Fri Feb 11 15:15:30 2011 +0100 i.MX51 iomux: Fixes MX51_PAD_UART2_TXD__UART2_TXD & MX51_PAD_USBH1_DATA2__UART2_TXD declarations Fixes 2 small regressions of recent iomux changes: - current MX51_PAD_UART2_TXD__UART2_TXD declaration overwrites IOMUXC_UART2_IPP_UART_RXD_MUX_SELECT_INPUT register (0x09ec) and prevent UART2 Rx from working properly. (Tested on my custom i.MX51 board where UART2 is used as console) - current MX51_PAD_USBH1_DATA2__UART2_TXD declaration also has the same problem. (Not tested) Signed-off-by: Julien Boibessot Signed-off-by: Sascha Hauer commit 4e43d9fad1c0984e167ab14bd8148289acd61b9c Author: Uwe Kleine-König Date: Fri Feb 11 10:21:09 2011 +0100 ARM: mx3/mx31ads: fix comments of irq callbacks The arguments to these callbacks were changed in e981a30 (ARM: mx3: irq_data conversion.) but the comments were not adapted. Cc: Lennert Buytenhek Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit a0c859c593827c0ff488e05909e9901ecd10159f Author: Uwe Kleine-König Date: Fri Feb 11 10:21:08 2011 +0100 ARM: mx3: remove some useless comments Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit e134fb2b40ca7e2d96ba460b0c844c6a9fa489c3 Author: Uwe Kleine-König Date: Fri Feb 11 10:23:19 2011 +0100 ARM: mx3+mx5: rename mxc_board_init to ${machine}_init mxc_board_init is too generic to be useful. Additionally change some mxc_timer to ${machine}_timer, too. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit d9f51b51db2064c9049bf7924318fd8c6ed852cb Author: Bala Shanmugam Date: Fri Feb 11 15:38:53 2011 +0530 Bluetooth: Add firmware support for Atheros 3012 Blacklisted AR3012 PID in btusb and added the same in ath3k to load patch and sysconfig files. Signed-off-by: Bala Shanmugam Signed-off-by: Gustavo F. Padovan commit e3fb592b15602196d38b225dc78aab8d631a5f89 Author: Vasiliy Kulikov Date: Thu Feb 10 20:59:42 2011 +0300 Bluetooth: l2cap: fix 1 byte infoleak to userspace Structure l2cap_options has one padding byte between max_tx and txwin_size fields. This byte in "opts" is copied to userspace uninitialized. Signed-off-by: Vasiliy Kulikov Signed-off-by: Gustavo F. Padovan commit 44bd4de9c2270b22c3c898310102bc6be9ed2978 Author: Stefan Berger Date: Fri Feb 11 18:00:07 2011 +0100 netfilter: xt_connlimit: connlimit-above early loop termination The patch below introduces an early termination of the loop that is counting matches. It terminates once the counter has exceeded the threshold provided by the user. There's no point in continuing the loop afterwards and looking at other entries. It plays together with the following code further below: return (connections > info->limit) ^ info->inverse; where connections is the result of the counted connection, which in turn is the matches variable in the loop. So once -> matches = info->limit + 1 alias -> matches > info->limit alias -> matches > threshold we can terminate the loop. Signed-off-by: Stefan Berger Signed-off-by: Patrick McHardy commit 1b1c0a489c1dcc1fa640c13404ca69e7beae07d9 Author: Atita Shirwaikar Date: Wed Jan 5 02:00:55 2011 +0000 ixgbe: Adding 100MB FULL support in ethtool Current driver does not show 100MB support in ethtool. Adding support for the same. Signed-off-by: Atita Shirwaikar Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 8fecce62b512c1d50174e03367d6f384dd4ceb80 Author: Don Skidmore Date: Fri Jan 28 02:28:36 2011 +0000 ixgbe: cleanup ixgbe_init_mbx_params_pf namespace issue The function ixgbe_init_mbx_params_pf isn't used unless CONFIG_PCI_IOV is defined. This is causing namespace warnings. So I wrapped its definition in CONFIG_PCI_IOV too. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 32f754667e66870773e40116687b6849963152f5 Author: Don Skidmore Date: Fri Jan 28 02:28:31 2011 +0000 ixgbe: cleanup namespace complaint by removing little used function We had a support function that just walked a few pointers to get from the ixgbe_hw struct to the netdev pointer. This was causing a namespace warning so I removed it and just reference the pointers directly. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 3b2ee94300277220452332d2ebadf5b5699947b5 Author: Don Skidmore Date: Fri Jan 28 02:28:26 2011 +0000 ixgbe: fix namespace issue with ixgbe_dcb_txq_to_tc We didn't need the prototype and it was causing namespace complaints so I made it static. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 5977deaa6dde87dc6557570cb1088537e55b9646 Author: John Fastabend Date: Wed Jan 5 04:48:45 2011 +0000 ixgbe: DCB, use hardware independent routines This consolidates hardware specifics to ixgbe_dcb.c this simplifies code that was previously branching based on hardware type. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit d37e1d0eba2e508b8ac499497db216c67df65c3c Author: John Fastabend Date: Fri Jan 7 15:30:46 2011 +0000 ixgbe: DCB, remove RESET bit it is no longer needed This removes the RESET bit previously used to force a device reset when DCB bandwidth configurations were changed. This can now be done dynamically without a reset so the bit is no longer needed. The only remaining operations that force a device reset are DCB enable/disable and FCoE application priority changes. DCB enable/disable is a hardware requirement. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit d43f5c21d6bab7f58cb6723a57a66883cee0a905 Author: John Fastabend Date: Sat Jan 22 06:07:05 2011 +0000 ixgbe: DCB, do not reset on CEE pg changes The 82599 and 82598 devices do not require hardware resets to configure CEE pg settings. This patch changes DCB configuration to set the CEE pg values directly from the dcbnl ops routine. This reduces the number of resets seen on the wire and allows LLDP to reach a steady state faster. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit d033d526a465c4bb8a499a0b5df65b3e7cf4da6f Author: John Fastabend Date: Thu Feb 10 14:40:01 2011 +0000 ixgbe: DCB, implement 802.1Qaz routines Implements 802.1Qaz support for ixgbe driver. Additionally, this adds IEEE_8021QAZ_TSA_{} defines to dcbnl.h this is to avoid having to use cryptic numeric codes for the TSA type. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 55320cb58baebd1795ec92f4550a1e8b38bf9ddf Author: John Fastabend Date: Wed Jan 5 04:47:43 2011 +0000 ixgbe: DCB, abstract out dcb_config from DCB hardware configuration Currently the routines that configure the HW for DCB require a ixgbe_dcb_config structure. This structure was designed to support the CEE standard and does not match the IEEE standard well. This patch changes the HW routines in ixgbe_dcb_8259x.{ch} to use raw pfc and bandwidth values. This requires some parsing of the DCB configuration but makes the HW routines independent of the data structure that contains the DCB configuration. The primary advantage to doing this is we can do HW setup directly from the 802.1Qaz ops without having to arbitrarily encapsulate this data into the CEE structure. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 39a7e587ec76db9f157fce653235b20f5283b003 Author: John Fastabend Date: Wed Jan 5 04:47:38 2011 +0000 ixgbe: DCB, remove round robin mode on 82598 devices Remove round robin configuration code for 82598 parts it is not settable and is always false. If we need/want this in the future we can add it back properly. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 53bb9f80b3be855a369a8a580621cda8e3bbaae2 Author: John Fastabend Date: Tue Feb 1 02:10:20 2011 +0000 ixgbe: DCB, only reprogram HW if the FCoE priority is changed If the FCoE priority is not changing do not set the RESET and APP_UPCHG bits. This causes unneeded HW resets and which can cause unneeded LLDP frames and negotiations. The current check is not sufficient because the FCoE priority can change twice during a negotiation which results in the bits being set. This occurs when the switch changes the priority or when the link is reset with switches that do not include the APP priority until after PFC has been negotiated. This results in set_app being called with the local APP priority. Then the negotiation completes and set_app is called again with the peer APP priority. The check fails so the device is reset and the above occurs again resulting in an endless loop of resets. By only resetting the device if the APP priority has really changed we short circuit the loop. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 6b78bb1d46cfae6502826ec31a6e9f7222ab3cb4 Author: Carolyn Wyborny Date: Thu Jan 20 06:40:45 2011 +0000 igb: Enable PF side of SR-IOV support for i350 devices This patch adds full support for SR-IOV by enabling the PF side. VF side has already been committed. Signed-off-by: Carolyn Wyborny Signed-off-by: Jeff Kirsher commit 5962bc21ceaaba81e04fa1bb5671c65251805d3e Author: Bruce Allan Date: Thu Jan 20 06:58:07 2011 +0000 e1000e: return appropriate errors for 'ethtool -r' ...when invoked while interface is not up or when auto-negotiation is disabled as done by other drivers. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 5c1bda0aa32e4614c32a45ce5662ed6914bae38a Author: Bruce Allan Date: Wed Jan 19 04:23:39 2011 +0000 e1000e: use correct pointer when memcpy'ing a 2-dimensional array *e1000_gstrings_test is not the same size as e1000_gstrings_test. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 79f5e840143703b258717aab12647018320f4a5f Author: Bruce Allan Date: Wed Jan 19 04:20:59 2011 +0000 e1000e: replace unbounded sprintf with snprintf Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 21bd6d37cf23e643020bf28b41844ff0040c9393 Author: Jamie Iles Date: Fri Jan 21 13:21:10 2011 +0100 ARM: 6629/2: aaec2000: remove support for mach-aaec2000 mach-aaec2000 is no longer actively maintained and is only receiving fixups to remain building with other kernel updates. Cc: Bellido Nicolas Signed-off-by: Jamie Iles Signed-off-by: Russell King commit a23ce6da9677d245aa0aadc99f4197030350ab54 Author: Harry Wei Date: Fri Feb 11 16:52:20 2011 +0100 MAINTAINERS: fix sorting Signed-off-by: Harry Wei Signed-off-by: Jiri Kosina commit ced649ea3991b1eddb484a59a8558d3d07db69bc Author: Wolfram Sang Date: Mon Jan 31 22:21:46 2011 +0100 MAINTAINERS: add second list for IRDA The irda-users-list is currently almost dead and subscribers-only. Adding netdev increases the audience which might help to not overlook a bugreport again. Signed-off-by: Wolfram Sang Acked-by: Samuel Ortiz Signed-off-by: Jiri Kosina commit 45e8234cad754f661153314ea536d26751d02834 Author: Paul Bolle Date: Tue Feb 8 23:27:36 2011 +0100 x86: Fix printk typo WARING Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina commit 87889e158f59bbe8d40e88cf9de76e7d7f266498 Author: Paul Bolle Date: Sun Feb 6 21:00:41 2011 +0100 Documentation: default_message_level is a typo It's default_message_loglevel, not default_message_level. Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina commit 0849327d13a0bd7f6512b7c21f4b3e79efb2076d Author: Arnaldo Carvalho de Melo Date: Fri Feb 11 12:09:54 2011 -0200 perf report: Fix initializion of annotate symbol priv area We only allocate it when in TUI mode. In --stdio mode unconditionally initializing this area leads to memory corruption. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 0ff1731a1ae51e8e48cd559d70db536281c47f8e Author: Alan Ott Date: Tue Jan 18 03:04:40 2011 -0500 HID: bt: Add support for hidraw HIDIOCGFEATURE and HIDIOCSFEATURE This patch adds support or getting and setting feature reports for bluetooth HID devices from HIDRAW. Signed-off-by: Alan Ott Acked-by: Gustavo F. Padovan Signed-off-by: Jiri Kosina commit b4dbde9da8ece42bbe4c70c26bac3b28dd6a3ddb Author: Alan Ott Date: Tue Jan 18 03:04:39 2011 -0500 HID: Add Support for Setting and Getting Feature Reports from hidraw Per the HID Specification, Feature reports must be sent and received on the Configuration endpoint (EP 0) through the Set_Report/Get_Report interfaces. This patch adds two ioctls to hidraw to set and get feature reports to and from the device. Modifications were made to hidraw and usbhid. New hidraw ioctls: HIDIOCSFEATURE - Perform a Set_Report transfer of a Feature report. HIDIOCGFEATURE - Perform a Get_Report transfer of a Feature report. Signed-off-by: Alan Ott Signed-off-by: Antonio Ospite Signed-off-by: Jiri Kosina commit 0825411ade21a39ac63b3e011d092b1f95b5f3f5 Author: Alan Ott Date: Tue Jan 18 03:04:38 2011 -0500 HID: bt: Wait for ACK on Sent Reports Wait for an ACK from the device before returning from hidp_output_raw_report(). This way, failures can be returned to the user application. Also, it prevents ACK/NAK packets from an output packet from being confused with ACK/NAK packets from an input request packet. Signed-off-by: Alan Ott Acked-by: Gustavo F. Padovan Signed-off-by: Jiri Kosina commit 0f69dca20f77dc374b67e17e10b30cec37e778c4 Author: Alan Ott Date: Tue Jan 18 03:04:37 2011 -0500 HID: bt: Move hid_add_device() call to after hidp_session() has started. Move the call to hid_add_device() (which calls a device's probe() function) to after the kernel_thread() call which starts the hidp_session() thread. This ensures the Bluetooth receive socket is fully running by the time a device's probe() function is called. This way, a device can communicate (send and receive) with the Bluetooth device from its probe() function. Signed-off-by: Alan Ott Acked-by: Gustavo F. Padovan Signed-off-by: Jiri Kosina commit 7c940c18c57e45910f7dd9a4011c4658cacba4b6 Merge: d5e3d74 401b8e1 Author: Arnaldo Carvalho de Melo Date: Fri Feb 11 11:45:54 2011 -0200 Merge remote branch 'acme/perf/urgent' into perf/core Fixups due to rename of event_t routines from event__ to perf_event__ done in perf/core. Conflicts: tools/perf/builtin-record.c tools/perf/builtin-top.c tools/perf/util/event.c tools/perf/util/event.h Signed-off-by: Arnaldo Carvalho de Melo commit 292ec42af7c6361435fe9df50cd59ec76f6741c6 Author: Russell King Date: Fri Feb 4 10:36:39 2011 +0000 ARM: pm: add function to set WFI low-power mode for SMP CPUs Add a function to set the SCU low-power mode for SMP CPUs. This centralizes this functionality rather than having to expose the SCU register definitions to each platform. Signed-off-by: Russell King commit 2b203dbbcbac731b07bd0e27c3eda26a26aecb72 Author: Takashi Iwai Date: Fri Feb 11 12:17:30 2011 +0100 ALSA: hda - Avoid cast with union data for HDMI audio infoframe Signed-off-by: Takashi Iwai commit 535787b6ae081171a5e7dbf0158ef9fa56d59dc8 Author: Jarkko Nikula Date: Thu Feb 10 17:22:23 2011 +0200 ASoC: Allow use sleeping gpio in soc-jack It is safe to use sleeping gpio in snd_soc_jack_gpio_detect as it is not called from interrupt context. This avoids WARN_ON from __gpio_get_value if sleeping gpio is registered for jack. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7ae7434086f5b106021276e88b8ef49debf30aa8 Author: Vinod Koul Date: Thu Feb 10 12:58:01 2011 +0530 ASoC: mid-x86: Use the soc-jack apis for jack type detection This patch modifies the mfld_machine to use the new jack apis for adding the voltage zones for jack type detection. It also modifed TI sn95031 codec driver to use these new apis Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4a5aa6e9ea670cf8de39ae0b87010fce41a6dd73 Merge: b4d06f4 8e6bfb9 Author: Mark Brown Date: Fri Feb 11 11:14:20 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit b4d06f456dcf956761e2c927e62b03861f07dbbf Author: Mark Brown Date: Thu Feb 10 14:20:49 2011 +0000 ASoC: Use explicit sequence for WM8903 bias off This makes no real difference compared to the write sequencer sequence that was previously used but can run without a clock being provided. Also remove the write sequencer support code as this was the last use of it. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 22f226dd1496a0fa470e64a66e2da474f34eebf8 Author: Mark Brown Date: Thu Feb 10 14:01:38 2011 +0000 ASoC: Don't use write sequencer to power up WM8903 The write sequencer sequencer sequence takes longer than is desirable as it brings up a full playback path which is not required at this point. Open coding the sequence cuts the startup time by two thirds. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 66daaa59d5f0310238de183918e13062428fb59f Author: Mark Brown Date: Thu Feb 10 13:32:58 2011 +0000 ASoC: Convert WM8903 bias management to use snd_soc_update_bits() Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit bfddc1c325d1e092d9fb1b5b03a05b818f82d35f Author: Russell King Date: Sun Aug 1 11:06:59 2010 +0100 VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var() Signed-off-by: Russell King commit ef299dfc2d906770103f058795a26e6acfa68ae0 Author: Russell King Date: Sun Aug 1 10:22:58 2010 +0100 VIDEO: cyberpro: remove useless function extreg pointers Sub-drivers can call these functions directly, there's no need for this kind of indirection. Signed-off-by: Russell King commit 24d6e5cb191189531396870402bf276aacf01598 Author: Russell King Date: Sun Aug 1 10:18:29 2010 +0100 VIDEO: cyberpro: update handling of device structures Provide the framebuffer device with its correct parent (the PCI device for PCI connected cards.) Also, use this struct device to pass to sub-drivers rather than the pci_dev structure, which is really what they want. Also propagate the assigned IRQ, which they were getting direct from the PCI device structure. Signed-off-by: Russell King commit b7ca01a9b20e3fdd11745227905e9ad8a99e0123 Author: Russell King Date: Mon Aug 2 09:57:07 2010 +0100 VIDEO: cyberpro: add support for video capture I2C Signed-off-by: Russell King commit 052a7f5c496b7d2966edea0f576ec39f41703992 Author: Russell King Date: Fri Jan 28 21:23:56 2011 +0000 VIDEO: cyberpro: make 'reg_b0_lock' always present Rather than conditionally compiling out reg_b0_lock, always keep it available, and always take it when changing the PLL rates. Signed-off-by: Russell King commit e5dedf8d561fb309ba37003546025300678da549 Author: Ondrej Zary Date: Wed Aug 11 21:48:03 2010 +0200 VIDEO: cyberpro: add I2C support Add I2C support for the DDC bus to cyber2000fb driver. This is only bus support, driver does not use EDID. Tested on two different CyberPro 2000 cards with i2cdetect and decode-edid. Signed-off-by: Ondrej Zary [removed i2c-id.h include - rmk] Signed-off-by: Russell King commit c186794dbb466b45cf40f942f2d09d6d5b4b0e42 Author: Mike Snitzer Date: Fri Feb 11 11:08:00 2011 +0100 block: share request flush fields with elevator_private Flush requests are never put on the IO scheduler. Convert request structure's elevator_private* into an array and have the flush fields share a union with it. Reclaim the space lost in 'struct request' by moving 'completion_data' back in the union with 'rb_node'. Signed-off-by: Mike Snitzer Acked-by: Vivek Goyal Acked-by: Tejun Heo Signed-off-by: Jens Axboe commit 9d5a4e946ce5352f19400b6370f4cd8e72806278 Author: Mike Snitzer Date: Fri Feb 11 11:05:46 2011 +0100 block: skip elevator data initialization for flush requests Skip elevator initialization for flush requests by passing priv=0 to blk_alloc_request() in get_request(). As such elv_set_request() is never called for flush requests. Signed-off-by: Mike Snitzer Signed-off-by: Jens Axboe commit 4bd597b633ae630e09d58957bd99870eac35fcb4 Author: Sascha Hauer Date: Mon Jan 3 11:30:28 2011 +0100 ARM i.MX ehci: do ehci init in board specific functions The mxc-ehci driver calls SoC specific phy initialization right after calling board specific initialization. To offer greater flexibility for boards to setup the phy and to get rid of some unnecessary flags in platform data this patch lets the boards call the SoC specific phy initialization and remove it from the driver. Signed-off-by: Sascha Hauer commit cb07625d1f84fb48e6849cb530762ffcc6f8e458 Author: Sascha Hauer Date: Mon Jan 3 10:33:01 2011 +0100 ARM i.MX ehci: factor out soc specific functions Currently we have a mxc_initialize_usb_hw which is called on every i.MX SoC. This function dispatches the different SoC types, which is quite ugly. This patch moves the SoC specific USB initialization to their correspondive mach directories. Signed-off-by: Sascha Hauer commit f19693a17c6705e197eb24d4618060eaac1b535c Merge: 23b120c 100b33c Author: Sascha Hauer Date: Fri Feb 11 08:32:18 2011 +0100 Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer commit 2866d956fe0ad8fc8d8a7c54104ccc879b49406d Author: Matt Carlson Date: Thu Feb 10 20:06:46 2011 -0800 tg3: Expand 5719 workaround As a precautionary measure, expand the fix submitted in commit 4d163b75e979833979cc401ae433cb1d7743d57e entitled "tg3: Fix 5719 A0 tx completion bug" to apply to all 5719 revisions. Signed-off-by: Matt Carlson Signed-off-by: David S. Miller commit cca414b263d5544f6bb4bff3cd3d3130def2b530 Author: Mike Rapoport Date: Mon Feb 7 10:10:53 2011 +0200 ARM: tegra: add TrimSlice board Add basic support for CompuLab TrimSlice platform Signed-off-by: Mike Rapoport Signed-off-by: Colin Cross commit 535371c3fba22b414dbbe25b93fbddbd471c772a Author: Colin Cross Date: Sat Jan 22 00:36:14 2011 -0800 ARM: tegra: Use writel_relaxed in tegra_init_cache Signed-off-by: Colin Cross commit f2b6133ffc05cdfd12ac41cda5eb5d8e55990365 Author: Olof Johansson Date: Wed Jan 5 14:03:12 2011 -0600 ARM: tegra: add tegra_defconfig Adding one single defconfig for the tegra family of boards, to over time cover the superset of supported platform and drivers. Signed-off-by: Olof Johansson Signed-off-by: Colin Cross commit 5789fee934278dd6f4c541db97de229bd4a76424 Author: Colin Cross Date: Wed Aug 18 00:19:12 2010 -0700 ARM: tegra: dma: Fix critical data corruption bugs Sometimes, due to high interrupt latency in the continuous mode of DMA transfer, the half buffer complete interrupt is handled after DMA has transferred the full buffer. When this is detected, stop DMA immediately and restart with the next buffer if the next buffer is ready. originally fixed by Victor(Weiguo) Pan In place of using the simple spin_lock()/spi_unlock() in the interrupt thread, using the spin_lock_irqsave() and spin_unlock_irqrestore(). The lock is shared between the normal process context and interrupt context. originally fixed by Laxman Dewangan (ldewangan@nvidia.com) The use of shadow registers caused memory corruption at physical address 0 because the enable bit was not shadowed, and assuming it needed to be set would enable an unconfigured dma block. Most of the register accesses don't need to know the previous state of the registers, and the few places that do need to modify only a few bits in the registers are the same ones that were sometimes incorrectly setting the enable bit. This patch convert tegra_dma_update_hardware to set the entire register, and the other users to read-modify-write, and drops the shadow registers completely. Also fixes missing locking in tegra_dma_allocate_channel Signed-off-by: Colin Cross commit 699fe145d6e651a814423eeb6125381998f3c077 Author: Colin Cross Date: Mon Aug 23 18:37:25 2010 -0700 ARM: tegra: Allow overriding arch_reset Signed-off-by: Colin Cross commit 1eb2ecf1d5b3c29ce86f098de4ad21fa757d2160 Author: Colin Cross Date: Thu Aug 5 17:40:39 2010 -0700 ARM: tegra: cpufreq: Disable cpufreq during suspend On Tegra, calling clk_set_rate on the CPU clock may call into the regulator API. If the regulator driver that controls the CPU voltage rail has been suspended, this can lead to attempted communication with a hardware block that has already been turned off. Adds a SUSPEND_PREPARE notification hook to drop the frequency to the lowest possible during suspend. Also adds 216MHz (off of PLLP) as the lowest CPU frequency, which allows PLLX to be turned off. Signed-off-by: Colin Cross commit 537f5af0f63eea9cd06f477e1c0fe363d1656e08 Author: Gary King Date: Tue Aug 3 14:53:05 2010 -0700 ARM: tegra: iomap: Add missing devices Adds gart, hdmi, avp, host1x, and pwm controllers to mach/iomap.h Signed-off-by: Gary King Signed-off-by: Colin Cross commit 51327ada7142ab520ed610a42572d1f4cbfbb2dc Merge: 44951a6 986c011 Author: Thomas Gleixner Date: Fri Feb 11 00:26:54 2011 +0100 Merge branch 'irq/for-mips' into irq/core Reason: irq/for-mips is provided for mips to make core independent progress. Merge it into irq/core to avoid conflicts Signed-off-by: Thomas Gleixner commit 986c011ddbb3ed44b35e1bfd67f6aa60b293b495 Author: David Daney Date: Wed Feb 9 16:04:25 2011 -0800 genirq: Call bus_lock/unlock functions in setup_irq() irq_chips that supply .irq_bus_lock/.irq_bus_sync_unlock functions, expect that the other chip methods will be called inside of calls to the pair. If this expectation is not met, things tend to not work. Make setup_irq() call chip_bus_lock()/chip_bus_sync_unlock() too. For the vast majority of irq_chips, this will be a NOP as most don't have these bus lock functions. [ tglx: No we don't want to call that in __setup_irq(). Way too many error exit pathes. ] Signed-off-by: David Daney LKML-Reference: <1297296265-18680-1-git-send-email-ddaney@caviumnetworks.com> Signed-off-by: Thomas Gleixner commit c2f7f0e7b3ce55eee32892d6aa5cd88a7512ea25 Author: Sven Eckelmann Date: Thu Feb 10 14:33:56 2011 +0000 batman-adv: Use successive sequence numbers for fragments The two fragments of an unicast packet must have successive sequence numbers to allow the receiver side to detect matching fragments and merge them again. The current implementation doesn't provide that property because a sequence of two atomic_inc_return may be interleaved with another sequence which also changes the variable. The access to the fragment sequence number pool has either to be protected by correct locking or it has to reserve two sequence numbers in a single fetch. The latter one can easily be done by increasing the value of the last used sequence number by 2 in a single step. The generated window of two currently unused sequence numbers can now be scattered across the two fragments. Reported-by: Linus Lüssing Signed-off-by: Sven Eckelmann commit 6431cbc25fa21635ee04eb0516ba6c51389fbfac Author: David S. Miller Date: Mon Feb 7 20:38:06 2011 -0800 inet: Create a mechanism for upward inetpeer propagation into routes. If we didn't have a routing cache, we would not be able to properly propagate certain kinds of dynamic path attributes, for example PMTU information and redirects. The reason is that if we didn't have a routing cache, then there would be no way to lookup all of the active cached routes hanging off of sockets, tunnels, IPSEC bundles, etc. Consider the case where we created a cached route, but no inetpeer entry existed and also we were not asked to pre-COW the route metrics and therefore did not force the creation a new inetpeer entry. If we later get a PMTU message, or a redirect, and store this information in a new inetpeer entry, there is no way to teach that cached route about the newly existing inetpeer entry. The facilities implemented here handle this problem. First we create a generation ID. When we create a cached route of any kind, we remember the generation ID at the time of attachment. Any time we force-create an inetpeer entry in response to new path information, we bump that generation ID. The dst_ops->check() callback is where the knowledge of this event is propagated. If the global generation ID does not equal the one stored in the cached route, and the cached route has not attached to an inetpeer yet, we look it up and attach if one is found. Now that we've updated the cached route's information, we update the route's generation ID too. This clears the way for implementing PMTU and redirects directly in the inetpeer cache. There is absolutely no need to consult cached route information in order to maintain this information. At this point nothing bumps the inetpeer genids, that comes in the later changes which handle PMTUs and redirects using inetpeers. Signed-off-by: David S. Miller commit ddd4aa424b866a08ceba7ddf38e61542c91b93a0 Author: David S. Miller Date: Wed Feb 9 15:36:47 2011 -0800 inetpeer: Add redirect and PMTU discovery cached info. Validity of the cached PMTU information is indicated by it's expiration value being non-zero, just as per dst->expires. The scheme we will use is that we will remember the pre-ICMP value held in the metrics or route entry, and then at expiration time we will restore that value. In this way PMTU expiration does not kill off the cached route as is done currently. Redirect information is permanent, or at least until another redirect is received. Signed-off-by: David S. Miller commit 7a71ed899e77cc822abb863e24a422dcf7e9fa33 Author: David S. Miller Date: Wed Feb 9 14:30:26 2011 -0800 inetpeer: Abstract address representation further. Future changes will add caching information, and some of these new elements will be addresses. Since the family is implicit via the ->daddr.family member, replicating the family in ever address we store is entirely redundant. Signed-off-by: David S. Miller commit 88b27fdac814c4926175ff0e740f98343ad77491 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:21 2011 +1300 ALSA: asihpi - HPI v4.06 Firmware version check depends on hpi version. Update so correct firmware is accepted. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit c4ed97d9e7ec9b8c8453af4ce55497d85970426c Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:20 2011 +1300 ALSA: asihpi - Fix outstream start trigger for non-mmap adapters. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 7f41b61b3b38b28ac3fd3af7088196204ce170e3 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:19 2011 +1300 ALSA: asihpi - Tighten firmware version requirements. Difference in major.minor between driver and firmware is an error now. Release version mismatch give a warning. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit c188dec310c598d6c38d3db31f201c5629e6dc08 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:18 2011 +1300 ALSA: asihpi - Ensure all adapter data is cleared on device removal. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit a287ca2adec995395486a9d0a7d2f099f7b16f05 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:17 2011 +1300 ALSA: asihpi - Minor define updates HPI version 4.05.32 Tweak HPI error code for backward compatibility. Add BUILD to build-related defines. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit bd33c1cad21da3ac3c541e2107a6c46072ca081b Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:16 2011 +1300 ALSA: asihpi - New functions prep for interrupt driven streams. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 827492acb0bc1262e2d93f3b3b0e33b00a7365ad Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:15 2011 +1300 ALSA: asihpi - Use consistent err return variable, change some bad variable names. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit ba3a909962650d81e9c3731d87b8653652869685 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:14 2011 +1300 ALSA: asihpi - Remove unused code and data. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit ee246fc041c4ace7a8cc3d995716cbc8f8f6cd5c Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:13 2011 +1300 ALSA: asihpi - Clarify firmware id selection. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit d6f1c1c3646276c0784398d4ab31a9c307a6e15f Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:12 2011 +1300 ALSA: asihpi - Allow adapters with duplicate index jumpers to be discovered. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit fc3a399019a5a54258095c9bb0e17d4be5d51e67 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:11 2011 +1300 ALSA: asihpi - Add volume mute control. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 1225367a481ae751738630158c7ca96aa1c7bac8 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:10 2011 +1300 ALSA: asihpi - Add snd_card_set_dev to init. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 2f918a6445218120a7b5e4ce6b6e76064ee8f846 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:09 2011 +1300 ALSA: asihpi - Replace adapter list with single item in subsys response. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 1d595d2a2121b0db2b57656c685a164f38c0c8ae Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:08 2011 +1300 ALSA: asihpi - Cosmetic + a minor comments. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 4b60221c04c3eab6077b4df27beaa1bb80f740ac Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:07 2011 +1300 ALSA: asihpi - Remove int flag polling code preparing for stream interrupts. Interrupt flag used for message handshake will be required for stream interrupts, so conditionally compiled code without HPI6205_NO_HSR_POLL defined can never be used; removing it. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 4704998e84b03e2d93ef8d4d03eeb7a84c0cb493 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:06 2011 +1300 ALSA: asihpi - Code cleanup. Remove unused function. Simplify hpi_alloc_control_cache. Remove useless assignment to struct subsequently freed. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 0a00044d26489c1907b9e8b3e633e6b9a6d2200e Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:05 2011 +1300 ALSA: asihpi - Reduce number of error codes returned to upper layers. Create and use HPI_ERROR_DSP_COMMUNICATION _DSP_BOOTLOAD, rather than backend-specific error codes (now returned as data with the error). Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit ba94455c29c383713c360537b6323e3bd4c76434 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:04 2011 +1300 ALSA: asihpi - Remove unused subsys pointer from all HPI functions. asihpi.c don't link playback and capture streams, there is too much offset between them. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit deb21a233470537276ee39239441d1bf679223cd Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:03 2011 +1300 ALSA: asihpi - Update error codes. Some error codes had duplicate meanings. Just use one. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 1528fbb5dcb5089652147bc6b76aa1f15e50c078 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:02 2011 +1300 ALSA: asihpi - Checkpatch line lengths etc. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 14652e67ff6bb694a509059d670ed56b769e2c7b Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:01 2011 +1300 ALSA: asihpi - Add include guard. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit ffdb57874643a8ad65a46a02dceb2211283816c2 Author: Eliot Blennerhassett Date: Thu Feb 10 17:26:00 2011 +1300 ALSA: asihpi - Add adapter index to cache info for debug. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit e64b1a28c532009edd6a8a7b906c280fc2a4b90a Author: Eliot Blennerhassett Date: Thu Feb 10 17:25:59 2011 +1300 ALSA: asihpi - Rewrite PCM timer function. Update control names. Reported samples_played from card may be inaccurate, so don't use it. Update control names to be closer to alsa standard practice. Also fixed some accidentally lowercased strings. [Removed adriver.h inclusion for external module builds by tiwai] Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 3285ea10e9b09d68da18d2f805980246ec53523a Author: Eliot Blennerhassett Date: Thu Feb 10 17:25:58 2011 +1300 ALSA: asihpi - Interrelated HPI tidy up. Remove many unused functions. Update some message and cache structs. Use pci info directly from pci_dev. Allow control cache elements with variable size, and handle large message/response from dsp. hpi6000 and hpi6205: fix error path when adapter bootload fails. hpimsgx.c get rid of code duplicated in hpicmn.c Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit ad210ad10ec96e32d32459545f54e4d3d9c6a088 Author: Eliot Blennerhassett Date: Thu Feb 10 17:25:57 2011 +1300 ALSA: asihpi - HPI 4.05.14 All enum values numeric for easier finding, particularly error codes. Remove many unused declarations. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit f0dcad41ac2956851e6b2d31762d1edc61ede949 Author: Eliot Blennerhassett Date: Thu Feb 10 17:25:56 2011 +1300 ALSA: asihpi - Simplify debug logging. Log HPI messages and responses in consistent numeric format, which can be post-processed to get strings. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 0a1602c02be606b72003104dbf5f0f8293c42588 Author: Eliot Blennerhassett Date: Thu Feb 10 17:25:55 2011 +1300 ALSA: asihpi - Poison adapter_index in message. Remove unused function. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 1c0f647690f1b9471d63af48dec960bc59492e61 Merge: 2c250ad 4c4231e Author: James Bottomley Date: Thu Feb 10 11:21:02 2011 -0600 Merge branch 'irq' into for-next commit 2c250ad23d438fa56e1beded374e44dc565c6c47 Merge: e9a623b 9804c9e Author: James Bottomley Date: Thu Feb 10 11:20:53 2011 -0600 Merge branch 'fixes' into for-next commit e9a623be5c984a1e344b2bb94e36e592f2491de6 Merge: 6148a47 8b4ae33 Author: James Bottomley Date: Thu Feb 10 11:20:41 2011 -0600 Merge branch 'tmpalias-flush' into for-next commit 5ed15dafa381d1bb7954c7cec0677c45814017f9 Author: Eliot Blennerhassett Date: Thu Feb 10 17:25:54 2011 +1300 ALSA: asihpi - Switch to dev_printk. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit 4c4231ea2f794d73bbb50b8d84e00c66a012a607 Author: Thomas Gleixner Date: Sun Feb 6 20:45:52 2011 +0000 [PARISC] Convert to new irq_chip functions Convert all the parisc driver interrupt handlers (dino, eisa, gsc, iosapic and superio) as well as the cpu interrupts. Prepare show_interrupts for GENERIC_HARDIRQS_NO_DEPRECATED and finally selects that Kconfig option [jejb: compile and testing fixes] Signed-off-by: Thomas Gleixner Signed-off-by: James Bottomley commit 917692f5f7ec63de3b093c825913d68e910db282 Author: Dave Martin Date: Wed Feb 9 12:06:59 2011 +0100 ARM: 6655/1: Correct WFE() in asm/spinlock.h for Thumb-2 The content for ALT_SMP() in the definition of WFE() expands to 6 bytes (IT cc ; WFEcc.W), which breaks the assumptions of the fixup code, leading to lockups when the affected code gets run. This patch works around the problem by explicitly using an IT + WFEcc.N pair. Signed-off-by: Dave Martin Acked-by: Will Deacon Signed-off-by: Russell King commit ab94e4666d5cee0e393367671eeab4111105bffb Author: Dick Streefland Date: Mon Jan 24 00:44:57 2011 +0100 scripts/extract-ikconfig: add xz compression support Add support for kernels compressed with xz to the extract-ikconfig script. Signed-off-by: Dick Streefland Acked-by: WANG Cong Signed-off-by: Michal Marek commit 23b120cdfae4f5c29da69de750d545bad719ead4 Author: Uwe Kleine-König Date: Mon Feb 7 16:35:22 2011 +0100 ARM: mxc91231: use .init_early to initialize cpu type This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit ab130421269aec9bf83d8ef5b7ceda80e2619599 Author: Uwe Kleine-König Date: Mon Feb 7 16:35:21 2011 +0100 ARM: mx5: use .init_early to initialize cpu type, reset address and iomuxer This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 97976e223be3091a91da103358c3c6cffff7db81 Author: Uwe Kleine-König Date: Mon Feb 7 16:35:20 2011 +0100 ARM: mx3: use .init_early to initialize cpu type, reset address and iomuxer This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 3dac219615b88010601ee52e7b5fd1c32ef789ea Author: Uwe Kleine-König Date: Mon Feb 7 16:35:19 2011 +0100 ARM: imx: use .init_early to initialize cpu type and reset address This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 Author: David Jander Date: Thu Feb 10 10:59:44 2011 +0100 ARM: imx+mx3: convert to mc13xxx MFD Signed-off-by: David Jander Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 0be9a196468ad4d03a3f5a1823e02aad5be47968 Author: Uwe Kleine-König Date: Thu Feb 10 10:56:21 2011 +0100 ARM: mx3/mx31_3ds: fix compiler warning without CONFIG_USB_ULPI This fixes: arch/arm/mach-mx3/mach-mx31_3ds.c:249: warning: 'mx31_3ds_host2_init' defined but not used Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 9b1e1ea365b31584fef697a49d03536978d57b50 Author: Uwe Kleine-König Date: Thu Feb 10 11:07:27 2011 +0100 ARM: imx/eukrea_mbimx27: fix compile warnings about unused variables Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 854fdd55bfdd56cfc61bd30f2062a9268fcebba6 Author: Mimi Zohar Date: Tue Nov 2 10:14:22 2010 -0400 IMA: remove IMA imbalance checking Now that i_readcount is maintained by the VFS layer, remove the imbalance checking in IMA. Cleans up the IMA code nicely. Signed-off-by: Mimi Zohar Acked-by: Eric Paris commit 890275b5eb79e9933d12290473eab9ac38da0051 Author: Mimi Zohar Date: Tue Nov 2 10:13:07 2010 -0400 IMA: maintain i_readcount in the VFS layer ima_counts_get() updated the readcount and invalidated the PCR, as necessary. Only update the i_readcount in the VFS layer. Move the PCR invalidation checks to ima_file_check(), where it belongs. Maintaining the i_readcount in the VFS layer, will allow other subsystems to use i_readcount. Signed-off-by: Mimi Zohar Acked-by: Eric Paris commit a5c96ebf1d71df0c5fb77ab58c9aeb307cf02372 Author: Mimi Zohar Date: Tue Nov 2 10:11:37 2010 -0400 IMA: define readcount functions Define i_readcount_inc/dec() functions to be called from the VFS layer. Changelog: - renamed iget/iput_readcount to i_readcount_inc/dec (Dave Chinner's suggestion) - removed i_lock in iput_readcount() (based on comments:Dave Chinner,Eric Paris) Signed-off-by: Mimi Zohar Acked-by: Eric Paris commit a68a27b6f2354273bacc39c3dd06456edb202230 Author: Mimi Zohar Date: Tue Nov 2 10:10:56 2010 -0400 IMA: convert i_readcount to atomic Convert the inode's i_readcount from an unsigned int to atomic. Signed-off-by: Mimi Zohar Acked-by: Eric Paris commit 691269f0d918cd72454c254f97722f194c07b9a8 Author: Jan Beulich Date: Wed Feb 9 08:26:53 2011 +0000 x86: Adjust section placement in AMD northbridge related code amd_nb_misc_ids[] can live in .rodata, and enable_pci_io_ecs() can be moved into .cpuinit.text. Signed-off-by: Jan Beulich Cc: Hans Rosenfeld Cc: Andreas Herrmann Cc: Borislav Petkov LKML-Reference: <4D525DDD0200007800030F07@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit b82fef82d56789439e6be638a87a1a5bba1e6e75 Author: Jan Beulich Date: Wed Feb 9 08:24:34 2011 +0000 x86: Partly unify asm-offsets_{32,64}.c Just consolidating the common parts. Full unification would seem straight forward, but it's not clear the necessary #ifdef-s would be acceptable. Signed-off-by: Jan Beulich LKML-Reference: <4D525D520200007800030EE9@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 94d1ac8b55799be10487fff9766cce6d6628462a Author: Jan Beulich Date: Wed Feb 9 08:22:46 2011 +0000 x86: Reduce back the alignment of the per-CPU data section This complements commit: 47f19a0814e8: percpu: Remove the multi-page alignment facility reverting one leftover of: fe8e0c25cad2: x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE Signed-off-by: Jan Beulich Acked-by: Alexander van Heukelum Cc: Linus Torvalds LKML-Reference: <4D525CE60200007800030EE5@vpn.id2.novell.com> Signed-off-by: Ingo Molnar Cc: Alexander van Heukelum commit 44d60c0f5c58c2168f31df9a481761451840eb54 Author: Borislav Petkov Date: Thu Feb 10 12:19:47 2011 +0100 x86, microcode, AMD: Extend ucode size verification The different families have a different max size for the ucode patch, adjust size checking to the family we're running on. Also, do not vzalloc the max size of the ucode but only the actual size that is passed on from the firmware loader. Signed-off-by: Borislav Petkov commit c5b6a9feaeb0fa0e39e3fc10f9bf8cc8de498739 Author: Mark Brown Date: Wed Feb 9 20:14:42 2011 +0000 ASoC: Actively manage WM8903 DC servo configuration Explicitly cache the DC servo offsets for digital paths in the driver, allowing them to be preserved over suspend and resume, and ensure that we recalibrate analogue outputs paths when they are in use so that we cover any changes in the input offset. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c16e19c11730199c1df686b160c9c972ad28baf8 Author: Patrick McHardy Date: Thu Feb 10 10:13:07 2011 +0100 netfilter: ipset: add dependency on CONFIG_NETFILTER_NETLINK When SYSCTL and PROC_FS and NETFILTER_NETLINK are not enabled: net/built-in.o: In function `try_to_load_type': ip_set_core.c:(.text+0x3ab49): undefined reference to `nfnl_unlock' ip_set_core.c:(.text+0x3ab4e): undefined reference to `nfnl_lock' ... Reported-by: Randy Dunlap Acked-by: Randy Dunlap Signed-off-by: Patrick McHardy commit 26d902c0c6d6254f471663305d48b63f027ddb0c Author: Colin Cross Date: Wed Feb 9 22:17:17 2011 -0800 ARM: tegra: irq: Implement retrigger Signed-off-by: Colin Cross commit 3524b70ef3336a4f1351a489e83894b88106ab7c Author: Colin Cross Date: Sun Nov 28 22:23:55 2010 -0800 ARM: tegra: irq: Add support for suspend wake sources Signed-off-by: Colin Cross commit 093617851c5fa0d1fdf5ce378f20691b7adb35e4 Author: Colin Cross Date: Sun Nov 28 16:26:19 2010 -0800 ARM: tegra: timer: Add idle and suspend support to timers Implement read_persistent_clock by reading the Tegra RTC registers that stay running during suspend. Save and restore the timer configuration register in suspend. Signed-off-by: Colin Cross commit 3c3895b4bf58d709ad4709480ceb2bb006741972 Author: Gary King Date: Wed Aug 18 00:19:58 2010 -0700 ARM: tegra: pinmux: Add missing drive pingroups and fix suspend Adds missing drive pingroups, saves all drive pingroups in suspend, and restores the pinmux registers in the proper order. Signed-off-by: Gary King Signed-off-by: Colin Cross commit cea62c878dd8b73b67fb3e38f989e9d3241d5934 Author: Colin Cross Date: Mon Oct 4 11:49:26 2010 -0700 ARM: tegra: clock: Suspend fixes, and add new clocks Save and restore pll and osc state during suspend Add digital audio clocks Update clk dev associations Correct max clock frequencies Add pll_p as additional cpu clock state Add values to plld table Fix register offset for sdmmc4 clock Add blink timer to tegra2_clocks Signed-off-by: Colin Cross commit 2ea67fd145397c1409ffc85b2210ccf7ef69a183 Author: Colin Cross Date: Mon Oct 4 08:49:49 2010 -0700 ARM: tegra: Add prototypes for subsystem suspend functions Signed-off-by: Colin Cross commit 538bd3cc196f55b02614b3b19c48656251464b74 Author: Colin Cross Date: Sun Oct 3 21:24:28 2010 -0700 ARM: tegra: irqs: Update irq list Fixes typo in INT_CPU1_PMU_INTR (original fix from Will Deacon) Adds board irqs Signed-off-by: Colin Cross commit ce1e32626951957729d5a1bbe3fa7e5d734df6c0 Author: Colin Cross Date: Mon May 24 17:07:46 2010 -0700 ARM: tegra: Add api to control internal powergating Signed-off-by: Colin Cross commit d377eb0d95e4a7333afeb5ca4ba8554160480263 Author: Colin Cross Date: Fri Aug 6 14:29:14 2010 -0700 ARM: tegra: Centralize macros to define debug uart base Signed-off-by: Colin Cross commit 75a25637bf8a1b8fbed2368c0a3ec15c66a534f1 Author: Casey Schaufler Date: Wed Feb 9 19:58:42 2011 -0800 Smack: correct final mmap check comparison The mmap policy enforcement checks the access of the SMACK64MMAP subject against the current subject incorrectly. The check as written works correctly only if the access rules involved have the same access. This is the common case, so initial testing did not find a problem. Signed-off-by: Casey Schaufler commit db904aa8147440b750a35d58befed38155a1abb9 Author: Shan Wei Date: Wed Feb 9 19:58:11 2011 -0800 security:smack: kill unused SMACK_LIST_MAX, MAY_ANY and MAY_ANYWRITE Kill unused macros of SMACK_LIST_MAX, MAY_ANY and MAY_ANYWRITE. v2: As Casey Schaufler's advice, also remove MAY_ANY. Signed-off-by: Shan Wei Signed-off-by: Casey Schaufler commit b6644cb706610874104dbf3359e3b67aa59cbc27 Author: Xiaotian Feng Date: Wed Feb 9 19:16:15 2011 -0800 net: rename group sysfs entry to netdev_group commit a512b92 adds sysfs entry for net device group, but before this commit, tun also uses group sysfs, so after this commit checkin, kernel warns like this: sysfs: cannot create duplicate filename '/devices/virtual/net/vnet0/group' Since tun has used this for years, rename sysfs under tun might break existing userspace, so rename group sysfs entry for net device group is a better choice. Signed-off-by: Xiaotian Feng Signed-off-by: David S. Miller commit a7e2a89abb8387a377f3bf6d483d0938b5735854 Author: Uwe Kleine-König Date: Wed Feb 9 21:40:10 2011 +0100 wip: fix section mismatches in omap1_defconfig after these changes omap1_defconfig and omap2plus_defconfig don't have any section mismatches any more, making it plausible that the patches earlier in this series are OK. Signed-off-by: Uwe Kleine-König Signed-off-by: Tony Lindgren commit 119c4c2cce34a07c98f0166ad679135bb62621ec Author: Uwe Kleine-König Date: Wed Feb 9 21:40:09 2011 +0100 ARM: omap: move omap_board_config_kernel to .init.data This variable is only assigned in __init functions and never used later. Signed-off-by: Uwe Kleine-König Signed-off-by: Tony Lindgren commit 2354f64a24924f87ed74f6ff1a38be4b05938c04 Author: Uwe Kleine-König Date: Wed Feb 9 21:40:08 2011 +0100 ARM: omap: move omap_get_config et al. to .init.text All callers of these functions live in .init.text, so these can go there, too. There they must not be exported anymore, this is no problem though, as all callers are always built-in. Signed-off-by: Uwe Kleine-König Signed-off-by: Tony Lindgren commit 29ab3c77c6ec6b4147f9bed75c2f4ed6f73b1bb8 Author: Uwe Kleine-König Date: Wed Feb 9 21:40:07 2011 +0100 ARM: omap1/nokia770: mark some functions __init These are only called from omap_nokia770_init which is in .init.text, too. Signed-off-by: Uwe Kleine-König Signed-off-by: Tony Lindgren commit 59db5b2b9e0327e545ff5764dadcb26062c2ab1f Merge: 26e8055 fbbb495 Author: Greg Kroah-Hartman Date: Wed Feb 9 15:13:28 2011 -0800 Staging: Merge branch 'tidspbridge-for-2.6.39' of git://dev.omapzoom.org/pub/scm/tidspbridge/kernel-dspbridge into staging-next * 'tidspbridge-for-2.6.39' of git://dev.omapzoom.org/pub/scm/tidspbridge/kernel-dspbridge: (37 commits) staging: tidspbridge: set12 remove hungarian from structs staging: tidspbridge: set11 remove hungarian from structs staging: tidspbridge: set10 remove hungarian from structs staging: tidspbridge: set9 remove hungarian from structs staging: tidspbridge: set8 remove hungarian from structs staging: tidspbridge: set7 remove hungarian from structs staging: tidspbridge: set6 remove hungarian from structs staging: tidspbridge: set5 remove hungarian from structs staging: tidspbridge: set4 remove hungarian from structs staging: tidspbridge: set3 remove hungarian from structs staging: tidspbridge: set2 remove hungarian from structs staging: tidspbridge: set1 remove hungarian from structs staging: tidspbridge: remove code referred by OPT_ZERO_COPY_LOADER staging: tidspbridge: Remove trivial header files staging: tidspbridge: Remove unused typedefs staging: tidspbridge: Remove unused structs staging: tidspbridge: Remove unused functions staging: tidspbridge: Remove unused defined constants staging: tidspbridge: Fix atoi to support hexadecimal numbers correctly staging: tidspbridge: rmgr/node.c code cleanup ... commit 26e805544a5dfd22b3def27b4c2363cd81a40467 Author: Hauke Mehrtens Date: Wed Feb 9 21:21:39 2011 +0100 staging: brcm80211: fix build with BCMDBG unset. These changes are fixing some build problem I had when compiling without BCMDBG being set. Signed-off-by: Hauke Mehrtens Signed-off-by: Greg Kroah-Hartman commit 6630889735ec3d950b4f1496ada77df287d8ee1b Author: Dan Magenheimer Date: Sun Feb 6 19:27:09 2011 -0800 staging: zcache: misc build/config [PATCH V2 3/3] drivers/staging: zcache: misc build/config Makefiles and Kconfigs to build zcache in drivers/staging There is a dependency on xvmalloc.* which in 2.6.37 resides in drivers/staging/zram. Should this move or disappear, some Makefile/Kconfig changes will be required. Signed-off-by: Dan Magenheimer Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 9cc06bf88d554dd527ded26eab28eec6a0d0e3df Author: Dan Magenheimer Date: Sun Feb 6 19:26:08 2011 -0800 staging: zcache: host services and PAM services [PATCH V2 2/3] drivers/staging: zcache: host services and PAM services Zcache provides host services (memory allocation) for tmem, a "shim" to interface cleancache and frontswap to tmem, and two different page-addressable memory implemenations using lzo1x compression. The first, "compression buddies" ("zbud") compresses pairs of pages and supplies a shrinker interface that allows entire pages to be reclaimed. The second is a shim to xvMalloc which is more space-efficient but less receptive to page reclamation. The first is used for ephemeral pools and the second for persistent pools. All ephemeral pools share the same memory, that is, even pages from different pools can share the same page. Signed-off-by: Dan Magenheimer Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit daa6afa6d920a389015bb8f1ea519cef0636f528 Author: Dan Magenheimer Date: Sun Feb 6 19:25:08 2011 -0800 staging: zcache: in-kernel tmem code [PATCH V2 1/3] drivers/staging: zcache: in-kernel tmem code Transcendent memory ("tmem") is a clean API/ABI that provides for an efficient address translation and a set of highly concurrent access methods to copy data between a page-oriented data source (e.g. cleancache or frontswap) and a page-addressable memory ("PAM") data store. Of critical importance, the PAM data store is of unknown (and possibly varying) size so any individual access may succeed or fail as defined by the API/ABI. Tmem exports a basic set of access methods (e.g. put, get, flush, flush object, new pool, and destroy pool) which are normally called from a "host" (e.g. zcache). To be functional, two sets of "ops" must be registered by the host, one to provide "host services" (memory allocation) and one to provide page-addressable memory ("PAM") hooks. Tmem supports one or more "clients", each which can provide a set of "pools" to partition pages. Each pool contains a set of "objects"; each object holds pointers to some number of PAM page descriptors ("pampd"), indexed by an "index" number. This triple is sometimes referred to as a "handle". Tmem's primary function is to essentially provide address translation of handles into pampds and move data appropriately. As an example, for cleancache, a pool maps to a filesystem, an object maps to a file, and the index is the page offset into the file. And in this patch, zcache is the host and each PAM descriptor points to a compressed page of data. Tmem supports two kinds of pages: "ephemeral" and "persistent". Ephemeral pages may be asynchronously reclaimed "bottoms up" so the data structures and concurrency model must allow for this. For example, each pampd must retain sufficient information to invalidate tmem's handle-to-pampd translation. its containing object so that, on reclaim, all tmem data structures can be made consistent. Signed-off-by: Dan Magenheimer Signed-off-by: Greg Kroah-Hartman commit fa9879edebdaad4cfcd2dbe3eaa2ba0dc4f0a262 Author: Vinod Koul Date: Wed Feb 9 14:44:17 2011 +0530 ASoC: add support for multiple jack types This patch adds soc-jack support for adding voltage zones and for detecting jack type Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Signed-off-by: Mark Brown commit ea707584bac187c9c6c64c4eacd1c09bcc08f37b Author: Michael Hennerich Date: Wed Feb 9 11:03:29 2011 +0100 Staging: IIO: DDS: AD9832 / AD9835 driver This is a complete rewrite of the AD9832/35 driver. Purpose was to move this driver to the recently created API for such devices. Changes since V1: IIO: DDS: AD9832 / AD9835 driver: Apply review feedback Save a few bytes, use union for data allocated for spi buffers. Remove use of device IDs. Fix comments. Make master clock mclk always type unsigned long. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit f9a7e9b2f074218ef7e3afcdaa71f6804fd36c84 Author: Michael Hennerich Date: Mon Feb 7 11:05:46 2011 +0100 Staging: IIO: TRIGGER: New sysfs based trigger This patch adds a new trigger that can be invoked by writing the sysfs file: trigger_now. This approach can be valuable during automated testing or in situations, where other trigger methods are not applicable. For example no RTC or spare GPIOs. Last but not least we can allow user space applications to produce triggers. IIO: TRIGGER: Apply review feedback by Greg Kroah-Hartman Changes since v1: Add sysfs documentation. Change license notice. Add module alias. Add more Kconfig help text Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit bcd2d92e62254320d012c8e879d651eeaa350661 Author: Marek Belisko Date: Tue Feb 8 14:41:38 2011 +0100 staging: ft1000: Remove unnecessary check in write_blk_fifo(). byte_length = word_length * 4; if (byte_length % 4) ... word_length * 4 is always aligned at 4 bytes. Remove pointless check. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 677aaa430669861f39bd43c02bdbc2e8f7f7ad2c Author: Marek Belisko Date: Wed Feb 9 15:02:42 2011 +0100 staging: ft1000: Fix coding style in card_reset_dsp function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 8bfef502595acf6a8b6f8f77f0cf919f94021c08 Author: Marek Belisko Date: Wed Feb 9 15:02:41 2011 +0100 staging: ft1000: Fix coding style in fix_ft1000_write_dpram32 fucntion. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 71e3335d5593b202ad266b828927efe1b88d88d2 Author: Marek Belisko Date: Wed Feb 9 15:02:40 2011 +0100 staging: ft1000: Fix coding style in fix_ft1000_read_dpram32 function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 460bd5ddabe5ff4474292864097a7b527cdd0e9c Author: Marek Belisko Date: Wed Feb 9 15:02:39 2011 +0100 staging: ft1000: Fix coding style in ft1000_read/write_dpram16 functions. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit e3fc923d4d84d6327e92f7b4cc8f6906ebc2719f Author: Marek Belisko Date: Wed Feb 9 15:02:38 2011 +0100 staging: ft1000: Fix coding style in ft1000_read/write_dpram32 functions. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 31da7c09de2cdfcd5ad0c87b78b00637402545bd Author: Marek Belisko Date: Wed Feb 9 15:02:37 2011 +0100 staging: ft1000: Fix coding style in ft1000_write/read_register functions. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 4a526fca849f942426ed1017c9a8060a503c3883 Author: Marek Belisko Date: Wed Feb 9 15:02:36 2011 +0100 staging: ft1000: Fix return values type. Change return values type from u16 to int because all functions use ft1000_control function which return int. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit dc080fdaca4c0fb379b62bffef2db5c74a883728 Author: Marek Belisko Date: Wed Feb 9 15:02:35 2011 +0100 staging: ft1000: Remove unused header ft1000_hw.h Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 537a20aba6127a048fbb15ce31cc824fb879a132 Author: Marek Belisko Date: Wed Feb 9 15:02:34 2011 +0100 staging: ft1000: Fix coding style in ft1000_control function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 866fd9366a5b2c7d17eb10f7e7b1c17393ed0beb Merge: e12adab b66a70d Author: Mark Brown Date: Wed Feb 9 22:52:08 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit e12adab00222817213fcdc68c5fd6ee2e5dfb247 Author: Mark Brown Date: Wed Feb 9 17:42:57 2011 +0000 ASoC: Fix WM8903 DAC mute default The WM8903 register map does not mute the DAC by default at startup so we need to explicitly do so. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 2c8be5a26e42cfc4906c4daa8a5a5c82610ddb3d Author: Mark Brown Date: Wed Feb 9 17:42:56 2011 +0000 ASoC: Dynamically manage CLK_SYS in WM8903 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 13a9983eb197254dffd9ea63a2d5f12c54eb651c Author: Mark Brown Date: Wed Feb 9 17:42:55 2011 +0000 ASoC: Convert WM8903 to use PGA_S for output stage enables This simplfies the code and slightly reduces the startup time. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1e113bf9e088f1a6f4a1cdadce598ccc340f8fc1 Author: Mark Brown Date: Wed Feb 9 13:47:08 2011 +0000 ASoC: Add support for AIF channel muxing on WM8903 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1d8d62d637577afc568da32e3ecc7bddc11db56d Author: Mark Brown Date: Wed Feb 9 13:47:07 2011 +0000 ASoC: Display WM8903 chip revision alphabetically Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 4b592c919c694de79c31d5fde59c169fc79595a9 Author: Mark Brown Date: Wed Feb 9 13:47:06 2011 +0000 ASoC: Remove redundant -codec from WM8903 driver name It causes noisy -codecs to appear in things like .codec_name. Signed-off-by: Mark Brown Acked-by: Stephen Warren Acked-by: Liam Girdwood commit 4f82f0285297b89bb1d612b52dfd38fd572a8282 Author: Vaibhav Bedia Date: Wed Feb 9 18:39:54 2011 +0530 ASoC: Davinci: Replace usage of IO_ADDRESS with ioremap() This patch modifies the Davinci i2s and mcasp drivers to make use of ioremap() instead of IO_ADDRESS() Signed-off-by: Vaibhav Bedia Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit eef6d7b8c24e8dd5af6094ef453a05c80b68d36e Author: Vaibhav Bedia Date: Wed Feb 9 18:39:53 2011 +0530 ASoC: Davinci: Call clk_disable() and clk_put() in case of error In case of any error in probe() function, clk_disable() and clk_put() should be called if clk_enable() and clk_get() went through. Signed-off-by: Vaibhav Bedia Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d852f446b71b80c59821a08cdb595aa266210daf Author: Vaibhav Bedia Date: Wed Feb 9 18:39:52 2011 +0530 ASoC: Davinci: Use resource_size() helper function This patch modifies the Davinci i2s and mcasp drivers to make use of the resource_size() helper function for readability. Signed-off-by: Vaibhav Bedia Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 36633237be60c0ec88b11e00d5fa22a305563d03 Author: Vinod Koul Date: Wed Feb 9 21:44:34 2011 +0530 ASoC: sn95031: Add support for reading mic bias This patch adds support to read the mic bias voltage when a jack is inserted. It uses ADC to measure. Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 42aee9b43e76645cda59bce30a101e7574ce913e Author: Vinod Koul Date: Wed Feb 9 21:44:33 2011 +0530 ASoC: mfld_machine: Add support for jack detection This patch adds support for registering jack interupt and registering jack with core Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1e2f5932e472f11b987e8339ffc855aa00ecebf5 Author: Vinod Koul Date: Wed Feb 9 21:44:32 2011 +0530 ASoC: sn95031: Add jack support in the codec This patch adds support for jack detection and reporting in the codec It however is not fully functional as it doesn't measure adc to figure out what got inserted which will be added later Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit aa72eb0778be48edfeacc51c24c9617f1a1947b5 Author: Greg Kroah-Hartman Date: Wed Feb 9 13:19:03 2011 -0800 Staging: samsung-laptop: add a bunch more laptop DMI signatures Taken from the fork of the driver at: http://code.google.com/p/easy-slow-down-manager/ which should no longer be needed now that the in-kernel driver now supports these laptops. Cc: Kobelkov Sergey Signed-off-by: Greg Kroah-Hartman commit 6d1d4ea4a82f8c17a3ff7c2f677bc3d41ea7484b Author: Rafał Miłecki Date: Tue Feb 8 23:32:17 2011 +0100 ssb: extract boardflags2 for SPROMs rev 4 and 5 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 67acad5fe5df591e8f629050667912b0db2c72e7 Author: Stanislaw Gruszka Date: Tue Feb 8 09:31:58 2011 +0100 iwlwifi: fix ack health for WiFi/BT combo devices Combo devices have TX statistics on different place, because struct statistics_rx_bt and struct statistics_rx have different size. User proper values on combo devices instead of random data. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit f266526da4d78b7af639e98777d453888b039c00 Author: Stanislaw Gruszka Date: Tue Feb 8 09:31:57 2011 +0100 iwlwifi: cleanup iwl_good_ack_health Make ack health code easies to read. Compared to previous code, we do not print debug messages when expected_ack_cnt_delta == 0 and also do check against negative deltas. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit ca3d9389642946072ed448b2b7386f9e5d3f296b Author: Stanislaw Gruszka Date: Tue Feb 8 09:31:55 2011 +0100 iwlwifi: cleanup iwl_recover_from_statistics No functional change, make recover from statistics code easies to read. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 9814f6b34be5179849c0872e81eb99286ef4b051 Author: Steve Brown Date: Mon Feb 7 17:10:39 2011 -0700 ath9k: Remove redundant beacon_interval The variable appears in both ath_softc and ath_beacon_config. The struct ath_beacon_config is embedded in ath_softc. The redundant variable was added by commit id 57c4d7b4c4986037be51476b8e3025d5ba18d8b8. Signed-off-by: Steve Brown Reviewed-by: Mohammed Shafi Signed-off-by: John W. Linville commit 59bdf3b0fe7a183f18ce94696259c4c76abb4568 Author: Ben Greear Date: Mon Feb 7 13:44:38 2011 -0800 mac80211: Ensure power-level set properly for scanning. My previous patch to optimize scanning on operating channel accidentally removed the code that would ensure power was set to maximum for scanning. This patch re-adds that functionality. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 603b3eefb92e0886ed4dd5f73d4c07b304405b40 Author: Ben Greear Date: Mon Feb 7 13:44:37 2011 -0800 ath9k: Add debug info for configuring power level. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit da2fd1f0f7b78f21f6378f726d1f6de9d573b2d4 Author: Ben Greear Date: Mon Feb 7 13:44:36 2011 -0800 mac80211: Allow work items to use existing channel type. Narrow channel types can function within larger channel types. So, use existing channel type for work items when possible. This decreases hardware channel changes significantly when using non NO_HT channel types on the operating channel. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 4f2e9d91f84ce39698517203974ffc2bcc32a21d Author: Ben Greear Date: Mon Feb 7 13:44:35 2011 -0800 mac80211: Allow scanning on existing channel-type. Previous code set the channel type to NO_HT, but it appears that NO_HT packets can be sent on any channel type, so we do not need to change the channel type as long as the channel is correct. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 4d51e149a6231ea9cc210795cbc358a7c9a8e016 Author: Ben Greear Date: Mon Feb 7 13:44:34 2011 -0800 mac80211: Properly set work-item channel-type. Some were indirectly set to NO_HT (zero), but I think it's better to explicitly set it in case the enum ever changes. In cfg.c, it seems the channel-type was just ignored (and thus always set to NO_HT). Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 8c79a61095936f81cb05e99062185cb987d524ab Author: Ben Greear Date: Mon Feb 7 13:44:33 2011 -0800 ath9k: Print channel-type in chan-change dbg message. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 78a2fcb4fe1b3dc626da56fac7912e7091425892 Author: Greg Kroah-Hartman Date: Wed Feb 9 13:09:26 2011 -0800 Staging: samsung-laptop: add support for NP-Q45 Support for the Samsung NP-Q45 from Jérémie Huchet added Signed-off-by: Greg Kroah-Hartman commit d3c291169eecc2943d8fb0fea45fa58a88afbf2d Author: Greg Kroah-Hartman Date: Wed Feb 9 13:07:23 2011 -0800 Staging: samsung-laptop: Added support for Samsung NC10 laptop Info was provided by Soeren Sonnenburg Cc: Soeren Sonnenburg Signed-off-by: Greg Kroah-Hartman commit 09db47b08a9b54f59ee1cfed80837fa2cae87bd1 Merge: a0019bc 72c2d9e Author: John W. Linville Date: Wed Feb 9 15:44:17 2011 -0500 Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx commit 27059746a98bf80f148b4471d3e58bd6f7d6a19a Merge: 263fb5b 7c9989a Author: David S. Miller Date: Wed Feb 9 12:39:12 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 5bf8b724d206d8e46da504eda847a1d2f9ad4e70 Author: Greg Kroah-Hartman Date: Wed Feb 9 12:39:01 2011 -0800 Staging: samsung-laptop: fix up some variable nameing No camelcase in the Linux kernel please. Cc: Ingmar Steen Signed-off-by: Greg Kroah-Hartman commit 55bb5f4bf26ca968ff7ee026fed1ad377803ce03 Author: Greg Kroah-Hartman Date: Wed Feb 9 12:34:28 2011 -0800 Staging: samsung-laptop: fix up a few more minor coding style issues Cc: Ingmar Steen Signed-off-by: Greg Kroah-Hartman commit 1540e350ddef5e6bfd27c222684ca8fdec4ad2f8 Author: Greg Kroah-Hartman Date: Wed Feb 9 12:30:00 2011 -0800 Staging: samsung-laptop: change sabi_configs to be in C99 format This makes the coding style checker a lot happier. Cc: Ingmar Steen Signed-off-by: Greg Kroah-Hartman commit 3e55eb376ec32efea478035516c80529a83383d5 Author: Greg Kroah-Hartman Date: Wed Feb 9 12:22:41 2011 -0800 Staging: samsung-laptop: fix up brace coding style issues These were introduced with the patch, "staging: samsung-laptop: Extend samsung-laptop platform driver to support another flavor of its platform BIOS." Cc: Ingmar Steen Signed-off-by: Greg Kroah-Hartman commit 27f55e920d66cb0af6bc7bab73e7c63505d908ed Author: Greg Kroah-Hartman Date: Wed Feb 9 12:19:45 2011 -0800 Staging: samsung-laptop: fix up space/tab coding style issues These were introduced with the patch, "staging: samsung-laptop: Extend samsung-laptop platform driver to support another flavor of its platform BIOS." Cc: Ingmar Steen Signed-off-by: Greg Kroah-Hartman commit 837b03cd182f2bcb715cba8844cf82baa8b48170 Author: Ingmar Steen Date: Mon Feb 7 14:32:32 2011 +0100 staging: samsung-laptop: Added Samsung X125 DMI info. Signed-off-by: Ingmar Steen Signed-off-by: Greg Kroah-Hartman commit 988a29bf3dfb2bb9a85c21987e2cc63dadf523c3 Author: Ingmar Steen Date: Mon Feb 7 14:32:31 2011 +0100 staging: samsung-laptop: Extend samsung-laptop platform driver to support another flavor of its platform BIOS. There are currently two implementations of the Samsung BIOS that controls the rfkill switch, backlight brightness / power and performance level. The samsung-laptop driver implements the BIOS flavor with the SECLINUX signature, this patch implements talking to the other BIOS with 'SwSmi@' signature. Both expose very similar functionality and way of accessing the commands. The differences are mostly offsets, command identifiers and some values. This patch introduces a sabi_config structure that contains information on identifying and accessing specific SABI flavors. Signed-off-by: Ingmar Steen Signed-off-by: Greg Kroah-Hartman commit f94fdeaa58e54c41eb6a2d8b86585e858d44c88f Author: Timo von Holtz Date: Tue Feb 8 20:41:19 2011 +0100 Staging: quickstart: fixed coding style issues Fixed the Following coding Style Issues: drivers/staging/quickstart/quickstart.c:8: ERROR: trailing whitespace drivers/staging/quickstart/quickstart.c:144: ERROR: spaces required around that '?' (ctx:VxV) drivers/staging/quickstart/quickstart.c:144: ERROR: spaces required around that ':' (ctx:VxV) Signed-off-by: Timo von Holtz Signed-off-by: Greg Kroah-Hartman commit 7e79f78b331632c1812ce9c07443550aa2b6c0fe Author: Dan Carpenter Date: Wed Feb 9 12:40:12 2011 +0300 Staging: rts_pstor: fix read past end of buffer We read one space past the end of the buffer because we add 1. Also I changed it to use ARRAY_SIZE() instead of manually calculating the size. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 581de3b0a538aa18181602008aa222f51dcf1ec3 Author: Timo von Holtz Date: Tue Feb 8 15:55:49 2011 +0100 Staging: hv: moved assignments out of if conditions Moved all assignments in if conditions to the preceeding line Signed-off-by: Timo von Holtz Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 3c4a94132b78f3143ef8f63f8450d2385dafb429 Author: Timo von Holtz Date: Tue Feb 8 15:52:21 2011 +0100 Staging: hv: replaced __attribute((packed)) with __packed Replaced __attribute((packed)) with __packed as it's preferred Signed-off-by: Timo von Holtz Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 56463de05a56b80b43d21a442cf2a6e0037762e8 Author: Andres Salomon Date: Sun Feb 6 15:28:53 2011 -0800 staging: olpc_dcon: actually return the value of i2c_add_driver It's nice to actually check for errors. :) Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit bada46e5ab10b09b0f86e8b8ede009e759a16adf Author: Andres Salomon Date: Sun Feb 6 15:28:46 2011 -0800 staging: olpc_dcon: move more variables into dcon_priv Global variables for display mode and the current sleep state can go into dcon_priv as well. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit bb4103544e455e11d9a4379326406a60429b9888 Author: Andres Salomon Date: Sun Feb 6 15:28:39 2011 -0800 staging: olpc_dcon: change sysfs 'output' toggle to be clearer... ..and store it in dcon_priv. This renames it to 'monochrome', which I think is much clearer. Previously, "echo 1 > output" toggled mono mode, while "echo 0 > output" enabled color. "Echo 1 > monochrome" makes more sense to me. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 8d2d3dd1b4589299ec17b15130fbadfc69996df4 Author: Andres Salomon Date: Sun Feb 6 15:28:30 2011 -0800 staging: olpc_dcon: get rid of global i2c_client, create a dcon_priv struct Rather than using the global i2c_client variable, create a dcon_priv struct, store in the drvdata portion of the dev, and pass that around. In order to access dcon struct from various callbacks, include the reboot notifier and source switching work struct in the dcon struct. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit fe2d5b43807ebb38e0e8c7b269ff08fcd4011726 Author: Andres Salomon Date: Sun Feb 6 14:38:16 2011 -0800 staging: olpc_dcon: revert strtoul change On Fri, 4 Feb 2011 15:44:43 -0800 From: Andres Salomon The s/simple_strtoul/strict_strtoul/ from commit e107e6eb added a build warning, as well as an oops. This reverts that change. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman commit 2ef0c05e80cf59315f6f0a4e5a950899f169f2d0 Author: Tomas Winkler Date: Wed Feb 9 01:12:51 2011 +0200 staging/easycap: replace NOREADBACK with moduel parameter NOREADBACK doesn't justify Kconfig option so we use module paramter for it. Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 32851b325e32bf9de72500d77488ffd9f7120395 Author: Tomas Winkler Date: Wed Feb 9 01:12:50 2011 +0200 staging/easycap: use regget for register back reading Use regget to reading back what was written to a register. This required changning size argument to regget signature On the way remove usless variable casting Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 73132ce45a011ef76340e3d6393e79d8377e4312 Author: Tomas Winkler Date: Wed Feb 9 01:12:49 2011 +0200 stagine/easycap: make functions regset and regget static regget and regset functions are used only from within easycap_low.c so they can be static Move the functions to avoid forward declarations Move GET and SET macro definitions into the c-file Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 4d59fde3d18a8adc8d35ff595daf1253783d3847 Author: Tomas Winkler Date: Wed Feb 9 01:12:48 2011 +0200 staging/easycap: add first level indentation to regget/set functions Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 5e7a55c30b52353a4eaca24041dbc3d32a3e3819 Author: Tomas Winkler Date: Wed Feb 9 01:12:47 2011 +0200 staging/easycap: remove TESTONE and EASYCAP_TESTTONE No longer needed feature for testing driver's handling of the audio stream independently of the urb completion routine Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit a78392aa3458d93c81201bcc431f166d348cfac6 Author: Tomas Winkler Date: Wed Feb 9 01:12:46 2011 +0200 staging/easycap: remove EASYCAP_SILENT option This has simulated a fault condition of probing for audio capability Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 6ae2dbec4d9673ae0935233e42dc890659702dfb Author: Tomas Winkler Date: Wed Feb 9 01:12:45 2011 +0200 staging/easycap: remove AUDIOTIME feature remove code guarded by AUDIOTIME define This was experimental code in which I tried improve audio-video synchronization but it didn't work well Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit f62bc44e055712fc8ccf34654a79137dd4a4d8af Author: Tomas Winkler Date: Wed Feb 9 01:12:44 2011 +0200 staging/easycap: remove obsolete VIDIOC_S_CTRL_OLD ioctl Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 5dd00908be5220477993002896a8c382fa67681a Author: Tomas Winkler Date: Wed Feb 9 01:12:43 2011 +0200 staging/easycap: replace one more EASYCAP_NEEDS_ALSA with CONFIG_EASYCAP_OSS Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 8d6139547ca349f9acea6536dd6b7f6140d3507f Author: Tomas Winkler Date: Wed Feb 9 01:12:42 2011 +0200 stagine/easycap: use module paramter for default encoding instead of ifdef remove PREFER_NTSC ifdef as it cannot be possible put into Kconfig Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit aff512c8a4582c7f74af57bb09a9979edf92b6d8 Author: Tomas Winkler Date: Wed Feb 9 01:12:41 2011 +0200 staging/easycap: prefer printk over SAY in module entry functions Use INFO level when registering driver and ERR for error. Drop messages from oneliner exit function Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit ee99aa4928129d4aad9087988db6b7815ecdc1d5 Author: Tomas Winkler Date: Wed Feb 9 01:12:40 2011 +0200 staging/easycap: remove paranoid argument checks in usb probe/disconnect remove checks for NULL for usb_interface. USB bus won't call these functions with NULL Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 66681fb74e3d2f4dbf40f1e22b315a3807408eaf Author: Tomas Winkler Date: Mon Feb 7 09:41:47 2011 +0200 staging/easycap: fix build when SND is not enabled Fix easycap build when CONFIG_SOUND is enabled but CONFIG_SND is not enabled. use choice construct to select between ALSA and OSS API binding drivers/built-in.o: In function `easycap_usb_disconnect': easycap_main.c:(.text+0x2aba20): undefined reference to `snd_card_free' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b784b): undefined reference to `snd_card_create' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b78fb): undefined reference to `snd_pcm_new' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b7916): undefined reference to `snd_pcm_set_ops' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b795b): undefined reference to `snd_card_register' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b79d8): undefined reference to `snd_card_free' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b7a78): undefined reference to `snd_card_free' drivers/built-in.o: In function `easycap_alsa_complete': (.text+0x2b7e68): undefined reference to `snd_pcm_period_elapsed' drivers/built-in.o:(.data+0x2cae8): undefined reference to `snd_pcm_lib_ioctl' Reported-by: Randy Dunlap Cc: R.M. Thomas Signed-off-by: Tomas Winkler Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit d936435f2082788748ae5783cf2c006367d04bb8 Author: Dan Carpenter Date: Wed Feb 9 01:45:13 2011 +0300 Staging: rtl8712: fix math errors in snprintf() The original code had calls to snprintf(p, 7, "wpa_ie=") but that string is 8 characters (because snprintf() puts a NUL terminator on the end). So instead of an '=' the what gets written to buf is a NUL terminator followed by the rest of the string. And actually the %02x formats are three chars as well when you include the terminator. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit ec42dc2c7f6a530d16562a061cb3d00a63f8a612 Author: Mike McCormack Date: Sun Feb 6 22:58:07 2011 +0900 staging: rtl8192e: Factor out common code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 11a861d9dec8528b1111efdcc7c70618b8cd9d9b Author: Mike McCormack Date: Sun Feb 6 22:57:48 2011 +0900 staging: rtl8192e: Remove dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit ec984e0cabfa1726a3166dff0ef8e04aafc57a71 Author: Mike McCormack Date: Sun Feb 6 22:57:18 2011 +0900 staging: rtl8192e: Clean up MlmeDisassociateRequest Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit ea66f752c003beed8839ecc07f187169309d9afd Author: Mike McCormack Date: Sun Feb 6 22:56:57 2011 +0900 staging: rtl8192e: Remove dead code from MgntActSet_RF_State Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 6f304eb29125858abff1f87755900e3f89c48aee Author: Mike McCormack Date: Sun Feb 6 22:56:37 2011 +0900 staging: rtl8192e: Remove rf_chip variable, hardcode to RF_8256 Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit d2bddcf8c6c6a3450432e93f9ba0746f85e21a39 Author: Mike McCormack Date: Sun Feb 6 22:56:08 2011 +0900 staging: rtl8192e: Remove dead code from SetRFPowerState8190 Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 9236928f155e9e4ae19310359518cedab4e64450 Author: Mike McCormack Date: Sun Feb 6 22:55:52 2011 +0900 staging: rtl8192e: Use spin_lock, just one exit path Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit fb53c2b73f4fc1cfd3d5548b6efbb00b1d7de3a7 Author: Mike McCormack Date: Sun Feb 6 22:55:39 2011 +0900 staging: rtl8192e: Delete dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 80a4dead575f118267f35afc722a182c0edc9bcf Author: Mike McCormack Date: Sun Feb 6 22:55:26 2011 +0900 staging: rtl8192e: Avoid casting function pointers Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 1348dc08a912c0bdfc8680df8919dd79de8c3b9a Author: Mike McCormack Date: Sun Feb 6 22:55:16 2011 +0900 staging: rtl8192e: Don't call ieee80211_ps_tx_ack in interrupt context Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 79b03af67a7db3622aefe2da8c250775c81fd623 Author: Mike McCormack Date: Sun Feb 6 22:55:06 2011 +0900 staging: rtl8192e: Simplify flow of control in rtl8192_rx Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 109ded2b46c6cf07256837202fe6ee3c06815923 Author: Mike McCormack Date: Sun Feb 6 22:54:57 2011 +0900 staging: rtl8192e: Simplify r8192_set_multicast Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 57be9583360bcbcc6e712dc881763b1f2e597f50 Author: Mike McCormack Date: Sun Feb 6 22:54:48 2011 +0900 staging: rtl8192e: Remove unused debug code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 4803ef77da6ac74b0288be1fd15bdc7fe240acfa Author: Mike McCormack Date: Sun Feb 6 22:54:29 2011 +0900 staging: rtl8192e: Remove RTL8192P and RTL8192U ifdefs Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit aebbafddf78e148378eee71f9063f510e9a1cf05 Author: Mike McCormack Date: Sun Feb 6 22:53:57 2011 +0900 staging: rtl8192e: Remove dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 679b5f674f989c95c9e591dc6c429a60226e3659 Author: Mike McCormack Date: Sun Feb 6 22:53:45 2011 +0900 staging: rtl8192e: Remove dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 3f9ab1ee8a44240e280f511a219ed101b9095697 Author: Mike McCormack Date: Sun Feb 6 22:53:26 2011 +0900 staging: rtl8192e: Use private structure in IO functions The current ieee80211 library does not pass net_device structures around. Switch code to use private data structure to get I/O addresses. Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 427bf120b67a098f0ab4ebb84ee238afcfc0c689 Author: Mike McCormack Date: Sun Feb 6 22:53:12 2011 +0900 staging: rtl8192e: Remove redundant externs Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit c8a0064cb7c9f12220f37ba52f4616a78bf9ddd5 Author: Mike McCormack Date: Sun Feb 6 22:52:52 2011 +0900 staging: rtl8192e: Remove duplicate header Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit fd821d1e8a8a4d21324c79c1d54b1131170c0721 Author: Arend van Spriel Date: Tue Feb 8 14:39:13 2011 +0100 staging: brcm80211: implement mac80211 callback set_rts_threshold adds implementation for allowing configuration of dot11RTSThreshold as defined in the 802.11 standards. The mac80211 module will use callback set_rts_threshold to configure this in the driver. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 9804c9eaeacfe78651052c5ddff31099f60ef78c Author: Thomas Gleixner Date: Mon Feb 7 19:28:01 2011 +0100 [PARISC] fix per-cpu flag problem in the cpu affinity checkers The CHECK_IRQ_PER_CPU is wrong, it should be checking irq_to_desc(irq)->status not just irq. Signed-off-by: Thomas Gleixner Cc: stable@kernel.org Signed-off-by: James Bottomley commit 8e1964a98920100f113ad26f78220ea706dbfa2b Author: James Bottomley Date: Thu Jan 20 12:54:18 2011 -0600 [PARISC] fix vmap flush/invalidate On parisc, we never implemented invalidate_kernel_vmap_range() because it was unnecessary for the xfs use case. However, we do need to implement an invalidate for the opposite use case (which occurred in a recent NFS change) where the user wants to read through the vmap range and write via the kernel address. There's an additional complexity to this in that if the page has no userspace mappings, it might have dirty cache lines in the kernel (indicated by the PG_dcache_dirty bit). In order to get full coherency, we need to flush these pages through the kernel mapping before invalidating the vmap range. Signed-off-by: James Bottomley commit 22b7fcdae562b6792b3f5517e89fd7e0337180ae Author: Torben Hohn Date: Thu Jan 27 16:00:12 2011 +0100 mn10300: Switch do_timer() to xtimer_update() Only one CPU gets the timer interrupt so mn10300_last_tsc does not need to be protected by xtime lock. Remove xtime lovking and use xtime_update() which does the locking itself. Signed-off-by: Torben Hohn Cc: David Howells Cc: Koichi Yasutake LKML-Reference: <20110127150011.23248.62040.stgit@localhost> Signed-off-by: Thomas Gleixner commit 258721ef34fce97a7a6ca9cebebb303827645868 Author: Borislav Petkov Date: Wed Jan 5 18:13:19 2011 +0100 x86, microcode, AMD: Cleanup dmesg output Unify pr_* to use pr_fmt, shorten messages, correct type formatting. Signed-off-by: Borislav Petkov Acked-by: Andreas Herrmann commit 05ff02e4c0686051fcb074aec92df03f2c184fd1 Author: Borislav Petkov Date: Wed Jan 5 18:04:11 2011 +0100 x86, microcode, AMD: Remove unneeded memset call collect_cpu_info_amd() clears its csig arg but this is done in the microcode_core's collect_cpu_info() by clearing the embedding struct ucode_cpu_info. Drop it. Signed-off-by: Borislav Petkov Acked-by: Andreas Herrmann commit 7cc27349cbfec271eecec9488b4bf3f3fadb2ce4 Author: Borislav Petkov Date: Fri Dec 31 16:57:48 2010 +0100 x86, microcode, AMD: Simplify get_next_ucode Do not copy the section header but look at it directly through the pointer. Also, make it return a ptr to a ucode header directly thus dropping a bunch of unneeded casts. Finally, simplify generic_load_microcode(), while at it. Signed-off-by: Borislav Petkov Acked-by: Andreas Herrmann commit 10de52d6655ef0d4a1b8d2804db30208c26601ed Author: Borislav Petkov Date: Thu Dec 30 22:10:12 2010 +0100 x86, microcode, AMD: Simplify install_equiv_cpu_table There's no need to memcpy the ucode header in order to look at it only in this function - use the original buffer instead. Also, fix return type semantics by returning a negative value on error and a positive otherwise. Signed-off-by: Borislav Petkov Acked-by: Andreas Herrmann commit ffc7e8ac820bf9dd6106b01d3e64fecb5177cf43 Author: Borislav Petkov Date: Thu Dec 30 21:06:01 2010 +0100 x86, microcode, AMD: Release firmware on error When the ucode magic is wrong, for whatever reason, we don't release the loaded firmware binary and its related resources. Make sure we do. Also, fix function naming to fit this driver's convention and shorten variable names. Signed-off-by: Borislav Petkov Acked-by: Andreas Herrmann commit 6c53cbfced048c421e4f72cb2183465f68fbc5e7 Author: Borislav Petkov Date: Thu Jan 6 16:56:51 2011 +0100 x86, microcode: Correct sysdev_add error path When we encounter an error while initting the microcode driver on a CPU, we must undo the previously added sysfs group. Cc: Tigran Aivazian Signed-off-by: Borislav Petkov Acked-by: Andreas Herrmann commit 3d8bc3901067700e790e8cc796aa438cffb5ac80 Author: Stephen Warren Date: Thu Feb 3 13:56:14 2011 -0700 ASoC: Tegra: Harmony: Add switch control for speaker Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f7d3e403d7de06f8a42a7f34950ae972547c6d59 Author: Stephen Warren Date: Thu Feb 3 13:56:13 2011 -0700 ASoC: Tegra: Harmony: Add headphone jack detection Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4149efb22da66e326fc48baf80d628834509f7f0 Author: Tejun Heo Date: Tue Feb 8 10:39:03 2011 +0100 workqueue: add system_freezeable_wq Add system wide freezeable workqueue. Signed-off-by: Tejun Heo Acked-by: Dmitry Torokhov Cc: "Rafael J. Wysocki" commit 0e0a070d3a47d279de66e08244769556deae2eee Author: Casey Schaufler Date: Tue Feb 8 16:36:24 2011 -0800 Smack: correct behavior in the mmap hook The mmap policy enforcement was not properly handling the interaction between the global and local rule lists. Instead of going through one and then the other, which missed the important case where a rule specified that there should be no access, combine the access limitations where there is a rule in each list. Signed-off-by: Casey Schaufler Signed-off-by: James Morris commit 263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea Merge: 8d13a2a9 c69b909 Author: David S. Miller Date: Tue Feb 8 17:19:01 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/e1000e/netdev.c commit 72c2d9e511846a4f2759389b38ed8a5553579eb3 Author: Eliad Peller Date: Wed Feb 2 09:59:37 2011 +0200 wl12xx: set supported_rates after association Instead of looking for supported_rates change on every tx packet, just extract the supported_rates after association completes (station only). Remove wl1271.sta_rate_set and WL1271_FLAG_STA_RATES_CHANGED which are not used anymore. Signed-off-by: Eliad Peller Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit fe5ef090660de340b52823de7cb65b899bb4f012 Author: Eliad Peller Date: Wed Feb 2 09:59:36 2011 +0200 wl12xx: use the conf struct instead of macros for memory configuration make the configuration management more flexible by using the conf struct, rather than predefined macros. Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit c8bde243421d759844264cf11e4248e7862c2722 Author: Eliad Peller Date: Wed Feb 2 09:59:35 2011 +0200 wl12xx: move to new firmware (6.1.3.50.49) This patch adds support for the new wl12xx firmware (Rev 6.1.3.50.49) Since this fw is not backward compatible with previous fw versions, a new fw (with different name) is being fetched. (the patch is big because it contains all the required fw api changes. splitting it into multiple patches will result in corrupted intermediate commits) Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit ee60833a4f887a09e87be52cdf1247a4963b0aef Author: Eliad Peller Date: Wed Feb 2 09:59:34 2011 +0200 wl12xx: mcp2.5 - add config_ps acx mcp2.5 uses this acx to configure the fw only once, rather than passing the params in every enter psm command. Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 8d13a2a9fb3e5e3f68e9d3ec0de3c8fcfa56a224 Author: David S. Miller Date: Tue Feb 8 16:17:55 2011 -0800 net: Kill NETEVENT_PMTU_UPDATE. Nobody actually does anything in response to the event, so just kill it off. Signed-off-by: David S. Miller commit e7b66bdc02592f5573ade667e4d68ac6e7b0f9e1 Author: David S. Miller Date: Tue Feb 8 15:33:22 2011 -0800 net: Remove bogus barrier() in dst_allfrag(). I simply missed this one when modifying the other dst metric interfaces earlier. Signed-off-by: David S. Miller commit 6752ab4a9c30d5411b2dfdb251a3f1cb18aae487 Author: Steven Rostedt Date: Tue Feb 8 13:54:06 2011 -0500 tracing: Deprecate tracing_enabled for tracing_on tracing_enabled should not be used, it is heavy weight and does not do much in helping lower the overhead. tracing_on should be used instead. Warn users to use tracing_on when tracing_enabled is used as it will soon be removed from the tracing directory. Signed-off-by: Steven Rostedt commit 87d80de2800d087ea833cb79bc13f85ff34ed49f Author: Steven Rostedt Date: Tue Feb 8 13:19:49 2011 -0500 tracing: Remove obsolete sched_switch tracer The trace events sched_switch and sched_wakeup do the same thing as the stand alone sched_switch tracer does. It is no longer needed. Signed-off-by: Steven Rostedt commit f4d5c029bd6731baac0937324cef0f746e7d5ea7 Author: Lai Jiangshan Date: Wed Jan 26 16:49:00 2011 +0800 tracing: Compile time initialization for event flags value Compile time initialization is better than runtime initialization. Remove many early_initcall()s and many trace_init_flags_##name()s. Acked-by: Frederic Weisbecker Signed-off-by: Lai Jiangshan LKML-Reference: <4D3FDFFC.6030304@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit cce1dac871f387d0f3da81440d85bd387d8fd5a6 Author: Uwe Kleine-König Date: Mon Jan 24 21:12:01 2011 +0100 trivial: Fix Steven's Copyright typos OK, the copyright allows you to write a copy, still I think the lawyers prefer the correct spelling. Signed-off-by: Uwe Kleine-König LKML-Reference: <1295899921-11333-1-git-send-email-u.kleine-koenig@pengutronix.de> Signed-off-by: Steven Rostedt commit fa9921e46fd52b78070dc67ce0d27ec301a90410 Author: Nicolas Dichtel Date: Wed Feb 2 06:29:02 2011 +0000 ipsec: allow to align IPv4 AH on 32 bits The Linux IPv4 AH stack aligns the AH header on a 64 bit boundary (like in IPv6). This is not RFC compliant (see RFC4302, Section 3.3.3.2.1), it should be aligned on 32 bits. For most of the authentication algorithms, the ICV size is 96 bits. The AH header alignment on 32 or 64 bits gives the same results. However for SHA-256-128 for instance, the wrong 64 bit alignment results in adding useless padding in IPv4 AH, which is forbidden by the RFC. To avoid breaking backward compatibility, we use a new flag (XFRM_STATE_ALIGN4) do change original behavior. Initial patch from Dang Hongwu and Christophe Gouault . Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit c0c84ef5c130f8871adbdaac2ba824b9195cb6d9 Merge: 2360d2e 3ad97fb Author: David S. Miller Date: Tue Feb 8 13:52:31 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 7c867c8899e873652ef98a890d2e647c092bec25 Author: Jesper Juhl Date: Mon Jan 24 21:14:33 2011 +0100 PCI: Avoid potential NULL pointer dereference in pci_scan_bridge pci_add_new_bus() calls pci_alloc_child_bus() which calls pci_alloc_bus() that allocates memory dynamically with kzalloc(). The return value of kzalloc() is the pointer that's eventually returned from pci_add_new_bus(), so since kzalloc() can fail and return NULL so can pci_add_new_bus(). Thus we may end up dereferencing a NULL pointer in drivers/pci/probe.c::pci_scan_bridge(). Seems to me we should test for this and bail out if it happens rather than crashing. Also removed some trailing whitespace that bugged me while looking at this. Signed-off-by: Jesper Juhl Signed-off-by: Jesse Barnes commit c13ff2ff3ad1479f222e18f9caba3db5af68d549 Author: Seth Heasley Date: Mon Jan 10 13:08:37 2011 -0800 PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs This patch adds the LPC Controller DeviceIDs for the Intel DH89xxCC PCH. The code for capturing ranges of LPC Controller DeviceIDs has also been updated. Acked-by: Jean Delvare Signed-off-by: Seth Heasley Signed-off-by: Jesse Barnes commit 44951a60ff888add9e84f509ffce20052e45af94 Author: Thomas Gleixner Date: Fri Feb 4 17:33:49 2011 +0100 genirq: Remove dead code CONFIG_KSTAT_IRQS_ONDEMAND does not exist. It's not worth to implement it. Use sparse irqs if you care about memory consumption of the interrupt layer. Found by undertaker: http://vamos.informatik.uni-erlangen.de/trac/undertaker Signed-off-by: Thomas Gleixner commit c305d524e5dd3c3c7a6035083e30950bea1b52dc Author: Thomas Gleixner Date: Wed Feb 2 17:10:48 2011 +0100 softirq: Avoid stack switch from ksoftirqd ksoftirqd() calls do_softirq() which switches stacks on several architectures. That makes no sense at all. ksoftirqd's stack is sufficient. Call __do_softirq() directly. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra Cc: Benjamin Herrenschmidt Cc: Heiko Carstens Acked-by: David Miller Cc: Paul Mundt Reviewed-by: Frank Rowand LKML-Reference: commit 0f12a4e29368a9476076515881d9ef4e5876c6e2 Author: Ben Hutchings Date: Thu Jan 13 19:47:56 2011 +0000 PCI: sysfs: Fix failure path for addition of "vpd" attribute Commit 280c73d ("PCI: centralize the capabilities code in pci-sysfs.c") changed the initialisation of the "rom" and "vpd" attributes, and made the failure path for the "vpd" attribute incorrect. We must free the new attribute structure (attr), but instead we currently free dev->vpd->attr. That will normally be NULL, resulting in a memory leak, but it might be a stale pointer, resulting in a double-free. Found by inspection; compile-tested only. Cc: stable@kernel.org Signed-off-by: Ben Hutchings Signed-off-by: Jesse Barnes commit d5e3d747007fdb541e57ed72e020ff0b94db3470 Author: Arnaldo Carvalho de Melo Date: Tue Feb 8 15:29:25 2011 -0200 perf annotate: Fix annotate context lines regression The live annotation done in 'perf top' needs to limit the context before lines that aren't filtered out by the min percent filter, if we don't do that, the screen in a tty often is not enough for showing what is interesting: lines with hits and a few source code lines before it. Reported-by: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit ce6f4fab4059cd72638a0cfa596a8ee2c79c1c8e Author: Arnaldo Carvalho de Melo Date: Tue Feb 8 13:27:39 2011 -0200 perf annotate: Move locking to struct annotation Since we'll need it when implementing the live annotate TUI browser. This also simplifies things a bit by having the list head for the source code to be in the dynamicly allocated part of struct annotation, that way we don't have to pass it around, it can be found from the struct symbol that is passed everywhere. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit e3087b80aa0bceda9863f33307460f3ba79f2b15 Author: Arnaldo Carvalho de Melo Date: Tue Feb 8 15:01:39 2011 -0200 perf annotate: Fix --stdio rendering The checks for not using a max_lines parameter were b0rked, problem introduced in 3653246. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 5e38ca8f3ea423442eaafe1b7e206084aa38120a Author: Jiri Olsa Date: Wed Feb 2 13:28:18 2011 +0100 tracing: Add unstable sched clock note to the warning The warning "Delta way too big" warning might appear on a system with unstable shed clock right after the system is resumed and tracing was enabled during the suspend. Since it's not realy bug, and the unstable sched clock is working fast and reliable otherwise, Steven suggested to keep using the sched clock in any case and just to make note in the warning itself. Signed-off-by: Jiri Olsa LKML-Reference: <1296649698-6003-1-git-send-email-jolsa@redhat.com> Signed-off-by: Steven Rostedt commit c9a443cdf7726ce8b78c3177c6ae601ce37292fc Merge: 285c1a2 dc5f219 Author: Thomas Gleixner Date: Tue Feb 8 16:38:00 2011 +0100 Merge branch 'irq/for-xen' into irq/core irq/for-xen contains new functionality to avoid Xen private irq hackery. That branch has a single irq commit and is pulled by Xen to base their new features on. Merge it into irq/core as other patches modify the same code. Signed-off-by: Thomas Gleixner commit dc5f219e88294b93009eef946251251ffffb6d60 Author: Thomas Gleixner Date: Fri Feb 4 13:19:20 2011 +0100 genirq: Add IRQF_FORCE_RESUME Xen needs to reenable interrupts which are marked IRQF_NO_SUSPEND in the resume path. Add a flag to force the reenabling in the resume code. Tested-and-acked-by: Ian Campbell Signed-off-by: Thomas Gleixner commit 10ac27970274e9094aee84a6452a25bf1b7e59e1 Author: Artem Bityutskiy Date: Tue Feb 8 17:21:11 2011 +0200 UBIFS: fix LEB number in printk This is a minor patch which fixes the LEB number we print when corrupted empty space is found. Signed-off-by: Artem Bityutskiy commit 46fdaa3bec1bcaa36759b1f5e5e27245ae465b8f Author: Dan Carpenter Date: Mon Feb 7 22:01:41 2011 +0300 ASoC: soc-cache: dereferencing before checking The patch c358e640a66 "ASoC: soc-cache: Add trace event for snd_soc_cache_sync()" introduced a dereference of "codec->cache_ops" before we had checked it for NULL. I pulled the check forward, and then pulled everything in an indent level. Signed-off-by: Dan Carpenter Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a98a0bc6c92eacd181417a9c0ccd2e8028066622 Author: Alexander Sverdlin Date: Thu Feb 3 03:11:45 2011 +0300 ASoC: CS4271: Move Chip Select control out of the CODEC code. Move Chip Select control out of the CODEC code for CS4271. Signed-off-by: Alexander Sverdlin Reviewed-by: H Hartley Sweeten Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a0019bca04029d25a8bbbaaaf28487e6ccd7878e Author: Gustavo F. Padovan Date: Mon Feb 7 19:15:43 2011 -0200 Bluetooth: update Bluetooth daemon name in Kconfig help Change hcid to bluetoothd. Signed-off-by: Gustavo F. Padovan commit 6de0702b5b93da0ef097aa092b4597fbc024ebba Author: Gustavo F. Padovan Date: Fri Feb 4 03:35:20 2011 -0200 Bluetooth: move __l2cap_sock_close() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit 05fc1576dabb1defae3c8c0371fb9d21f7db997a Author: Gustavo F. Padovan Date: Fri Feb 4 03:26:01 2011 -0200 Bluetooth: move l2cap_sock_kill() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit 6ddc0485e1a6ecd450140ea40ffa52786f99183c Author: Gustavo F. Padovan Date: Fri Feb 4 03:23:31 2011 -0200 Bluetooth: move L2CAP sock timers function to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit fd83ccdb393e3190633e0240dd73faac8998164b Author: Gustavo F. Padovan Date: Fri Feb 4 03:20:52 2011 -0200 Bluetooth: move l2cap_sock_sendmsg() to l2cap_sock.c Also moves some L2CAP sending functions declaration to l2cap.h Signed-off-by: Gustavo F. Padovan commit dcba0dba54b566a08376f93cab35cdabd6abda20 Author: Gustavo F. Padovan Date: Fri Feb 4 03:08:36 2011 -0200 Bluetooth: move l2cap_sock_shutdown() to l2cap_sock.c Declare __l2cap_wait_ack() and l2cap_sock_clear_timer() in l2cap.h Signed-off-by: Gustavo F. Padovan commit 6898325923f9571fbede3372dc490faa43b3258a Author: Gustavo F. Padovan Date: Fri Feb 4 03:02:31 2011 -0200 Bluetooth: move l2cap_sock_recvmsg() to l2cap_sock.c It causes the move of the declaration of 3 functions to l2cap.h: l2cap_get_ident(), l2cap_send_cmd(), l2cap_build_conf_req() Signed-off-by: Gustavo F. Padovan commit 4e34c50bfe5ba87da1622cc7c6ed10712da255ad Author: Gustavo F. Padovan Date: Fri Feb 4 02:56:13 2011 -0200 Bluetooth: move l2cap_sock_connect() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit 99f4808db0c052f3c92a689ec2841618bf2ce14a Author: Gustavo F. Padovan Date: Fri Feb 4 02:52:55 2011 -0200 Bluetooth: move l2cap_sock_getsockopt() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit 33575df7be6748292f88453f29319af6d639c5c8 Author: Gustavo F. Padovan Date: Fri Feb 4 02:48:48 2011 -0200 Bluetooth: move l2cap_sock_setsockopt() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit d7175d55255cb0a576844bc6e986000e0d7f8e9d Author: Gustavo F. Padovan Date: Fri Feb 4 02:43:46 2011 -0200 Bluetooth: move l2cap_sock_getname() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit c47b7c724bc7106acf602b2ce99922a2d14ea62b Author: Gustavo F. Padovan Date: Fri Feb 4 02:42:23 2011 -0200 Bluetooth: move l2cap_sock_accept() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit af6bcd8205ac06fa1de98b2b28303157fb9c3dfc Author: Gustavo F. Padovan Date: Fri Feb 4 02:40:28 2011 -0200 Bluetooth: move l2cap_sock_bind()/listen() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit 554f05bb8a0707dcc0ba4ea1dba1fb9970846ab5 Author: Gustavo F. Padovan Date: Fri Feb 4 02:36:42 2011 -0200 Bluetooth: move l2cap_sock_release() to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit 65390587c7bcf8bb60b48387db766d8d7dfea982 Author: Gustavo F. Padovan Date: Fri Feb 4 02:33:56 2011 -0200 Bluetooth: move l2cap_sock_ops to l2cap_sock.c First step to move all l2cap_sock_ops function to l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit bb58f747e519aba07a6f05a78d58cf8a0788e2d5 Author: Gustavo F. Padovan Date: Thu Feb 3 20:50:35 2011 -0200 Bluetooth: Initial work for L2CAP split. This patch tries to do the minimal to move l2cap_sock_create() and its dependencies to l2cap_sock.c. It create a API to initialize and cleanup the L2CAP sockets from l2cap_core.c through l2cap_init_sockets() and l2cap_cleanup_sockets(). Signed-off-by: Gustavo F. Padovan commit 0a708f8fc46fde3be2116b8d79f7469a24097c90 Author: Gustavo F. Padovan Date: Thu Feb 3 18:58:10 2011 -0200 Bluetooth: Rename l2cap.c to l2cap_core.c In a preparation to the the L2CAP code split in many files. Signed-off-by: Gustavo F. Padovan commit 84f0e17f78471857104a20dfc57711409f68d7bf Author: Rogério Brito Date: Thu Feb 3 01:42:05 2011 -0200 Bluetooth: ath3k: Avoid duplication of code In commit 86e09287e4f8c81831b4d4118a48597565f0d21b, to reduce memory usage, the functions of the ath3k module were rewritten to release the firmware blob after it has been loaded (successfully or not). The resuting code has some redundancy and the compiler can potentially produce better code if we omit a function call that is unconditionally executed in ,---- | if (ath3k_load_firmware(udev, firmware)) { | release_firmware(firmware); | return -EIO; | } | release_firmware(firmware); | | return 0; | } `---- It may also be argued that the rewritten code becomes easier to read, and also to see the code coverage of the snippet in question. Signed-off-by: Rogério Brito Cc: Alexander Holler Cc: "Gustavo F. Padovan" Cc: Miguel Ojeda Signed-off-by: Gustavo F. Padovan commit d37f50e19094862a5d60d79637d6f4dbdc42f4f1 Author: Andrei Emeltchenko Date: Mon Jan 24 10:53:24 2011 +0200 Bluetooth: fix crash by disabling tasklet in sock accept Crash can happen when tasklet handling connect/disconnect requests preempts socket accept. Can be reproduced with "l2test -r" on one side and several "l2test -c -b 1000 -i hci0 -P 10 " on the other side. disable taskets in socket accept and change lock_sock and release_sock to bh_lock_sock and bh_unlock_sock since we have to use spinlocks and there is no need to mark sock as owned by user. ... [ 3555.897247] Unable to handle kernel NULL pointer dereference at virtual address 000000bc [ 3555.915039] pgd = cab9c000 [ 3555.917785] [000000bc] *pgd=8bf3d031, *pte=00000000, *ppte=00000000 [ 3555.928314] Internal error: Oops: 17 [#1] PREEMPT [ 3555.999786] CPU: 0 Not tainted (2.6.32.21-13874-g67918ef #65) ... [ 3556.005981] PC is at bt_accept_unlink+0x20/0x58 [bluetooth] [ 3556.011627] LR is at bt_accept_dequeue+0x3c/0xe8 [bluetooth] ... [ 3556.161285] [] (bt_accept_unlink+0x20/0x58 [bluetooth]) from [] (bt_accept_dequeue+0x3c/0xe8 [bluetooth]) [ 3556.172729] [] (bt_accept_dequeue+0x3c/0xe8 [bluetooth]) from [] (l2cap_sock_accept+0x100/0x15c [l2cap]) [ 3556.184082] [] (l2cap_sock_accept+0x100/0x15c [l2cap]) from [] (sys_accept4+0x120/0x1e0) [ 3556.193969] [] (sys_accept4+0x120/0x1e0) from [] (ret_fast_syscall+0x0/0x2c) [ 3556.202819] Code: e5813000 e5901164 e580c160 e580c15c (e1d13bbc) ... Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 5a08eccedaa1e12b74cf3afea9e11a9aefc29f73 Author: Andrei Emeltchenko Date: Tue Jan 11 17:20:20 2011 +0200 Bluetooth: Do not use assignments in IF conditions Fix checkpatch warnings concerning assignments in if conditions. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 17fa4b9dff72fb3a1a68cc80caf98fc941d2b8b3 Author: Johan Hedberg Date: Tue Jan 25 13:28:33 2011 +0200 Bluetooth: Add set_io_capability management command This patch adds a new set_io_capability management command which is used to set the IO capability for Secure Simple Pairing (SSP) as well as the Security Manager Protocol (SMP). The value is per hci_dev and each hci_conn object inherits it upon creation. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 980e1a537fed7dfa53e9a4b6e586b43341f8c2d5 Author: Johan Hedberg Date: Sat Jan 22 06:10:07 2011 +0200 Bluetooth: Add support for PIN code handling in the management interface This patch adds the necessary commands and events needed to communicate PIN code related actions between the kernel and userspace. This includes a pin_code_request event as well as pin_code_reply and pin_code_negative_reply commands. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit a38528f1117590169c0bf61cbf874e9fd2d5c5c9 Author: Johan Hedberg Date: Sat Jan 22 06:46:43 2011 +0200 Bluetooth: Create common cmd_complete function for mgmt.c A lot of management code needs to generate command complete events so it makes sense to have a helper function for this. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 2784eb41b1fbb3ff80f4921fe9dbb4c4acb6dc24 Author: Johan Hedberg Date: Fri Jan 21 13:56:35 2011 +0200 Bluetooth: Add get_connections managment interface command This patch adds a get_connections command to the management interface. With this command userspace can get the current list of connected devices. Typically this command would only be used once when enumerating existing adapters. After that the connected and disconnected events are used to track connections. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 17d5c04cb597418a177c3ca18dfde679636dd51c Author: Johan Hedberg Date: Sat Jan 22 06:09:08 2011 +0200 Bluetooth: Add support for connect failed management event This patch add a new connect failed management event to track failures in connecting to remote devices. It is particularly useful for security mode 3 scenarios when we don't have a connected state while pairing but still need to detect when the connect attempt failed. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 8962ee74be48df16027100f657b2b12e8ef3d34d Author: Johan Hedberg Date: Thu Jan 20 12:40:27 2011 +0200 Bluetooth: Add disconnect managment command This patch adds a disconnect command to the managment interface. Using this command user space is able to force the disconnection of connected devices. The command maps directly to the Disconnect HCI command. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit f7520543ab40341edbc2aeee7fef68218be19a0a Author: Johan Hedberg Date: Thu Jan 20 12:34:39 2011 +0200 Bluetooth: Add connected/disconnected management events This patch adds connected and disconnected managment events to track the connection status to remote devices. The events map directly to successful connection complete and disconnection complete HCI events for ACL links. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 55ed8ca10f3530de8edbbf138acb50992bf5005b Author: Johan Hedberg Date: Mon Jan 17 14:41:05 2011 +0200 Bluetooth: Implement link key handling for the management interface This patch adds a management commands to feed the kernel with all stored link keys as well as remove specific ones or all of them. Once the load_keys command has been called the kernel takes over link key replies. A new_key event is also added to inform userspace of newly created link keys that should be stored permanently. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 1aff6f09491f454d4cd9f405c783fa5e9d3168a0 Author: Johan Hedberg Date: Thu Jan 13 21:56:52 2011 +0200 Bluetooth: Add class of device control to the management interface This patch adds the possibility for user space to fully control the Class of Device value of local adapters. To control the service class bits each UUID that's added comes with a service class "hint" which acts as a mask of bits that the UUID needs to have enabled. The set_service_cache management command is used to make sure we queue up all UUID changes as user space initializes its drivers and then send a single HCI_Write_Class_of_Device command when initialization is complete. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit d5859e22cd40b73164b3e5d8d5d796f96edcc6af Author: Johan Hedberg Date: Tue Jan 25 01:19:58 2011 +0200 Bluetooth: Implement a more complete adapter initialization sequence Using the managment interface means that user space doesn't need to do any HCI command sending at all. This patch moves the remaining initialization commands from user space to the kernel side. The patch makes use of the new feature of __hci_request which allows the request to be dynamically modified while it is ongoing (something that is needed to react appropriately to the local features and the version of the adapter). Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit d83506003608910d24d5ace9ec06ad1bfd9ad110 Author: Johan Hedberg Date: Mon Jan 10 14:28:45 2011 +0200 Bluetooth: Remove page timeout setting from HCI init sequence User space should set the page timeout so there's no need to explicitly set it in the HCI init sequence. Even if user space fails to set it the controller default value will be used. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit b0916ea0d9e6ea3ed46bb7a61c13a2b357b0248b Author: Johan Hedberg Date: Mon Jan 10 13:44:55 2011 +0200 Bluetooth: Add controller side link key clearing to hci_init_req The controller may have link keys in its own memory and these keys could be used for secure connections. However, since the interface to access these keys doesn't provide information about the key types (which would be needed to infer the level of security each key provides) using these keys is rather useless. Therefore, simply clear the controller side list in the initialization procedure. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit a5040efa2017f3e4f1b4d5f40fd989567f3994c1 Author: Johan Hedberg Date: Mon Jan 10 13:28:59 2011 +0200 Bluetooth: Add special handling with __hci_request and HCI_INIT To support a more dynamic HCI initialization sequence the __hci_request behavior requires some more changes. Particularly, the init sequence should be able to have conditionals in it (sending some HCI commands depending on the outcome of a previous command) instead of being a fixed list as it is right now. The reasons for these additional requirements are the moving all previously user space driven initialization commands to the kernel side as well as the support the Low Energy controllers. To fulfull these requirements the init sequence is made the only special case for multi-command requests and req_last_cmd is renamed to init_last_cmd. The hci_send_cmd function is changed to update init_last_cmd as long as the HCI_INIT flag is set. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 03b555e119de8288a16e086e1fbd223d9b429d3d Author: Johan Hedberg Date: Tue Jan 4 15:40:05 2011 +0200 Bluetooth: Reject pairing requests when in non-pairable mode This patch adds the necessary logic to act accordingly when the HCI_PAIRABLE flag is not set. In that case PIN code replies as well as Secure Simple Pairing requests without a NoBonding requirement need to be rejected. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 930e13363fb0e94db6e8b59c54dfb5c59355113e Author: Johan Hedberg Date: Tue Jan 4 11:39:44 2011 +0200 Bluetooth: Implement debugfs support for listing UUIDs This patch adds a debugfs entry to list the UUIDs that have been registered through the management interface. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 2aeb9a1ae0e34fb46cb78b82f827a6a54ab65111 Author: Johan Hedberg Date: Tue Jan 4 12:08:51 2011 +0200 Bluetooth: Implement UUID handling through the management interface This patch adds methods to the management interface for userspace to notify the kernel of which services have been registered for specific adapters. This information is needed for setting the appropriate Class of Device value as well as the Extended Inquiry Response value. This patch doesn't actually implement setting of these values but just provides the storage of the UUIDs so the needed functionality can be built on top of it. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit c542a06c29acbf4ea0024884a198065a10613147 Author: Johan Hedberg Date: Wed Jan 26 13:11:03 2011 +0200 Bluetooth: Implement set_pairable managment command This patch implements a new set_pairable management command to control the pairable state of local adapters. The state is represented using a new HCI_PAIRABLE flag in the hci_dev struct. For backwards compatibility with older user space versions the HCI_PAIRABLE flag gets automatically set when the existence of an adapter is reported to user space through legacy methods and the HCI_MGMT flag is not set. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 053f0211d3b1a991f06a7b4aec5b762e42d7c6a4 Author: Johan Hedberg Date: Wed Jan 26 13:07:10 2011 +0200 Bluetooth: Add send_mode_rsp convenience function for mgmt.c Several management commands have similar responses but they are not always sent asynchronously. To enable synchronous sending (from the managment command handler function) a send_mode_rsp function is added. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit ebc99feba7378349e2bfae7018af062767382f6c Author: Johan Hedberg Date: Tue Jan 4 11:54:26 2011 +0200 Bluetooth: Add flag to track managment controlled adapters This patch adds a HCI_MGMT flag to track adapters which are under the control of the management interface. This is needed to make sure that new kernels will work with old user space versions. I.e. behaviour which could break old user space versions (but is needed by the management interface) should not be exhibited when the HCI_MGMT flag is not set. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 72a734ec1aca8cd2ef3fc85428c11bde662e149e Author: Johan Hedberg Date: Thu Dec 30 00:38:22 2010 +0200 Bluetooth: Unify mode related management messages to a single struct The powered, connectable and discoverable messages all have the same format. By using a single struct for all of them a lot of code can be simplified and reused. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 9fbcbb455dd01abfad4f314b618ac51d566114cb Author: Johan Hedberg Date: Thu Dec 30 00:18:33 2010 +0200 Bluetooth: Add set_connectable management command This patch adds a set_connectable command as well as a corresponding event to the management interface. It's mainly useful for setting an adapter as connectable from a non-initialized state as well as setting an already initialized adapter as non-connectable (mostly useful for qualification purposes). Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 73f22f62388795c0f6b4f3f97bda7a64f9681aac Author: Johan Hedberg Date: Wed Dec 29 16:00:25 2010 +0200 Bluetooth: Add support for set_discoverable management command This patch adds a set_discoverable command to the management interface as well as the corresponding event. The command is used to control the discoverable state of adapters. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit eec8d2bcc841ae44edcde9660ff21144a2016053 Author: Johan Hedberg Date: Thu Dec 16 10:17:38 2010 +0200 Bluetooth: Add support for set_powered management command This patch adds a set_powered command to the management interface through which the powered state of local adapters can be controlled. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 5add6af8fcbce269cac2457584c0ebfda055474a Author: Johan Hedberg Date: Thu Dec 16 10:00:37 2010 +0200 Bluetooth: Add support for management powered event This patch adds support for the powered event that's used to indicate to userspace when the powered state of a local adapter changes. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit ab81cbf99c881ca2b9a83682a8722fc84b2483d2 Author: Johan Hedberg Date: Wed Dec 15 13:53:18 2010 +0200 Bluetooth: Implement automatic setup procedure for local adapters This patch implements automatic initialization of basic information about newly registered Bluetooth adapters. E.g. the address and features are always needed so it makes sense for the kernel to automatically power on adapters and read this information. A new HCI_SETUP flag is added to track this state. In order to not consume unnecessary amounts of power if there isn't a user space available that could switch the adapter back off, a timer is added to do this automatically as long as no Bluetooth user space seems to be present. A new HCI_AUTO_OFF flag is added that user space needs to clear to avoid the automatic power off. Additionally, the management interface index_added event is moved to the end of the HCI_SETUP stage so a user space supporting the managment inteface has all the necessary information available for fetching when it gets notified of a new adapter. The HCI_DEV_REG event is kept in the same place as before since existing HCI raw socket based user space versions depend on seeing the kernels initialization sequence (hci_init_req) to determine when the adapter is ready for use. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 7990681c409e8a31eac122342e64da6c3b77a249 Author: Gustavo F. Padovan Date: Mon Jan 24 16:01:43 2011 -0200 Bluetooth: Fix setting of MTU for ERTM and Streaming Mode The desired MTU should be sent in an Config_Req for all modes. Signed-off-by: Gustavo F. Padovan commit e702112ff68a554bcac16bb03ddc2b8e5425bcbf Author: Andrei Emeltchenko Date: Mon Jan 3 11:14:36 2011 +0200 Bluetooth: Use non-flushable by default L2CAP data packets Modification of Nick Pelly patch. With Bluetooth 2.1 ACL packets can be flushable or non-flushable. This commit makes ACL data packets non-flushable by default on compatible chipsets, and adds the BT_FLUSHABLE socket option to explicitly request flushable ACL data packets for a given L2CAP socket. This is useful for A2DP data which can be safely discarded if it can not be delivered within a short time (while other ACL data should not be discarded). Note that making ACL data flushable has no effect unless the automatic flush timeout for that ACL link is changed from its default of 0 (infinite). Default packet types (for compatible chipsets): Frame 34: 13 bytes on wire (104 bits), 13 bytes captured (104 bits) Bluetooth HCI H4 Bluetooth HCI ACL Packet .... 0000 0000 0010 = Connection Handle: 0x0002 ..00 .... .... .... = PB Flag: First Non-automatically Flushable Packet (0) 00.. .... .... .... = BC Flag: Point-To-Point (0) Data Total Length: 8 Bluetooth L2CAP Packet After setting BT_FLUSHABLE (sock.setsockopt(274 /*SOL_BLUETOOTH*/, 8 /* BT_FLUSHABLE */, 1 /* flush */)) Frame 34: 13 bytes on wire (104 bits), 13 bytes captured (104 bits) Bluetooth HCI H4 Bluetooth HCI ACL Packet .... 0000 0000 0010 = Connection Handle: 0x0002 ..10 .... .... .... = PB Flag: First Automatically Flushable Packet (2) 00.. .... .... .... = BC Flag: Point-To-Point (0) Data Total Length: 8 Bluetooth L2CAP Packet Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit b2c60d42db0fea1e6c4345739601024863566a13 Author: Jesper Juhl Date: Fri Jan 14 00:18:49 2011 +0100 Bluetooth: Fix failure to release lock in read_index_list() If alloc_skb() fails in read_index_list() we'll return -ENOMEM without releasing 'hci_dev_list_lock'. Signed-off-by: Jesper Juhl Signed-off-by: Gustavo F. Padovan commit 80f5585a292d087856cbc1ddc64d4f7477244b46 Merge: 3ad97fb e733fb6 Author: Gustavo F. Padovan Date: Tue Feb 8 01:38:50 2011 -0200 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into wireless commit ae07f551c42d6e4162436ca452a199deac9dab4d Author: Ian Munsie Date: Thu Feb 3 14:27:25 2011 +1100 tracing/syscalls: Early terminate search for sys_ni_syscall Many system calls are unimplemented and mapped to sys_ni_syscall, but at boot ftrace would still search through every syscall metadata entry for a match which wouldn't be there. This patch adds causes the search to terminate early if the system call is not mapped. Signed-off-by: Ian Munsie LKML-Reference: <1296703645-18718-7-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Steven Rostedt commit b2d55496818d64310b9f5486d4eea76ea614d7f8 Author: Ian Munsie Date: Thu Feb 3 14:27:23 2011 +1100 tracing/syscalls: Allow arch specific syscall symbol matching Some architectures have unusual symbol names and the generic code to match the symbol name with the function name for the syscall metadata will fail. For example, symbols on PPC64 start with a period and the generic code will fail to match them. This patch moves the match logic out into a separate function which an arch can override by defining ARCH_HAS_SYSCALL_MATCH_SYM_NAME in asm/ftrace.h and implementing arch_syscall_match_sym_name. Signed-off-by: Ian Munsie LKML-Reference: <1296703645-18718-5-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Steven Rostedt commit c763ba06bd9b5db2c46c36276c89103d92d2c604 Author: Ian Munsie Date: Thu Feb 3 14:27:22 2011 +1100 tracing/syscalls: Make arch_syscall_addr weak Some architectures use non-trivial system call tables and will not work with the generic arch_syscall_addr code. For example, PowerPC64 uses a table of twin long longs. This patch makes the generic arch_syscall_addr weak to allow architectures with non-trivial system call tables to override it. Signed-off-by: Ian Munsie LKML-Reference: <1296703645-18718-4-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Steven Rostedt commit 3773b389b6927595512558594d040c1edba46f36 Author: Ian Munsie Date: Thu Feb 3 14:27:21 2011 +1100 tracing/syscalls: Convert redundant syscall_nr checks into WARN_ON With the ftrace events now checking if the syscall_nr is valid upon initialisation it should no longer be possible to register or unregister a syscall event without a valid syscall_nr since they should not be created. This adds a WARN_ON_ONCE in the register and unregister functions to locate potential regressions in the future. Signed-off-by: Ian Munsie LKML-Reference: <1296703645-18718-3-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Steven Rostedt commit ba976970c79fd2fbfe1a4b3b6766a318f4eb9d4c Author: Ian Munsie Date: Thu Feb 3 14:27:20 2011 +1100 tracing/syscalls: Don't add events for unmapped syscalls FTRACE_SYSCALLS would create events for each and every system call, even if it had failed to map the system call's name with it's number. This resulted in a number of events being created that would not behave as expected. This could happen, for example, on architectures who's symbol names are unusual and will not match the system call name. It could also happen with system calls which were mapped to sys_ni_syscall. This patch changes the default system call number in the metadata to -1. If the system call name from the metadata is not successfully mapped to a system call number during boot, than the event initialisation routine will now return an error, preventing the event from being created. Signed-off-by: Ian Munsie LKML-Reference: <1296703645-18718-2-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Steven Rostedt commit 4defe682d81a4960b6840ee4ed1a36f9db77c7bd Author: Steven Rostedt Date: Thu Feb 3 23:29:06 2011 -0500 tracing/filter: Remove synchronize_sched() from __alloc_preds() Because the filters are processed first and then activated (added to the call), we no longer need to worry about the preds of the filter in __alloc_preds() being used. As the filter that is allocating preds is not activated yet. Signed-off-by: Steven Rostedt commit 75b8e98263fdb0bfbdeba60d4db463259f1fe8a2 Author: Steven Rostedt Date: Thu Feb 3 23:25:46 2011 -0500 tracing/filter: Swap entire filter of events When creating a new filter, instead of allocating the filter to the event call first and then processing the filter, it is easier to process a temporary filter and then just swap it with the call filter. By doing this, it simplifies the code. A filter is allocated and processed, when it is done, it is swapped with the call filter, synchronize_sched() is called to make sure all callers are done with the old filter (filters are called with premption disabled), and then the old filter is freed. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit bf93f9ed3a2cb89eb7e58851139d3be375b98027 Author: Steven Rostedt Date: Thu Jan 27 23:21:34 2011 -0500 tracing/filter: Increase the max preds to 2^14 Now that the filter logic does not require to save the pred results on the stack, we can increase the max number of preds we allow. As the preds are index by a short value, and we use the MSBs as flags we can increase the max preds to 2^14 (16384) which should be way more than enough. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 4a3d27e98a7f2682e96d6f863752e0424b00d691 Author: Steven Rostedt Date: Thu Jan 27 23:19:49 2011 -0500 tracing/filter: Move MAX_FILTER_PRED to local tracing directory The MAX_FILTER_PRED is only needed by the kernel/trace/*.c files. Move it to kernel/trace/trace.h. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 43cd414552d8137157e926e46361678ea867e476 Author: Steven Rostedt Date: Thu Jan 27 23:16:51 2011 -0500 tracing/filter: Optimize filter by folding the tree There are many cases that a filter will contain multiple ORs or ANDs together near the leafs. Walking up and down the tree to get to the next compare can be a waste. If there are several ORs or ANDs together, fold them into a single pred and allocate an array of the conditions that they check. This will speed up the filter by linearly walking an array and can still break out if a short circuit condition is met. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit ec126cac23945de12eb2d103374e1f7ee97c5595 Author: Steven Rostedt Date: Thu Jan 27 23:14:25 2011 -0500 tracing/filter: Check the created pred tree Since the filter walks a tree to determine if a match is made or not, if the tree was incorrectly created, it could cause an infinite loop. Add a check to walk the entire tree before assigning it as a filter to make sure the tree is correct. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 55719274188f13cff9e3bd11fdd4c0e7617cd03d Author: Steven Rostedt Date: Thu Jan 27 23:12:05 2011 -0500 tracing/filter: Optimize short ciruit check The test if we should break out early for OR and AND operations can be optimized by comparing the current result with (pred->op == OP_OR) That is if the result is true and the op is an OP_OR, or if the result is false and the op is not an OP_OR (thus an OP_AND) we can break out early in either case. Otherwise we continue processing. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 61e9dea20e1ada886cc49a9ec6fe3c6ac0de7324 Author: Steven Rostedt Date: Thu Jan 27 22:54:33 2011 -0500 tracing/filter: Use a tree instead of stack for filter_match_preds() Currently the filter_match_preds() requires a stack to push and pop the preds to determine if the filter matches the record or not. This has two drawbacks: 1) It requires a stack to store state information. As this is done in fast paths we can't allocate the storage for this stack, and we can't use a global as it must be re-entrant. The stack is stored on the kernel stack and this greatly limits how many preds we may allow. 2) All conditions are calculated even when a short circuit exists. a || b will always calculate a and b even though a was determined to be true. Using a tree we can walk a constant structure that will save the state as we go. The algorithm is simply: pred = root; do { switch (move) { case MOVE_DOWN: if (OR or AND) { pred = left; continue; } if (pred == root) break; match = pred->fn(); pred = pred->parent; move = left child ? MOVE_UP_FROM_LEFT : MOVE_UP_FROM_RIGHT; continue; case MOVE_UP_FROM_LEFT: /* Only OR or AND can be a parent */ if (match && OR || !match && AND) { /* short circuit */ if (pred == root) break; pred = pred->parent; move = left child ? MOVE_UP_FROM_LEFT : MOVE_UP_FROM_RIGHT; continue; } pred = pred->right; move = MOVE_DOWN; continue; case MOVE_UP_FROM_RIGHT: if (pred == root) break; pred = pred->parent; move = left child ? MOVE_UP_FROM_LEFT : MOVE_UP_FROM_RIGHT; continue; } done = 1; } while (!done); This way there's no strict limit to how many preds we allow and it also will short circuit the logical operations when possible. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit f76690afd05e3e163149310bdcd30234f93b3a7a Author: Steven Rostedt Date: Thu Jan 27 22:53:06 2011 -0500 tracing/filter: Free pred array on disabling of filter When a filter is disabled, free the preds. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 74e9e58c350a24139e268dd6857bbaa55c5aafcf Author: Steven Rostedt Date: Thu Jan 27 22:49:48 2011 -0500 tracing/filter: Allocate the preds in an array Currently we allocate an array of pointers to filter_preds, and then allocate a separate filter_pred for each item in the array. This adds slight overhead in the filters as it needs to derefernce twice to get to the op condition. Allocating the preds themselves in a single array removes a dereference as well as helps on the cache footprint. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 0fc3ca9a10a61a77f18710fb708b41fd99c79a56 Author: Steven Rostedt Date: Thu Jan 27 22:46:46 2011 -0500 tracing/filter: Call synchronize_sched() just once for system filters By separating out the reseting of the filter->n_preds to zero from the reallocation of preds for the filter, we can reset groups of filters first, call synchronize_sched() just once, and then reallocate each of the filters in the system group. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit c9c53ca03d6f97fdd9832d5ed3f15b30ee5cdb86 Author: Steven Rostedt Date: Thu Jan 27 22:42:43 2011 -0500 tracing/filter: Dynamically allocate preds For every filter that is made, we create predicates to hold every operation within the filter. We have a max of 32 predicates that we can hold. Currently, we allocate all 32 even if we only need to use one. Part of the reason we do this is that the filter can be used at any moment by any event. Fortunately, the filter is only used with preemption disabled. By reseting the count of preds used "n_preds" to zero, then performing a synchronize_sched(), we can safely free and reallocate a new array of preds. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 58d9a597c4275d830a819625e7d437cd6fb23fa5 Author: Steven Rostedt Date: Thu Jan 27 22:37:09 2011 -0500 tracing/filter: Move OR and AND logic out of fn() method The ops OR and AND act different from the other ops, as they are the only ones to take other ops as their arguements. These ops als change the logic of the filter_match_preds. By removing the OR and AND fn's we can also remove the val1 and val2 that is passed to all other fn's and are unused. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 6d54057d76e25c91165cda0e6e007f1811faa2be Author: Steven Rostedt Date: Thu Jan 27 22:33:26 2011 -0500 tracing/filter: Have no filter return a match The n_preds field of a file can change at anytime, and even can become zero, just as the filter is about to be processed by an event. In the case that is zero on entering the filter, return 1, telling the caller the event matchs and should be trace. Also use a variable and assign it with ACCESS_ONCE() such that the count stays consistent within the function. Cc: Tom Zanussi Signed-off-by: Steven Rostedt commit 3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e Author: Dan Carpenter Date: Mon Feb 7 22:03:35 2011 +0300 mac80211: remove unneeded check "ap" is the address of sdata->u.ap so it can never be NULL here. Also we dereferenced it on the previous line. I removed the check. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 3a2329f2680796b0c09ff207803ea880a481c3a4 Author: Mohammed Shafi Shajakhan Date: Mon Feb 7 21:08:28 2011 +0530 ath9k: Update comments for not parsing DTIM period Add few comments for not parsing DTIM period from mac80211 Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 38f37be20941a6f1931ca4c051e638f947415eab Author: Mohammed Shafi Shajakhan Date: Mon Feb 7 10:10:04 2011 +0530 mac80211: Update comments on radiotap MCS index mac80211 now supports passing MCS index to radiotap, so update the comments regarding this Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 4f3123366f78cf34ce7caab923e2b3c4fe9e16c2 Author: Felix Fietkau Date: Sat Feb 5 23:48:37 2011 +0100 mac80211: as a 4-addr station, do not receive packets for other stations Since 4-addr frames completely override the source address which will make it into the converted 802.3 frames, receiving frames for other 4-addr stations will confuse the bridging code. To be able to handle traffic for all connected devices, the bridge code will automatically turn on promiscuous mode, which triggers this problem. Signed-off-by: Felix Fietkau Reported-by: Steve Brown Signed-off-by: John W. Linville commit 180205bdb22b79cd7b2a07a5002dd747badc82f3 Author: Ben Greear Date: Fri Feb 4 15:30:24 2011 -0800 mac80211: Make some mlme timers module paramaters. This allows users to tune the connection-loss algorithms to be more or less lenient. In particular, larger null-func retries helps when using lots of virtual stations on a loaded network. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit c210de8f88215db31cf3529c9763fc3124d6e09d Author: Nick Kossifidis Date: Fri Feb 4 01:41:02 2011 +0200 ath5k: Fix fast channel switching Fast channel change fixes: a) Always set OFDM timings b) Don't re-activate PHY c) Enable only NF calibration, not AGC Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 9db4a9c7b2a3bd5b4952846bc0c2f58daa80ddd7 Author: Jesse Barnes Date: Mon Feb 7 12:26:52 2011 -0800 drm/i915: cleanup per-pipe reg usage We had some conversions over to the _PIPE macros, but didn't get everything. So hide the per-pipe regs with an _ (still used in a few places for legacy) and add a few _PIPE based macros, then make sure everyone uses them. [update: remove usage of non-existent no-op macro] [update 2: keep modesetting suspend/resume code, update to new reg names] Signed-off-by: Jesse Barnes [ickle: stylistic cleanups for checkpatch and taste] Signed-off-by: Chris Wilson commit e79a46a0302a6bf8f879da43c00373b6ed1081ea Author: Abhijith Das Date: Mon Feb 7 11:22:41 2011 -0500 GFS2: panics on quotacheck update Handle block allocation for forceful unstuffing of quota dinode during quota update using quotactl(). Also fix block reservation for special cases when quotas cross over block boundaries and update 2 blocks instead of 1. Signed-off-by: Abhi Das Signed-off-by: Steven Whitehouse commit 2360d2e8f01043632d6b651672bec66c49892f94 Author: Vasanthy Kolluri Date: Fri Feb 4 16:17:26 2011 +0000 enic: Update MAINTAINERS Signed-off-by: Christian Benvenuti Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit 0eb2602238e5aa33e0571a76aaf51a30bf32c3c2 Author: Vasanthy Kolluri Date: Fri Feb 4 16:17:21 2011 +0000 enic: Clean up: Remove support for an older version of hardware Remove support for an older version (A1) of hardware Signed-off-by: Christian Benvenuti Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit 69161425800ac6cc28ac448bef5f21d09cb4f92a Author: Vasanthy Kolluri Date: Fri Feb 4 16:17:16 2011 +0000 enic: Bug Fix: Reorder firmware devcmds - CMD_INIT and CMD_IG_VLAN_REWRITE_MODE Firmware requires CMD_IG_VLAN_REWRITE_MODE be issued before a CMD_INIT. Signed-off-by: Christian Benvenuti Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit 115d56f723c45088ddf46fac1ebba7c333039150 Author: Vasanthy Kolluri Date: Fri Feb 4 16:17:10 2011 +0000 enic: Bug Fix: Fix return values of enic_add/del_station_addr routines Fix enic_add/del_station_addr routines to return appropriate error code when an invalid address is added or deleted. Signed-off-by: Christian Benvenuti Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit 519874619f642afaf61530b0f4df3cd1e9a319e4 Author: Vasanthy Kolluri Date: Fri Feb 4 16:17:05 2011 +0000 enic: Clean up: Organize devcmd wrapper routines Organize the wrapper routines for firmware devcmds into a separate file. Signed-off-by: Christian Benvenuti Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit 8a375557e303e4d082612bc3d79b23502a2a2a38 Author: Roopa Prabhu Date: Fri Feb 4 12:57:16 2011 +0000 enic: Decouple mac address registration and deregistration from port profile set operation This patch removes VM mac address registration and deregistration code during port profile set operation. We can delay mac address registration until enic_open. Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit 9681153b460006923bb1e9d39b05b80ec09d6b4e Author: Christoph Hellwig Date: Tue Jan 25 09:06:21 2011 +0000 xfs: add lockdep annotations for the rt inodes The rt bitmap and summary inodes do not participate in the normal inode locking protocol. Instead the rt bitmap inode can be locked in any transaction involving rt allocations, and the both of the rt inodes can be locked at the same time. Add specific lockdep subclasses for the rt inodes to prevent lockdep from blowing up. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 0d8b30ad19bf13197cbcd786e2cd5a2ecef72e68 Author: Christoph Hellwig Date: Tue Jan 25 09:06:20 2011 +0000 xfs: fix xfs_get_extsz_hint for a zero extent size hint We can easily set the extsize flag without setting an extent size hint, or one that evaluates to zero. Historically the di_extsize field was only used when it was non-zero, but the commit "Cleanup inode extent size hint extraction" broke this. Restore the old behaviour, thus fixing xfsqa 090 with a debug kernel. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 04e99455ea5bb17ea7c2e7bb0970168efb736242 Author: Christoph Hellwig Date: Tue Jan 25 09:06:19 2011 +0000 xfs: only lock the rt bitmap inode once per allocation Currently both xfs_rtpick_extent and xfs_rtallocate_extent call xfs_trans_iget to grab and lock the rt bitmap inode, which results in a deadlock since the removal of the lock recursion counters in commit "xfs: simplify inode to transaction joining" Fix this by acquiring and locking the inode in xfs_bmap_rtalloc before calling into xfs_rtpick_extent and xfs_rtallocate_extent. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit cabb5bd7ff4d6963ec9e67f958fc30e7815425e6 Author: Hans Rosenfeld Date: Mon Feb 7 18:10:39 2011 +0100 x86, amd: Support L3 Cache Partitioning on AMD family 0x15 CPUs L3 Cache Partitioning allows selecting which of the 4 L3 subcaches can be used for evictions by the L2 cache of each compute unit. By writing a 4-bit hexadecimal mask into the the sysfs file /sys/devices/system/cpu/cpuX/cache/index3/subcaches, the user can set the enabled subcaches for a CPU. The settings are directly read from and written to the hardware, so there is no way to have contradicting settings for two CPUs belonging to the same compute unit. Writing will always overwrite any previous setting for a compute unit. Signed-off-by: Hans Rosenfeld Cc: LKML-Reference: <1297098639-431383-1-git-send-email-hans.rosenfeld@amd.com> [ -v3: minor style fixes ] Signed-off-by: Ingo Molnar commit 8121d91c02a1be4884821599472acf405efdc3de Author: Dan Carpenter Date: Mon Feb 7 20:25:19 2011 +0300 ALSA: USB: 6fire: signedness bug in usb6fire_pcm_prepare() rt->rate is an unsigned char so it's never equal to -1. It's not a huge problem because the invalid rate is caught inside the call to usb6fire_pcm_set_rate() which returns -EINVAL. But if we fix the test then it prints out the correct error message so that's good. Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit 8d7e3de1e019238211fa06e109437a13cae62004 Author: Chris Wilson Date: Mon Feb 7 15:23:02 2011 +0000 drm/i915: Skip the no-op domain changes when already in CPU|GTT domains Removes some superfluous fluff from tracing... Signed-off-by: Chris Wilson commit db53a302611c06bde01851f61fa0675a84ca018c Author: Chris Wilson Date: Thu Feb 3 11:57:46 2011 +0000 drm/i915: Refine tracepoints A lot of minor tweaks to fix the tracepoints, improve the outputting for ftrace, and to generally make the tracepoints useful again. It is a start and enough to begin identifying performance issues and gaps in our coverage. Signed-off-by: Chris Wilson commit 124bb83cd7de4d851af7595650233fb9e9279d5d Author: Masami Hiramatsu Date: Fri Feb 4 21:52:11 2011 +0900 perf probe: Add bitfield member support Add bitfield member accessing support to probe arguments. Suggested-by: Arnaldo Carvalho de Melo Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110204125211.9507.60265.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu [ committer note: Fixed up '%lu' use for return of BYTES_TO_BITS ('%zd') ] Signed-off-by: Arnaldo Carvalho de Melo commit a2221796256ea7b236cec6bf027c1c1de5b8ccd7 Author: Borislav Petkov Date: Mon Feb 7 15:32:18 2011 +0100 perf annotate: Fix build error A small fix for when NO_NEWT_SUPPORT is defined. Add a missing "struct" to the function prototype. Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Tom Zanussi LKML-Reference: <20110207143218.GA31197@kryptos.osrc.amd.com> Signed-off-by: Borislav Petkov Signed-off-by: Arnaldo Carvalho de Melo commit fb7d0b3cefb80a105f7fd26bbc62e0cbf9192822 Author: Kyle McMartin Date: Mon Jan 24 11:13:04 2011 -0500 perf tool: Fix gcc 4.6.0 issues GCC 4.6.0 in Fedora rawhide turned up some compile errors in tools/perf due to the -Werror=unused-but-set-variable flag. I've gone through and annotated some of the assignments that had side effects (ie: return value from a function) with the __used annotation, and in some cases, just removed unused code. In a few cases, we were assigning something useful, but not using it in later parts of the function. kyle@dreadnought:~/src% gcc --version gcc (GCC) 4.6.0 20110122 (Red Hat 4.6.0-0.3) Cc: Ingo Molnar LKML-Reference: <20110124161304.GK27353@bombadil.infradead.org> Signed-off-by: Kyle McMartin [ committer note: Fixed up the annotation fixes, as that code moved recently ] Signed-off-by: Arnaldo Carvalho de Melo commit d9bc7e9f32716901c617e1f0fb6ce0f74f172686 Author: Chris Wilson Date: Mon Feb 7 13:09:31 2011 +0000 drm/i915: Fix infinite loop regression from 21dd3734 By returning EAGAIN upon a wedged GPU before attempting to wait, we would hit an infinite loop of repeating operation without ever progressing. Instead this needs to be EIO so that userspace knows that the GPU is truly wedged and not in the process of error recovery. Similarly, we need to handle the error recovery during i915_gem_fault. Signed-off-by: Chris Wilson commit dcbe6f2b3d136995915e2f9ecc7d4f3b28f47b6c Author: Jesse Barnes Date: Fri Feb 4 13:57:30 2011 -0800 drm/i915: the PCH reference clocks are global, so don't clobber unconditionally The PCH can drive several reference clocks simultaneously, and needs to with multiple display configurations. So we can't just clobber the existing state everytime we set a mode, we need to take into account what the other CRTCs are doing at the time. Doing so fixes an issue where you'd lose the LVDS display at boot if you had an LVDS+DP config. [updated: init bools and check CRTC status correctly] Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 291906f11c90467ce552089ea9f7b393f41a87bb Author: Jesse Barnes Date: Wed Feb 2 12:28:03 2011 -0800 drm/i915: add port assertion check when disabling transcoders When a transcoder is disabled, any ports pointing at it should also be disabled. If they're not, we may fail to disable the transcoder, leading to blank displays. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 19ec135838f032ad1aa0610b173ad78c16d53d47 Author: Jesse Barnes Date: Wed Feb 2 12:28:02 2011 -0800 drm/i915: don't check plane vs pipe enable on ILK+ These bits have a different meaning on ILK+, where planes are hardwired to pipes. Fixing this avoid some spurious assertion failures. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit cb3543c6b14b145c6e35d0a36a48abfc6fe18600 Author: Eric Anholt Date: Wed Feb 2 12:08:07 2011 -0800 drm/i915: Set the transcoder port to none when disabling DP. The specs say to do so. Signed-off-by: Eric Anholt Signed-off-by: Chris Wilson commit 308977ac03117706c342099a40919b3da2667cce Author: Chris Wilson Date: Wed Feb 2 10:41:20 2011 +0000 drm/i915: Use DEBUG_KMS for the self-refresh watermarks For consistency and segregation from the noisy DRM_DEBUG(). Signed-off-by: Chris Wilson commit b6f7833b9712c0c01f94cc3a518dc62b07bd610b Author: Chris Wilson Date: Tue Feb 1 14:15:55 2011 +0000 drm/i915: Include 'i915_error_state' hint for when the GPU catches fire Signed-off-by: Chris Wilson commit 338ee25393a5627e8ded5819147f98b919656ce9 Author: Lars-Peter Clausen Date: Sun Feb 6 10:04:11 2011 +0100 ASoC: codecs: wm8753: Fix DAI mode switching The wm8753 codec supports switching between different DAI modes. The current drivers tries to implement this by changing the DAI driver at runtime. But to properly work this would require support from the ASoC core. So this patch takes a different approch on how the DAI mode switching is implemented. The only difference, from a driver point of view, between the different DAI modes is how to program the DAI format to the hardware. So what this patch is, it stores the current format for each DAI in the drivers private struct and when the DAI mode is changed the format gets simply reprogrammed according to the new DAI mode. Futhermore this patch restricts the changing of the DAI format to when the codec is inactive. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7c9989a76e62ceca90e5f31f8920fd6b7b8b6525 Author: Dan Carpenter Date: Mon Feb 7 11:38:55 2011 +0300 IPVS: precedence bug in ip_vs_sync_switch_mode() '!' has higher precedence than '&'. IP_VS_STATE_MASTER is 0x1 so the original code is equivelent to if (!ipvs->sync_state) ... Signed-off-by: Dan Carpenter Signed-off-by: Hans Schillstrom Signed-off-by: Simon Horman commit 480b08d0bb1aab29de2545625767dac55c7dcb59 Author: Vinod Koul Date: Sun Feb 6 15:35:48 2011 +0530 ASoC: mid-x86: Fix dependency on intel_sst driver Enabling medfield asoc driver causes compliation error when intel_sst is not selected ERROR: "register_sst_card" [sound/soc/mid-x86/snd-soc-sst-platform.ko] undefined! This patch puts proper dependency to elimate build error Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Reported-by: Andrew Morton Signed-off-by: Mark Brown commit 1ff511e35ed87cc2ebade9e678e4a2fe39b6f9c5 Author: Masami Hiramatsu Date: Fri Feb 4 21:52:05 2011 +0900 tracing/kprobes: Add bitfield type Add bitfield type for tracing arguments on kprobe-tracer. The syntax of a bitfield type is: b@/ e.g. Accessing 2 bits-width field with 4 bits-offset in 32 bits-width data at 4 bytes offseted from the address pointed by AX register: +4(%ax):b2@4/32 Since the width of container data depends on the arch, so I just added the container-size at the end. Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110204125205.9507.11363.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit e3745369986ddcdaa19f70e2d24e658876b97e84 Author: Masami Hiramatsu Date: Fri Feb 4 21:51:59 2011 +0900 tracing/kprobes: Support longer (>128 bytes) command Expand command line buffer of kprobe-tracer to 4096 bytes. Reported-by: Arnaldo Carvalho de Melo Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110204125159.9507.20895.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit 76022db323dd6d7c6958df3d595f7dedf7a14778 Author: Masami Hiramatsu Date: Fri Feb 4 21:51:53 2011 +0900 tracing/kprobes: Cleanup strict_strtol() using code Since strict_strtol() accepts minus digits started with '-', it doesn't need to invert after converting. Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110204125153.9507.49335.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit f50c2169bd054984e976e67e8651d28f3caf6ba3 Author: Franck Bui-Huu Date: Thu Jan 13 11:18:30 2011 +0100 perf probe: Rewrite find_lazy_match_lines() by using getline(3) Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu Cc: lkml LKML-Reference: Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit ef4d001d79ac4bab6c2d81e9986a42059f877ec3 Author: Denis Kirjanov Date: Sat Feb 5 20:39:38 2011 +0000 perf top: Use pid_t for target_{pid|tid} Use pid_t data type for target_{pid|tid} vars. Cc: Ingo Molnar LKML-Reference: <20110205203938.GA15328@hera.kernel.org> Signed-off-by: Denis Kirjanov [ committer note: those variables are now in struct perf_top, fixed ] Signed-off-by: Arnaldo Carvalho de Melo commit 9c56dfeb784a586713f467e2028a127a2a58a238 Author: Michael Witten Date: Thu Feb 3 22:10:55 2011 -0600 perf tools: Makefile: Use $(QUIET_GEN) for perf.so So that we get this: CC /home/acme/git/build/perf/bench/mem-memcpy-x86-64-asm.o GEN perf-archive * GEN /home/acme/git/build/perf/python/perf.so CC /home/acme/git/build/perf/builtin-annotate.o Instead of silently building the python binding. LKML-Reference: <1296890359-22659-1-git-send-email-mfwitten@gmail.com> Signed-off-by: Michael Witten Signed-off-by: Arnaldo Carvalho de Melo commit 075de90c46562de1435db16c2129ec4ff92e5bd2 Merge: c7f9a6f 3653246 Author: Ingo Molnar Date: Mon Feb 7 08:45:48 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit c7f9a6f377fa64e5a74f8c128d4349765c28fab1 Merge: fe4b04f 8dbdea8 Author: Ingo Molnar Date: Mon Feb 7 08:44:11 2011 +0100 Merge branch 'linus' into perf/core Merge reason: Pick up perf fixes that are now upstream Signed-off-by: Ingo Molnar commit a250b9fdc53a286d32e22f21170382a46b3a3ef5 Author: Dave Airlie Date: Wed Dec 15 07:13:55 2010 +1000 drm: add usb framework This adds an initial framework to plug USB graphics devices into the drm/kms subsystem. I've started writing a displaylink driver using this interface. Signed-off-by: Dave Airlie commit 8410ea3b95d105a5be5db501656f44bbb91197c1 Author: Dave Airlie Date: Wed Dec 15 03:16:38 2010 +1000 drm: rework PCI/platform driver interface. This abstracts the pci/platform interface out a step further, we can go further but this is far enough for now to allow USB to be plugged in. The drivers now just call the init code directly for their device type. Signed-off-by: Dave Airlie commit ff72145badb834e8051719ea66e024784d000cb4 Author: Dave Airlie Date: Mon Feb 7 12:16:14 2011 +1000 drm: dumb scanout create/mmap for intel/radeon (v3) This is just an idea that might or might not be a good idea, it basically adds two ioctls to create a dumb and map a dumb buffer suitable for scanout. The handle can be passed to the KMS ioctls to create a framebuffer. It looks to me like it would be useful in the following cases: a) in development drivers - we can always provide a shadowfb fallback. b) libkms users - we can clean up libkms a lot and avoid linking to libdrm_*. c) plymouth via libkms is a lot easier. Userspace bits would be just calls + mmaps. We could probably mark these handles somehow as not being suitable for acceleartion so as top stop people who are dumber than dumb. Signed-off-by: Dave Airlie commit 1f692a14cbfbeb11f9a9c16f25c8ecb8ab50d3d5 Author: Arnd Bergmann Date: Tue Jan 25 23:17:15 2011 +0100 drm/i810: remove the BKL SMP i810 systems were practically nonexistent and the configuration was not officially supported by Intel at the time when Pentium-III was common. With this change, it is still possible to build a distribution kernel that has support for SMP and includes the i810 driver without the BKL. As a precaution, check for the theoretical SMP case at run time and refuse to load the driver. We also need to disable CONFIG_PREEMPT builds for this driver. Signed-off-by: Arnd Bergmann Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dave Airlie commit 7f50684717511d30bba180902105c4cd4efca732 Author: Arnd Bergmann Date: Tue Jan 25 23:17:16 2011 +0100 drm: remove i830 driver This driver is one of the last users of the big kernel lock, which is going away. All the hardware supported by this driver also works with the newer i915 driver, and recent X.org releases only work with that driver anyway. Signed-off-by: Arnd Bergmann Cc: Chris Wilson Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dave Airlie commit 6e30dd4e3935ddb4e7dd27d5be7a6e5504e64a27 Author: Vladislav Zolotarov Date: Sun Feb 6 11:25:41 2011 -0800 bnx2x: Proper netdev->ndo_set_rx_mode() implementation. Completed the bnx2x_set_rx_mode() to a proper netdev->ndo_set_rx_mode implementation: - Added a missing configuration of a unicast MAC addresses list. - Changed bp->dma_lock from being a mutex to a spinlock as long as it's taken under netdev->addr_list_lock now. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit a8c94b9188bf6012d9b6c3d37f324bd6c7d2924e Author: Vladislav Zolotarov Date: Sun Feb 6 11:21:02 2011 -0800 bnx2x: MTU for FCoE L2 ring Always configure an FCoE L2 ring with a mini-jumbo MTU size (2500). To do that we had to move the rx_buf_size parameter from per function level to a per ring level. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 36532461a0f60bb36c5470a0326f7394f19db23c Author: Arnaldo Carvalho de Melo Date: Sun Feb 6 14:54:44 2011 -0200 perf top: Ditch private annotation code, share perf annotate's Next step: Live TUI annotation in perf top, just press enter on a symbol line. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a87f29cbbcbd5bd1e4990367cd18967e9bbeacff Author: Artem Bityutskiy Date: Sun Oct 31 18:55:30 2010 +0200 UBI: always re-read in case of read failures When the read operation fails, UBI tries to re-read several times in a hope that one of the subsequent reads may succeed. However, currently UBI re-reads only if MTD failed to read all data, but does not re-reads if all the data were read, but with an integrity error (-EBADMSB). This patch makes UBI to always re-try reading. This should be useful for reading NAND pages with unstable bits - re-reading may help to get correct data. Signed-off-by: Artem Bityutskiy commit 80b38fffab9a2d86c252addce5a520dcf8f2fc66 Author: Wey-Yi Guy Date: Fri Feb 4 10:46:41 2011 -0800 iwlwifi: fix compiling error with different configuration When .config has different configuration, it might fail to compile iwlwifi. fix it Signed-off-by: Wey-Yi Guy commit 2f115cf24ea3f5010f7361d2098545edf7a07add Author: Johannes Berg Date: Fri Feb 4 06:57:45 2011 -0800 iwlwifi: remove unnecessary locking This code, and the places that set the variable is_internal_short_scan and the vif pointers are all protected by the mutex, there's no point in locking the spinlock here as well (any more). Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit fef2deb31f6523203a3fa1af485a5f1fef19cf6b Author: Artem Bityutskiy Date: Fri Oct 29 08:34:50 2010 +0300 UBI: cleanup comments about corrupted PEBs Just make them a bit more readable and explanatory. Signed-off-by: Artem Bityutskiy commit 6c1e875ca6f3a47b40dce715bd07fdfdb8388d55 Author: Artem Bityutskiy Date: Sun Oct 31 17:54:14 2010 +0200 UBI: add slab cache for ubi_scan_leb objects During scanning UBI allocates one struct ubi_scan_leb object for each PEB, so it can end up allocating thousands of them. Use slab cache to reduce memory consumption for these 48-byte objects, because currently used 'kmalloc()' ends up allocating 64 bytes per object, instead of 48. Signed-off-by: Artem Bityutskiy commit 7950d023c562823345892aac2e7c6a49f8de9ad1 Author: Artem Bityutskiy Date: Fri Nov 19 17:05:36 2010 +0200 UBI: use raw mtd read function in debugging code This change affects only the debugging code. Namely, use mtd->read() function instead of ubi_io_read() to avoid bit-flips injection (ubi_dbg_is_bitflip()) which we do not want on the debugging path. Signed-off-by: Artem Bityutskiy commit 276832d878d8a892ac7b40fd0ee07fe757e080c7 Author: Artem Bityutskiy Date: Sat Nov 13 15:08:29 2010 +0200 UBI: try to reveal buggy MTD drivers When reading data from the flash, corrupt the buffer we are about to read to. The idea is to fix the following possible situation: 1. The buffer contains data from previous operation, e.g., read from another PEB previously. The data looks like expected, e.g., if we just do not read anything and return - the caller would not notice this. E.g., if we are reading a VID header, the buffer may contain a valid VID header from another PEB. 2. The driver is buggy and returns use success or -EBADMSG or -EUCLEAN, but it does not actually put any data to the buffer. This may confuse UBI or upper layers - they may think the buffer contains valid data while in fact it is just old data. Thus, try to reveal such buggy MTD drivers with simple debugging code which fills the read buffer with 0x12 constant. Signed-off-by: Artem Bityutskiy commit 8c559d30b4e59cf6994215ada1fe744928f494bf Author: Vasiliy Kulikov Date: Fri Feb 4 15:24:19 2011 +0300 UBIFS: restrict world-writable debugfs files Don't allow everybody to dump sensitive information about filesystems. Signed-off-by: Vasiliy Kulikov Signed-off-by: Artem Bityutskiy commit be7b42a5cb4c5050bcab4f57022007155c119d45 Author: Artem Bityutskiy Date: Sun Feb 6 16:41:06 2011 +0200 UBIFS: describe UBIFS recovery logic some more This patch adds more commentaries about UBIFS recovery logic which should explain the famous UBIFS "corrupt empty space" errors. Signed-off-by: Artem Bityutskiy commit f1e2701de02cff6d988b1dd49960620d5720cb89 Author: Arnaldo Carvalho de Melo Date: Sat Feb 5 18:51:38 2011 -0200 perf annotate: Separate objdump parsing from actual screen rendering Because in 'perf top' we'll need to parse just once and then, as samples come, render multiple times with evolving counter values. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 822ed64c5b5d15474c6abb1834726643e2cff558 Author: Artem Bityutskiy Date: Sun Feb 6 14:49:26 2011 +0200 UBIFS: remove double semicolon Just a tiny clean-up - remove ;; Signed-off-by: Artem Bityutskiy commit 7eb38527c4e485923fa3f87d11ce11b4e6ebf807 Author: David S. Miller Date: Sat Feb 5 18:13:45 2011 -0800 tcp: Add reference to initial CWND ietf draft. Suggested by Alexander Zimmermann Signed-off-by: David S. Miller commit 285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06 Merge: 1fb0ef3 a9fe8d5 Author: Thomas Gleixner Date: Sat Feb 5 21:49:57 2011 +0100 Merge branch 'irq/urgent' into irq/core Reason: Get mainline fixes integrated. Further patches conflict with them Signed-off-by: Thomas Gleixner commit d040bd363824f9f0ad6610b91ee6c65f292c066c Author: Arnaldo Carvalho de Melo Date: Sat Feb 5 15:37:31 2011 -0200 perf annotate: Config options for symbol__tty_annotate Max line# that should be printed, minimum percentage filter, just like 'perf top', alas, due to it :-) Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 2f525d0148ef2734c8a172201e5e1e9167a8a5fd Author: Arnaldo Carvalho de Melo Date: Fri Feb 4 13:43:24 2011 -0200 perf annotate: Support multiple histograms in annotation The perf annotate tool continues aggregating everything on just one histograms, but to support the top model add support for one histogram perf evsel in the evlist. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 78f7defedbb4da73b9a07635c357c1afcaa55c8f Author: Arnaldo Carvalho de Melo Date: Fri Feb 4 09:45:46 2011 -0200 perf annotate: Move annotate functions to util/ They will be used by perf top, so that we have just one set of routines to do annotation. Rename "struct sym_priv" to "struct annotation", etc, to clarify this code a bit. Rename "struct sym_ext" to "struct source_line", to give it a meaningful name, that clarifies that it is a the result of an addr2line call, that is sorted by percentage one particular source code line appeared in the annotation. And since we're moving things around also rename 'sym_hist->ip' to 'sym_hist->addr' as we want to do data structure annotation at some point. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 764328d3209dd81b02a55722556b07b6f35e3ca0 Author: Arnaldo Carvalho de Melo Date: Fri Feb 4 07:33:24 2011 -0200 perf top: Remove superfluous name_len field From the sym_entry struct, struct symbol already has this field. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 130551928195bdef3369e13572b9a383400681bb Author: Hartley Sweeten Date: Thu Jan 27 17:50:53 2011 +0100 ARM: 6643/1: ep93xx: add framebuffer support to edb93xx boards The ep9307, ep9312, and ep9315 variants of the ep93xx processor include the raster engine needed for framebuffer support. This allows the EDB93xx boards with those processors to use the framebuffer driver. Tested on an EDB9307A with the following kernel parameters: video=640x480-16@60 video=1024x768-16@60 Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit fbbb4959eee4762a2fa60c6352be2284ebb1cb67 Author: Rene Sapiens Date: Tue Jan 18 03:19:14 2011 +0000 staging: tidspbridge: set12 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: dw_buf_size buf_size dw_bytes bytes pattr attr pdw_arg arg ph_cmm_mgr cmm_mgr ph_event event ph_node node ph_stream stream pmask mask pp_argv argv pp_buf_va buf_va pstatus status ul_flags flags ul_seg_id seg_id usize size Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 121e8f9b9fca6a05602cea1245450e653f0d4ba1 Author: Rene Sapiens Date: Tue Jan 18 03:19:13 2011 +0000 staging: tidspbridge: set11 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: hio_mgr io_mgr dw_api_reg_base api_reg_base dw_api_clk_base api_clk_base ap_channel channels pio_requests io_requests pio_completions io_completions pndb_props ndb_props pndb_props_size ndb_props_size pu_num_nodes num_nodes pu_num_procs num_procs psz_path_name sz_path_name pu_index index pargs args pu_allocated allocated psize size hnotification notification pp_rsv_addr rsv_addr prsv_addr rsv_addr pmpu_addr mpu_addr pp_map_addr map_addr ul_map_attr map_attr undb_props_size ndb_props_size Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit ee4317f78c24cf85efd067f4c09319e281c4fa4a Author: Rene Sapiens Date: Tue Jan 18 03:19:12 2011 +0000 staging: tidspbridge: set10 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: hnext next hnode node hprev prev hroot root hstream stream pbuf buf pcb_arg cb_arg pdspheap_list dspheap_list pmsg msg ps_name name pstr_create_phase_fxn str_create_phase_fxn pstr_delete_phase_fxn str_delete_phase_fxn pstr_dev_name str_dev_name pstr_event_name str_event_name pstr_execute_phase_fxn str_execute_phase_fxn pstr_i_alg_name str_i_alg_name udma_chnl_id dma_chnl_id un_bufs_in_strm bufs_in_strm usm_buf_size sm_buf_size Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit a534f17bd50834188b24e0a573c22c3285e7b1bb Author: Rene Sapiens Date: Tue Jan 18 03:19:11 2011 +0000 staging: tidspbridge: set9 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: hprocessor processor udma_priority dma_priority udsp_data_mau_size dsp_data_mau_size udsp_heap_addr dsp_heap_addr udsp_heap_res_addr dsp_heap_res_addr udsp_heap_virt_addr dsp_heap_virt_addr udsp_mau_size dsp_mau_size udsp_word_size dsp_word_size ugpp_heap_addr gpp_heap_addr ugpp_heap_virt_addr gpp_heap_virt_addr us_data2 data2 us_data3 data3 uc_data4 data4 uc_data5 data5 uc_data6 data6 us_load_type load_type usm_length sm_length utimeout timeout uwc_deadline wc_deadline uwc_execution_time wc_execution_time uwc_period wc_period Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 085467b8f5e60a2fe9ef85031ab40bd8724fcac6 Author: Rene Sapiens Date: Mon Jan 17 18:36:52 2011 -0600 staging: tidspbridge: set8 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: hbridge_context bridge_context hchnl_mgr chnl_mgr hcmm_mgr cmm_mgr hdcd_mgr dcd_mgr hdeh_mgr deh_mgr hdev_obj dev_obj hdrv_obj drv_obj hmgr_obj mgr_obj hmsg_mgr msg_mgr hnode_mgr node_mgr psz_last_coff last_coff ul_resource resource ul_seg_id seg_id ul_size size ul_sm_size sm_size ul_total_free_size total_free_size ul_total_in_use_cnt total_in_use_cnt ul_total_seg_size total_seg_size ul_trace_buffer_begin trace_buffer_begin ul_trace_buffer_current trace_buffer_current ul_trace_buffer_end trace_buffer_end ul_unit unit ul_virt_size virt_size us_dsp_mau_size dsp_mau_size us_dsp_word_size dsp_word_size Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 6c66e948d2c8254c8435f27eacb7f8657ce62dec Author: Rene Sapiens Date: Tue Jan 18 03:19:09 2011 +0000 staging: tidspbridge: set7 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: ul_gpp_phys gpp_phys ul_gpp_read_pointer gpp_read_pointer ul_gpp_size gpp_size ul_gpp_va gpp_va ul_heap_size heap_size ul_internal_mem_size internal_mem_size ul_in_use_cnt in_use_cnt ul_len_max_free_block len_max_free_block ul_max max ul_min_block_size min_block_size ul_min min ul_mpu_addr mpu_addr ul_n_bytes bytes ul_num_alloc_blocks num_alloc_blocks ul_number_bytes number_bytes ul_num_chnls num_chnls ul_num_free_blocks num_free_blocks ul_num_gppsm_segs num_gppsm_segs ul_pos pos ul_reserved reserved Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit dab7f7fee09b28034af3cac527b16927e4e2a193 Author: Rene Sapiens Date: Tue Jan 18 03:19:08 2011 +0000 staging: tidspbridge: set6 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: pfn_write write pf_phase_split phase_split ul_alignment alignment ul_bufsize bufsize ul_bufsize_rms bufsize_rms ul_chnl_buf_size chnl_buf_size ul_chnl_offset chnl_offset ul_code_mem_seg_mask code_mem_seg_mask ul_dais_arg dais_arg ul_data1 data1 ul_data_mem_seg_mask data_mem_seg_mask ul_dsp_addr dsp_addr ul_dsp_res_addr dsp_res_addr ul_dsp_size dsp_size ul_dsp_va dsp_va ul_dsp_virt dsp_virt ul_entry entry ul_external_mem_size external_mem_size ul_fxn_addrs fxn_addrs ul_gpp_pa gpp_pa Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 09f133045c57c479cad02d44791534df3b5b056e Author: Rene Sapiens Date: Tue Jan 18 03:19:07 2011 +0000 staging: tidspbridge: set5 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: pfn_dev_create by dev_create pfn_dev_destroy dev_destroy pfn_exit exit pfn_get_fxn_addr get_fxn_addr pfn_init init pfn_io_create io_create pfn_io_destroy io_destroy pfn_io_get_proc_load io_get_proc_load pfn_io_on_loaded io_on_loaded pfn_load load pfn_msg_create msg_create pfn_msg_create_queue msg_create_queue pfn_msg_delete msg_delete pfn_msg_delete_queue msg_delete_queue pfn_msg_get msg_get pfn_msg_put msg_put pfn_msg_register_notify msg_register_notify pfn_msg_set_queue_id msg_set_queue_id pfn_ovly ovly pfn_unload unload Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit e17ba7f2020a38b3e5bc3f7cafc595d0ac639094 Author: Rene Sapiens Date: Tue Jan 18 03:19:06 2011 +0000 staging: tidspbridge: set4 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: pfn_brd_set_state brd_set_state pfn_brd_start brd_start pfn_brd_status brd_status pfn_brd_stop brd_stop pfn_brd_write brd_write pfn_chnl_add_io_req chnl_add_io_req pfn_chnl_cancel_io chnl_cancel_io pfn_chnl_close chnl_close pfn_chnl_create chnl_create pfn_chnl_destroy chnl_destroy pfn_chnl_flush_io chnl_flush_io pfn_chnl_get_info chnl_get_info pfn_chnl_get_ioc chnl_get_ioc pfn_chnl_get_mgr_info chnl_get_mgr_info pfn_chnl_idle chnl_idle pfn_chnl_open chnl_open pfn_chnl_register_notify chnl_register_notify pfn_create create pfn_delete delete pfn_dev_cntrl dev_cntrl Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 3c882de542f67d0a7768f2e64c017e3657b519b3 Author: Rene Sapiens Date: Tue Jan 18 03:19:05 2011 +0000 staging: tidspbridge: set3 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: dw_seg_base_va seg_base_va dw_self_loop self_loop dw_state state dw_tc_endianism tc_endianism dw_test_base test_base dw_type type dw_val1 val1 dw_val2 val2 dw_val3 val3 dw_va va dw_virt_base virt_base dw_vm_base vm_base dw_vm_size vm_size pfn_allocate allocate pfn_brd_mem_copy brd_mem_copy pfn_brd_mem_map brd_mem_map pfn_brd_mem_un_map brd_mem_un_map pfn_brd_mem_write brd_mem_write pfn_brd_monitor brd_monitor pfn_brd_read brd_read Signed-off-by: Rene Sapiens Signed-off-by: Omar Ramirez Luna commit 5108de0ae06190f2ab54b9a1da315b77b33be1e2 Author: Rene Sapiens Date: Tue Jan 18 03:19:04 2011 +0000 staging: tidspbridge: set2 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: Original: Replacement: dw_dsp_base_addr dsp_base_addr dw_dmmu_base dmmu_base dw_index index dw_int_addr int_addr dw_internal_size internal_size dw_last_output last_output dw_mem_base mem_base dw_mem_length mem_length dw_mem_phys mem_phys dw_mode mode dw_num_chnls num_chnls dw_offset_for_monitor offset_for_monitor dw_output_mask output_mask dw_page_size page_size dw_pa pa dw_per_base per_base dw_per_pm_base per_pm_base dw_public_rhea public_rhea dw_seg_base_pa seg_base_pa Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit b4da7fc381c51d42c231f97de912b89dbabe8928 Author: Rene Sapiens Date: Tue Jan 18 03:19:03 2011 +0000 staging: tidspbridge: set1 remove hungarian from structs hungarian notation will be removed from the elements inside structures, the next varibles will be renamed: dw_api_reg_base api_reg_base dw_brd_state brd_state dw_chnl_buf_size chnl_buf_size dw_chnl_offset chnl_offset dw_cmd cmd dw_core_pm_base core_pm_base dw_dsp_base dsp_base dw_dsp_base_va dsp_base_va dw_dsp_bufs dsp_bufs dw_dsp_buf_size dsp_buf_size dw_dsp_clk_m2_base dsp_clk_m2_base dw_dsp_ext_base_addr dsp_ext_base_addr dw_dsp_phys_addr_offset dsp_phys_addr_offset dw_dsp_start_add dsp_start_add dw_err_mask err_mask dw_gpp_base_pa gpp_base_pa dw_api_clk_base api_clk_base dw_api_reg_base api_reg_base dw_arg arg dw_arg1 arg1 dw_arg2 arg2 dw_chnl_buf_size chnl_buf_size Signed-off-by: Rene Sapiens Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 92d0293038e49151367e38f751f327c8f2c066f6 Author: Ramos Falcon, Ernesto Date: Mon Dec 20 21:23:08 2010 +0000 staging: tidspbridge: remove code referred by OPT_ZERO_COPY_LOADER Remove code referred by OPT_ZERO_COPY_LOADER since it is not used. Signed-off-by: Ernesto Ramos Signed-off-by: Omar Ramirez Luna commit 157bc26dacc2f30ee64fc7eea2babbdc65052803 Author: Armando Uribe Date: Fri Dec 17 01:18:33 2010 -0600 staging: tidspbridge: Remove trivial header files Remove the header files that contains few declarations and can be merged onto more generic headers. Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 77927240749e7248fd637c5dadb6893f6b0381ab Author: Armando Uribe Date: Fri Dec 17 01:18:32 2010 -0600 staging: tidspbridge: Remove unused typedefs Unsed typedefs are removed, because of there are not used or because previous clean ups. Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 5db9e2bf44ec0dcf36e513499c77a294a9dc2774 Author: Armando Uribe Date: Fri Dec 17 01:18:31 2010 -0600 staging: tidspbridge: Remove unused structs Remove unused structs and its dependencies, like references in other structs or as arguments of certain functions. Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 57e6a9f2a8472493fe407227b047f5284d8a4540 Author: Armando Uribe Date: Fri Dec 17 01:18:30 2010 -0600 staging: tidspbridge: Remove unused functions Remove functions that are not used at all, also remove the dependencies of this functions like struct members, comments and calls. Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 2c36fac48587265311b015b7a36b2b860cf21ccd Author: Armando Uribe Date: Fri Dec 17 01:18:29 2010 -0600 staging: tidspbridge: Remove unused defined constants Remove defined constants not being used. Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit c378204afacc627330a9a1aeb5b5cd6e3d821717 Author: Laurent Pinchart Date: Sun Dec 12 13:39:37 2010 +0000 staging: tidspbridge: Fix atoi to support hexadecimal numbers correctly For some strange reason, the DSP base image node/object properties description string stores hexadecimal numbers with a 'h' or 'H' suffix instead of a '0x' prefix. This causes parsing issue because the dspbridge atoi() implementation relies on strict_strtoul(), which will return an error because of the trailing 'h' character. As the atoi() return value is never checked for an error anyway, replace strict_strtoul() with simple_strtoul() to ignore the suffix. This fix gets rid of the following assertion failed messages that were printed when running the dsp-dummy test application. drivers/staging/tidspbridge/rmgr/nldr.c, line 1691: Assertion (segid == MEMINTERNALID || segid == MEMEXTERNALID) failed. Signed-off-by: Laurent Pinchart Signed-off-by: Omar Ramirez Luna commit 57104f0fbe5bb35694eb470530850a71ef2f8063 Author: Ionut Nicu Date: Thu Dec 9 21:47:37 2010 +0000 staging: tidspbridge: rmgr/node.c code cleanup Reorganized some code in rmgr/node.c to increase its readability. Most of the changes reduce the code indentation level and simplifiy the code. No functional changes were done. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit a994b051b6cb246bb8843b3fbb7dea4185a01399 Author: Omar Ramirez Luna Date: Wed Dec 8 22:20:23 2010 +0000 staging: tidspbridge: use the right type for list_is_last Removes the following warning: CC [M] drivers/staging/tidspbridge/rmgr/rmm.o drivers/staging/tidspbridge/rmgr/rmm.c: In function 'rmm_alloc': drivers/staging/tidspbridge/rmgr/rmm.c:147: warning: passing argument 1 of 'list_is_last' from incompatible pointer type include/linux/list.h:170: note: expected 'const struct list_head *' but argument is of type 'struct rmm_ovly_sect *' Signed-off-by: Omar Ramirez Luna Acked-by: Laurent Pinchart Acked-by: Ionut Nicu commit ba44df6f8875c0e56d5923d742face59d81b8dc7 Author: Ionut Nicu Date: Sun Nov 21 10:46:29 2010 +0000 staging: tidspbridge: pmgr code cleanup Reorganized some code in the pmgr module to increase its readability. No functional changes were done. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit d65c14b3611ca5e0ed64305faddd39e604f618da Author: Ionut Nicu Date: Sun Nov 21 10:46:28 2010 +0000 staging: tidspbridge: core code cleanup Reorganized some code in the core module to increase its readability. Most of the changes reduce the code indentation level and simplifiy the code. No functional changes were done. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit edbeef96473fac02c7aa21db0c9de23cb6299288 Author: Ionut Nicu Date: Sun Nov 21 10:46:27 2010 +0000 staging: tidspbridge: remove custom linked list Now that all users of lst_list have been converted to the standard linux list_head API, we can remove the associated header file. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit 0005391f30a9b36e10cc9a4b6e0fa12b1db680c0 Author: Ionut Nicu Date: Sun Nov 21 10:46:26 2010 +0000 staging: tidspbridge: convert rmgr to list_head Convert the rmgr module of the tidspbridge driver to use struct list_head instead of struct lst_list. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit 5fb45dac37615f0c33b59741d42b0853125c6f7d Author: Ionut Nicu Date: Sun Nov 21 10:46:25 2010 +0000 staging: tidspbridge: convert pmgr to list_head Convert the pmgr module of the tidspbridge driver to use struct list_head instead of struct lst_list. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit 3c6bf30f1e520b250242da39a493986b8b2cef53 Author: Ionut Nicu Date: Sun Nov 21 10:46:24 2010 +0000 staging: tidspbridge: convert core to list_head Convert the core module of the tidspbridge driver to use struct list_head instead of struct lst_list. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit 6d7e925b88cd8436b1284158876580ea431cb954 Author: Ionut Nicu Date: Sun Nov 21 10:46:22 2010 +0000 staging: tidspbridge: remove gb bitmap implementation Now that all users of gb have been converted to the standard linux bitmap API, we can remove it from the gen library. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit b5a38abad033f6075e2c4cbfc4507cc7e82c36d2 Author: Ionut Nicu Date: Sun Nov 21 10:46:21 2010 +0000 staging: tidspbridge: switch to linux bitmap API Replace the tidspbridge generic bitmap operations with the linux standard bitmap implementation. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit ad4adcc495363fb2506d82c9cab0f71dea83ea9b Author: Ionut Nicu Date: Sun Nov 21 10:46:20 2010 +0000 staging: tidspbridge: remove utildefs Remove a header file that was not very useful to the dspbridge driver. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit 31de278078aeb869467cbde0877d7f1027ab844c Author: Ionut Nicu Date: Sun Nov 21 10:46:19 2010 +0000 staging: tidspbridge: remove gs memory allocator Remove unnecessary wrappers for linux kernel memory allocation primitives. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit 74c2d1f63f6fff26503f538ddacf0e45feb15f0d Author: Ionut Nicu Date: Fri Nov 5 17:01:50 2010 +0000 staging: tidspbridge: fix kernel oops in bridge_io_get_proc_load The DSP shared memory area gets initialized only when a COFF file is loaded. If bridge_io_get_proc_load is called before loading a base image into the DSP, the shared_mem member of the io manager will be NULL, resulting in a kernel oops when it's dereferenced. Also made some coding style changes to bridge_io_create. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit 59403c21afdcd2e89aeadc73b99ccd82d32733b3 Author: Ionut Nicu Date: Fri Nov 5 17:01:49 2010 +0000 staging: tidspbridge: mgr_enum_node_info cleanup Reorganized mgr_enum_node_info code to increase its readability. Signed-off-by: Ionut Nicu Signed-off-by: Omar Ramirez Luna commit d723818e7c8f20af0a665f5b0c2eda909e069ffa Author: Felipe Contreras Date: Fri Nov 5 17:01:48 2010 +0000 staging: tidspbridge: fix mgr_enum_node_info The current code was always returning a non-zero status value to userspace applications when this ioctl was called. The error code was ENODATA, which isn't actually an error, it's always returned by dcd_enumerate_object() when it hits the end of list. Signed-off-by: Felipe Contreras Signed-off-by: Omar Ramirez Luna commit 81ea18ec22e9526b4af81e2213747e5afc48f364 Author: Armando Uribe Date: Mon Nov 1 17:15:50 2010 -0600 staging: tidspbridge: Eliminate direct manipulation of OMAP_SYSC_BASE Eliminates Bridge direct manipulation of OMAP_SYSC_BASE registers Signed-off-by: Armando Uribe Signed-off-by: Omar Ramirez Luna commit 98d0ba892536141ba047ecbe60b32e34c11834df Author: Sapiens, Rene Date: Thu Nov 4 00:31:24 2010 +0000 staging: tidspbridge: overwrite DSP error codes When calling the DSP's remote functions, the DSP returns error codes different from the ones managed by the kernel, the function's return value is shared with the MPU using a shared structure. This patch overwrites those error codes by kernel specifics and deletes unnecessary code. Signed-off-by: Rene Sapiens Signed-off-by: Omar Ramirez Luna commit 4097c4968cd60bf5c690455466731d11149fe43f Author: Guzman Lugo, Fernando Date: Tue Oct 26 00:51:46 2010 +0000 staging: tidspbridge: make sync_wait_on_event interruptible So that avoid non-killable process. Signed-off-by: Fernando Guzman Lugo Signed-off-by: Omar Ramirez Luna commit 92d8682926342d2b6aa5b2ecc02221e00e1573a0 Author: David S. Miller Date: Fri Feb 4 15:55:25 2011 -0800 inetpeer: Move ICMP rate limiting state into inet_peer entries. Like metrics, the ICMP rate limiting bits are cached state about a destination. So move it into the inet_peer entries. If an inet_peer cannot be bound (the reason is memory allocation failure or similar), the policy is to allow. Signed-off-by: David S. Miller commit 0131ba451e20239c5dc701027c1a2edef95e1a6e Author: David S. Miller Date: Fri Feb 4 14:37:30 2011 -0800 ipv4: Don't miss existing cached metrics in new routes. Always lookup to see if we have an existing inetpeer entry for a route. Let FLOWI_FLAG_PRECOW_METRICS merely influence the "create" argument to rt_bind_peer(). Also, call rt_bind_peer() unconditionally since it is not possible for rt->peer to be non-NULL at this point. Signed-off-by: David S. Miller commit bd4a6974cc9090ef3851e5b0a2071e5383565c7c Merge: 2b7bceb 1e6d93e Author: David S. Miller Date: Fri Feb 4 14:28:58 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit b23b025fe246f3acc2988eb6d400df34c27cb8ae Author: Ben Greear Date: Fri Feb 4 11:54:17 2011 -0800 mac80211: Optimize scans on current operating channel. This should decrease un-necessary flushes, on/off channel work, and channel changes in cases where the only scanned channel is the current operating channel. * Removes SCAN_OFF_CHANNEL flag, uses SDATA_STATE_OFFCHANNEL and is-scanning flags instead. * Add helper method to determine if we are currently configured for the operating channel. * Do no blindly go off/on channel in work.c Instead, only call appropriate on/off code when we really need to change channels. Always enable offchannel-ps mode when starting work, and disable it when we are done. * Consolidate ieee80211_offchannel_stop_station and ieee80211_offchannel_stop_beaconing, call it ieee80211_offchannel_stop_vifs instead. * Accept non-beacon frames when scanning on operating channel. * Scan state machine optimized to minimize on/off channel transitions. Also, when going on-channel, go ahead and re-enable beaconing. We're going to be there for 200ms, so seems like some useful beaconing could happen. Always enable offchannel-ps mode when starting software scan, and disable it when we are done. * Grab local->mtx earlier in __ieee80211_scan_completed_finish so that we are protected when calling hw_config(), etc. * Pass probe-responses up the stack if scanning on local channel, so that mlme can take a look. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit cb8d61de2d7f074654057b2b924da1efbf625ad4 Author: Felix Fietkau Date: Fri Feb 4 20:09:25 2011 +0100 ath9k: add additional checks for the baseband hang detection Since even with the latest changes the false positive issue of the baseband hang check is not fully solved yet, additional checks are needed. If the baseband hang occurs, the rx_clear signal will be stuck to high, so we can use the cycle counters to confirm it. With this patch, a hardware reset is only triggered if the baseband hang check returned true three times in a row, with a beacon interval between each check and if the busy time was also 99% or more during the check intervals. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit b1f93314bfc4d5753391616735f6b8df96db901d Author: Felix Fietkau Date: Fri Feb 4 19:20:08 2011 +0100 mac80211: do not send duplicate data frames to the cooked monitor interface I can't think of a valid use case for this aside from debugging (which can also be done with a real monitor interface), and dropping these frames saves some precious CPU cycles. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 8e5461041f4498e3c8f4e0a51187f608f0a18b08 Author: Jouni Malinen Date: Fri Feb 4 13:51:28 2011 +0200 ath: Fix clearing of secondary key cache entry for TKIP All register writes to the key cache have to be done in pairs. However, the clearing of a separate MIC entry with hardware revisions that use combined MIC key layout did not do that with one of the registers. Add the matching register write to the following register to make the KEY4 register write actually complete. This is mostly a fix for a theoretical issue since the incorrect entry that could potentially be left behind in the key cache would not match with received frames. Anyway, better make this code clean the entry correctly using paired register writes. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 8c99f69182fb9550ceedf599b32af335e743367b Author: Rajkumar Manoharan Date: Wed Feb 2 22:57:53 2011 +0530 mac80211: do not restart ps timer during scan or offchannel While leaving oper channel, STA informs sleep state to AP to stop sending data. Till sending ack for the nullfunc, AP continues to send the data to STA which restarts ps_timer that is causing unnecessary nullfunc exchange on timer expiry when the STA was already moved to offchannel. So don't restart ps_timer on data reception during scan. This issue was identified by the following warning. WARNING: at net/mac80211/tx.c:661 invoke_tx_handlers+0xf07/0x1330 [mac80211] wlan0: Dropped data frame as no usable bitrate found while scanning and associated. Target station: 00:03:7f:0b:a6:1b on 5 GHz band Call Trace: [] invoke_tx_handlers+0xf07/0x1330 [mac80211] [] ieee80211_tx+0x86/0x2c0 [mac80211] [] ieee80211_xmit+0xb5/0x1d0 [mac80211] [] ieee80211_dynamic_ps_enable_work+0x0/0xb0 [mac80211] [] ieee80211_tx_skb+0x4f/0x60 [mac80211] [] ieee80211_send_nullfunc+0x46/0x60 [mac80211] [] ieee80211_dynamic_ps_enable_work+0xa5/0xb0 [mac80211] Reviewed-by: Johannes Berg Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 24d24c627cadcbff682fbf8448a775851bef833c Author: Jussi Kivilinna Date: Mon Jan 31 20:50:31 2011 +0200 zd1211rw: add useful debug output Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit ab419e9bda10efced0db980478c3e40a1ad18ba3 Author: Jussi Kivilinna Date: Mon Jan 31 20:50:21 2011 +0200 zd1211rw: enable NL80211_IFTYPE_AP It should be safe to enable AP-mode now. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 1f6cccccea3fe96464f7dbc39723d70165f1eef1 Author: Jussi Kivilinna Date: Mon Jan 31 20:50:12 2011 +0200 zd1211rw: reset rx urbs after idle period of 30 seconds RX appears to freeze while idle. Resetting rx-urbs appears to be enough to fix this. Do reset 30 seconds after last rx. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 3985a46543d47a50b94e839e0a16e67d959ab092 Author: Jussi Kivilinna Date: Mon Jan 31 20:50:02 2011 +0200 zd1211rw: reset device when CR_BCN_FIFO_SEMAPHORE freezes in beacon setup When driver fails to acquire device semaphore lock, device usually freezes soon afterwards. So failing to acquire lock indicates us that not everything is going right in device/fw. So reset device when this happens. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit a0fd751f0924e0eefa36592f1d358c4ab18b44c5 Author: Jussi Kivilinna Date: Mon Jan 31 20:49:52 2011 +0200 zd1211rw: add TX watchdog and device resetting When doing transfers at high speed for long time, tx queue can freeze. So add tx watchdog. TX-watchdog checks for locked tx-urbs and reset hardware when such is detected. Merely unlinking urb was not enough, device have to be reseted. Hw settings are restored so that any open link will stay on after reset. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 212e1a5b9df0a51d54d7841467f3f01baa1b82f1 Author: Jussi Kivilinna Date: Mon Jan 31 20:49:43 2011 +0200 zd1211rw: collect driver settings and add function to restore theim We need HW hard reset later in patchset to reset device after TX-stall. Collect all settings that we have set to driver for later reset and add restore function. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 8f2d8f869af5088d4e4866c8286f0599e83cc963 Author: Jussi Kivilinna Date: Mon Jan 31 20:49:33 2011 +0200 zd1211rw: lower hw command timeouts Device command timeouts are set up very high (1 sec) and this causes AP beacon to lock up for long for example. Checking timeouts on device it's easy to see that 1 sec timeout is not needed, when device fails to response longer timeout doesn't help: [ 473.074419] zd1211rw 1-1:1.0: print_times() Read times: [ 473.175163] zd1211rw 1-1:1.0: print_time() 0 - 10 msec: 1506 [ 473.176429] zd1211rw 1-1:1.0: print_time() 11 - 50 msec: 0 [ 473.177955] zd1211rw 1-1:1.0: print_time() 51 - 100 msec: 0 [ 473.180703] zd1211rw 1-1:1.0: print_time() 101 - 250 msec: 0 [ 473.182101] zd1211rw 1-1:1.0: print_time() 251 - 500 msec: 0 [ 473.183221] zd1211rw 1-1:1.0: print_time() 500 - 1000 msec: 20 [ 473.184381] zd1211rw 1-1:1.0: print_time() 1000 - ... msec: 18 Also vendor driver doesn't use this long timeout. Therefore change timeout to 50msec. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 4a3b0874a481573bfd95d54c883248b4c4622572 Author: Jussi Kivilinna Date: Mon Jan 31 20:49:24 2011 +0200 zd1211rw: change interrupt URB buffer to DMA buffer As might lower beacon update CPU usage. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 9bca0c3b540188e2beea9c2583fa16c46d209888 Author: Jussi Kivilinna Date: Mon Jan 31 20:49:14 2011 +0200 zd1211rw: use stack and preallocated memory for small cmd-buffers Use stack for allocing small < 64 byte arrays in zd_chip.c and preallocated buffer in zd_usb.c. This might lower CPU usage for beacon setup. v2: - Do not use stack buffers in zd_usb.c as they would be used for urb transfer_buffer. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 51272292926bc4fff61ba812d5816922b980655b Author: Jussi Kivilinna Date: Mon Jan 31 20:49:05 2011 +0200 zd1211rw: batch beacon config commands together Beacon config function writes beacon to hw one write per byte. This is very slow (usually taking more than 100ms to finish) and causes high CPU usage when in AP-mode (kworker at ~50% on Intel Atom N270). By batching commands together zd_mac_config_beacon() runtime can be lowered to 1/5th and lower CPU usage to saner levels (<10% on Atom). Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 9be232563666b7d1bd424780aef7ee2aa261ba04 Author: Jussi Kivilinna Date: Mon Jan 31 20:48:55 2011 +0200 zd1211rw: add beacon watchdog and setting HW beacon more failsafe When doing tx/rx at high packet rate (for example simply using ping -f), device starts to fail to respond to control messages. On non-AP modes this only causes problems for LED updating code but when we are running in AP-mode we are writing new beacon to HW usually every 100ms. Now if control message fails in HW beacon setup, device lock is kept locked and beacon data partially written. This can and usually does cause: 1. HW beacon setup fail now on, as driver cannot acquire device lock. 2. Beacon-done interrupt stop working as device has incomplete beacon. Therefore make zd_mac_config_beacon() always try to release device lock and add beacon watchdog to restart beaconing when stall is detected. Also fix zd_mac_config_beacon() try acquiring device lock for max 500ms, as what old code appeared to be trying to do using loop and msleep(1). Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 512119b36f7945a650877cbc7e9b5f4cc4d92e4c Author: Christian Lamparter Date: Mon Jan 31 20:48:44 2011 +0200 mac80211: fix race between next beacon dtim and ieee80211_get_buffered_bc On review of 'zd1211rw: implement beacon fetching and handling ieee80211_get_buffered_bc()', Christian Lamparter noted that [1]: Since zd_beacon_done also uploads the next beacon so long in advance, there could be an equally long race between the outdated state of the next beacon's DTIM broadcast traffic indicator (802.11-2007 7.3.2.6) which -in your case- was uploaded almost a beacon interval ago and the xmit of ieee80211_get_buffered_bc *now*. The dtim bc/mc bit might be not set, when a mc/bc arrived after the beacon was uploaded, but before the "beacon done event" from the hardware. So, dozing stations don't expect the broadcast traffic and of course, they might miss it completely. It's probably better to fix this in mac80211 (see the attached hack). [1] http://marc.info/?l=linux-wireless&m=129435041117256&w=2 CC: Christian Lamparter Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 4099e2f4404762add8ef2b0dadef3c5122117210 Author: Jussi Kivilinna Date: Mon Jan 31 20:48:35 2011 +0200 zd1211rw: implement beacon fetching and handling ieee80211_get_buffered_bc() Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit b91a515dbb4f824169755e071014230b57f0c1e1 Author: Jussi Kivilinna Date: Mon Jan 31 20:48:25 2011 +0200 zd1211rw: let zd_set_beacon_interval() set dtim_period and add AP-beacon flag Add support for AP-mode beacon. Also disable beacon when interface is set down as otherwise hw will keep flooding NEXT_BCN interrupts. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit f773e409b959677170b3cf1d573dafc4a0a3e34e Author: Jussi Kivilinna Date: Mon Jan 31 20:48:16 2011 +0200 zd1211rw: fix ack_pending in filter_ack causing tx-packet ordering problem on monitor For reasons not very clear yet to me, filter_ack leaves matching tx-packet pending with 'ack_pending'. This causes tx-packet to be passed back to upper layer after next packet has been transfered and tx-packets might end up coming come out of monitor interface in wrong order vs. rx. Because of this when enable AP-mode, hostapd monitor interface would get packets in wrong order causing problems in WPA association. So don't use mac->ack_pending when in AP-mode. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit c2fadcb3b16b294d7de509c42f1390f672510667 Author: Jussi Kivilinna Date: Mon Jan 31 20:48:06 2011 +0200 zd1211rw: support setting BSSID for AP mode Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 5cf6cf819bfffd89fc8c7c3a7406f54da4945a34 Author: Jussi Kivilinna Date: Mon Jan 31 20:47:56 2011 +0200 zd1211rw: move set_rts_cts_work to bss_info_changed As bss_info_changed may sleep, we can as well set RTS_CTS register right away. Keep mac->short_preamble for later use (hw reset). Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit a6fb071bbf420841481e1c1bcdb65b3ffb33fc8a Author: Jussi Kivilinna Date: Mon Jan 31 20:47:46 2011 +0200 zd1211rw: move set_multicast_hash and set_rx_filter from workers to configure_filter Workers not needed anymore since configure_filter may sleep. Keep mac->multicast_hash for later use (hw reset). Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 88a1159a376995e1f9ca6e9b1d4f2e4c44d79d13 Author: Jussi Kivilinna Date: Mon Jan 31 20:47:36 2011 +0200 zd1211rw: fix beacon interval setup Vendor driver uses CR_BNC_INTERVAL at various places, one is HW_EnableBeacon() that combinies beacon interval with BSS-type flag and DTIM value in upper 16bit of u32. The other one is HW_UpdateBcnInterval() that set_aw_pt_bi() appears to be based on. HW_UpdateBcnInterval() takes interval argument as u16 and uses that for calculations, set_aw_pt_bi() uses u32 value that has flags and dtim in upper part. This clearly seems wrong. Also HW_UpdateBcnInterval() updates only lower 16bit part of CR_BNC_INTERVAL. So make set_aw_pt_bi() do calculations on only lower u16 part of s->beacon_interval. Also set 32bit beacon interval register before reading values from device, as HW_EnableBeacon() on vendor driver does. This is required to make beacon work on AP-mode, simply reading and then writing updated values is not enough at least with zd1211b. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 8b17f75ced1d45af9faed767f4cfafb13c0fe05e Author: Jussi Kivilinna Date: Mon Jan 31 20:47:27 2011 +0200 zd1211rw: add locking for mac->process_intr Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit d741900d404b3a34bf478673f76ee9f16dad3f90 Author: Jussi Kivilinna Date: Mon Jan 31 20:47:17 2011 +0200 zd1211rw: cancel process_intr work on zd_chip_disable_int() OOPS if worker is running and disconnect() is called (triggered by unpluging device). Much harder to trigger at this stage but later when we have AP beacon work in process_intr it happens very easy. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 78fc800f06a72c25842e585fd747fa6a98f3f0e5 Author: Jussi Kivilinna Date: Mon Jan 31 20:47:08 2011 +0200 zd1211rw: use urb anchors for tx and fix tx-queue disabling When stress testing AP-mode I hit OOPS when unpluging or rmmodding driver. It appears that when tx-queue is disabled, tx-urbs might be left pending. These can cause ehci to call non-existing tx_urb_complete() (after rmmod) or uninitialized/reseted private structure (after disconnect()). Add skb queue for submitted packets and unlink pending urbs on zd_usb_disable_tx(). Part of the problem seems to be usb->free_urb_list that isn't always working as it should, causing machine freeze when trying to free the list in zd_usb_disable_tx(). Caching free urbs isn't what other drivers seem to be doing (usbnet for example) so strip free_usb_list. Patch makes tx-urb handling saner with use of urb anchors. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 939b3f0b1415755d534a20f4067e6b367e1e4021 Author: Robert Jennings Date: Fri Jan 28 09:01:55 2011 -0600 zram/xvmalloc: combine duplicate block delete code This patch eliminates duplicate code. The remove_block_head function is a special case of remove_block which can be contained in remove_block without confusion. The portion of code in remove_block_head which was noted as "DEBUG ONLY" is now mandatory. Doing this provides consistent management of the double linked list of blocks under a freelist and makes this consolidation of delete block code safe. The first and last blocks will have NULL pointers in their previous and next page pointers respectively. Additionally, any time a block is removed from a free list the next and previous pointers will be set to NULL to avoid misuse outside xvmalloc. Signed-off-by: Robert Jennings Reviewed-by: Pekka Enberg Acked-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 2787f959d6c5fb258d964218ac75346019f49ee9 Author: Robert Jennings Date: Fri Jan 28 09:00:42 2011 -0600 zram: Return zero'd pages on new reads Currently zram will do nothing to the page in the bvec when that page has not been previously written. This allows random data to leak to user space. That can be seen by doing the following: ## Load the module and create a 256Mb zram device called /dev/zram0 # modprobe zram # echo $((256*1024*1024)) > /sys/class/block/zram0/disksize ## Initialize the device by writing zero to the first block # dd if=/dev/zero of=/dev/zram0 bs=512 count=1 ## Read ~256Mb of memory into a file and hope for something interesting # dd if=/dev/zram0 of=file This patch will treat an unwritten page as a zero-filled page. If a page is read before a write has occurred the data returned is all 0's. Signed-off-by: Robert Jennings Reviewed-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 37700965858a099d250bca531ca1c99b22c8708d Author: Robert Jennings Date: Fri Jan 28 09:00:03 2011 -0600 zram/xvmalloc: Close 32byte hole on 64bit CPUs By swapping the total_pages statistic with the lock we close a hole in the structure for 64-bit CPUs. Signed-off-by: Robert Jennings Reviewed-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit b1f5b81ebeee3974a8c793cafacace991d9a864d Author: Robert Jennings Date: Fri Jan 28 08:59:26 2011 -0600 zram/xvmalloc: create CONFIG_ZRAM_DEBUG for debug code Add a debug config flag to enable debug printk output and future debug code. Signed-off-by: Robert Jennings Reviewed-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit e3f201b541ff6748db77b857d2ae69fc9dbbee11 Author: Robert Jennings Date: Fri Jan 28 08:58:54 2011 -0600 zram/xvmalloc: free bit block insertion optimization This change is in a conditional block which is entered only when there is an existing data block on the freelist where the insert has taken place. The new block is pushed onto the freelist stack and this conditional block is updating links in the prior stack head to point to the new stack head. After this conditional block the first-/second-level indices are updated to indicate that there is a free block at this location. This patch adds an immediate return from the conditional block to avoid setting bits again to indicate a free block on this freelist. The bits would already be set because there was an existing free block on this freelist. Signed-off-by: Robert Jennings Reviewed-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 7b19b8d45b216ff3186f066b31937bdbde066f08 Author: Robert Jennings Date: Fri Jan 28 08:58:17 2011 -0600 zram: Prevent overflow in logical block size On a 64K page kernel, the value PAGE_SIZE passed to blk_queue_logical_block_size would overflow the logical block size argument (resulting in setting it to 0). This patch sets the logical block size to 4096, using a new ZRAM_LOGICAL_BLOCK_SIZE constant. Signed-off-by: Robert Jennings Reviewed-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit f3bc232c2eb1dac5ac3dbaca0099ce51a615a478 Author: Robert Jennings Date: Fri Jan 28 08:57:27 2011 -0600 zram/vmalloc: Correct tunings to enable use with 64K pages xvmalloc will not currently function with 64K pages. Newly allocated pages will be inserted at an offset beyond the end of the first-level index. This tuning is needed to properly size the allocator for 64K pages. The default 3 byte shift results in a second level list size which can not be indexed using the 64 bits of the flbitmap in the xv_pool structure. The shift must increase to 4 bytes between second level list entries to fit the size of the first level bitmap. Here are a few statistics for structure sizes on 32- and 64-bit CPUs with 4KB and 64KB page sizes. bits_per_long 32 64 64 page_size 4,096 4,096 65,535 xv_align 4 8 8 fl_delta 3 3 4 num_free_lists 508 508 4,094 xv_pool size 4,144b 8,216b 66,040b per object overhead 32 64 64 zram struct 0.5GB disk 512KB 1024KB 64KB This patch maintains the current tunings for 4K pages, adds an optimal sizing for 64K pages and adds a safe tuning for any other page sizes. Signed-off-by: Robert Jennings Reviewed-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 49ba9d2d1c6d5523ee4e9e5b31dd89445727a977 Author: Arend van Spriel Date: Tue Jan 25 16:53:41 2011 +0100 staging: brcm80211: remove driver message upon initialization removed the message from the driver to avoid polluting the kernel log with messages indicating nothing is wrong. Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit db3f94c5a44ebe356c3850bf2c04ea0bd5d2443e Author: Arend van Spriel Date: Tue Jan 25 16:53:40 2011 +0100 staging: brcm80211: align common dirver code Remove differences in util sources for the two supported drivers. Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 2ea0f6fa6570f6271909fee852474414ba04679d Author: Arend van Spriel Date: Tue Jan 25 16:53:39 2011 +0100 staging: brcm80211: allow both driver are created in single build This patch allows to build both drivers. Previous patch for this failed using -j option. This has been fixed by adding files with include statement for the fullmac driver. Verified this is working using -j4 option. Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 8a6257fbd8af8105149c15f0af91e8355bd51034 Author: Arend van Spriel Date: Tue Jan 25 14:32:03 2011 +0100 staging: brcm80211: fix compiler warning in fullmac driver Since 2.6.38-rc1 we are getting a compiler warning due to changed API in net/cfg80211.h. This change fixes the warning but driver will need to be modified later to handle the additional parameters. Cc: Brett Rudley Cc: Henry Ptasinski Cc: Roland Vossen Cc: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit e107e6ebdda9b56be21951a7c58c2fa90d6e685b Author: Marek Belisko Date: Thu Feb 3 16:22:52 2011 +0100 staging: olpc_dcon: checkpatch.pl fixes for olpc_dcon.c file. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit a90dcd4f7dfc3e664e7d08790a8b39d052e21a2e Author: Marek Belisko Date: Thu Feb 3 14:22:08 2011 +0100 staging: oplc_dcon: Fix compilation warning. Fix compilation warning: drivers/staging/olpc_dcon/olpc_dcon.c: In function ‘dcon_probe’: drivers/staging/olpc_dcon/olpc_dcon.c:704:21: warning: ignoring return value of ‘device_create_file’, declared with attribute warn_unused_result and add cleaning of created files when creation of one failed. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 3ad4e219606fa317f778b26553889520aed7925c Author: Micha Hergarden Date: Wed Feb 2 21:25:07 2011 +0100 staging: comedi: fix coding style issue in drivers.c This is a patch to the drivers.c file that fixes up a braces around single statement warning found by the checkpatch.pl tool Signed-off-by: Micha Hergarden Signed-off-by: Greg Kroah-Hartman commit 7d3864d1f6a496108c377f5580a2125c2f8d9014 Author: Bas van den Berg Date: Thu Feb 3 21:37:16 2011 +0100 Staging: wlan-ng: fixed packed checkpatch warnings Signed-off-by: Bas van den Berg Signed-off-by: Greg Kroah-Hartman commit 37af07d19a53924a70ae42faebf968c04a631c8c Author: Vasiliy Kulikov Date: Wed Feb 2 21:29:31 2011 +0300 staging: rts_pstor: potential NULL dereference pci_get_bus_and_slot() may return NULL, but the caller checks wrong variable. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit 4b906e58a1f0a29ce1da4ed832cc6f17e5889772 Author: Sutharsan Ramamoorthy Date: Tue Feb 1 22:45:04 2011 -0800 Staging: Westbridge: added ioremap_nocache instead of phys_to_virt This patch removes phys_to_virt() and adds ioremap_nocache() for memory mapping the GPMC registers. Signed-off-by: Sutharsan Ramamoorthy Signed-off-by: Greg Kroah-Hartman commit 90441bebbaa70d8ba114861319d92eaaa65cb425 Author: Justin P. Mattock Date: Tue Feb 1 21:07:28 2011 -0800 staging: brcm80211: sbsdio.h: change a typo comamnd to command The below patch fixes a typo comamnd to command. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 360ac683f78bd52a430d6937380449dc401f9539 Author: Roland Vossen Date: Tue Feb 1 10:32:31 2011 +0100 staging: brcm80211: removed references to 32 bit DMA registers Code cleanup. Removed unused references. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 6b4ba667b7c4bb396e85e99fccbb4c92606f9209 Author: Roland Vossen Date: Tue Feb 1 10:32:30 2011 +0100 staging: brcm80211: removed 32 bit DMA functions Code cleanup. Removed unused functions. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 36e319bd39fec1e9350d97cb6f4b589b3968500d Author: Roland Vossen Date: Tue Feb 1 10:32:29 2011 +0100 staging: brcm80211: removed more unused dma32 code Since two preprocessor defines are always '1', could remove code that was never compiled in and removed references to these preprocessor defines (DMA64_ENAB and DMA64_MODE). Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 2fd31011ac786e2bb9c0a76ddb23468e0e65abdc Author: Roland Vossen Date: Tue Feb 1 10:32:28 2011 +0100 staging: brcm80211: removed unused DMA32 related code removed C code and that was never invoked, and declarations that are not used anymore. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 5abb04a63b890dc3f4abdf7d34e8ee1943546bd7 Author: Arend van Spriel Date: Fri Jan 21 15:44:12 2011 +0100 staging: brcm80211: implementation of RFKILL functionality Resubmitted the patch to align with staging-next tree. This change depends on suspend/resume patch as sent on Wed, Jan 12, 2011. Only hardware switch state needs to be handled by driver. RFKILL is informed when hardware switch is activated. MAC80211 rfkill_poll callback is used to check hardware switch deactivation. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 698a9dce7757502da5c92e0a166aaff9e7c27345 Author: Justin P. Mattock Date: Tue Feb 1 21:08:09 2011 -0800 staging: octeon: change a typo comamnd to command The below patch fixes a typo comamnd to command. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit b977e29f825a4472520e78b61d92cc1f53d7ba80 Author: Justin P. Mattock Date: Tue Feb 1 21:07:49 2011 -0800 staging: rt2860: cmm_mac_pci.c change a typo comamnd to command The below patch fixes a typo comamnd to command. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 00719fab9f6eb90b9e427d1096ad540d51878661 Author: Javier Martinez Canillas Date: Tue Jan 25 01:46:18 2011 +0100 Staging: bcm: Check correct user provided length and fix error code returned bcm driver copies a buffer length provided by userpace without checking it. RxCntrlMsgBitMask is of type unsigned long so only makes sense to copy sizeof(unsigned long) bytes. Also, copy_from_user() returns the number of bytes that could not be copied. The driver is returning that value as error code instead of -EFAULT. This patch solves both issues. Signed-off-by: Javier Martinez Canillas Cc: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit c69ab1a2cfe5018cf7add67b278db9c744661f0f Author: Justin P. Mattock Date: Mon Jan 31 22:48:25 2011 -0800 staging: pohmelfs: Fix some typos, and comments. The patch below fixes some typos, and makes some comments sound more proper. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 2c62c674e0e9994cd54502f8311892e50c8ca347 Author: Timo von Holtz Date: Fri Feb 4 21:29:46 2011 +0100 staging: speakup: enlosed macros with complex values in parenthesis Enclosed all macros with complex values in parenthesis Signed-off-by: Timo von Holtz Signed-off-by: Greg Kroah-Hartman commit 0838b87cae7e81e497218b5eba3c8e9ca6f3ddbe Author: Timo von Holtz Date: Tue Feb 1 19:28:46 2011 +0100 Staging: rts_pstor: fixed some brace code styling issues Fixed all brace coding style issues in the following files: drivers/staging/rts_pstor/rtsx_card.h drivers/staging/rts_pstor/spi.c drivers/staging/rts_pstor/trace.h drivers/staging/rts_pstor/xd.c Signed-off-by: Timo von Holtz Signed-off-by: Greg Kroah-Hartman commit 404dc5f3f475ce3598d0e295883a28efafb90ac5 Author: Alan Cox Date: Tue Feb 1 15:42:22 2011 +0000 staging: et131x: Begin cleaning up the MI registers Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit ae3e5f0e9a27b0c015570cb2899484c1456846a7 Author: Alan Cox Date: Tue Feb 1 15:42:10 2011 +0000 staging: et131x: Clean up the RFD struct/types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 64b728319bed41ef14462a1a504c65656e5a50a4 Author: Alan Cox Date: Tue Feb 1 15:41:58 2011 +0000 staging: et131x: Clean up the phy coma stuff Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit ae3a08aab5e0700d3f80162bed07a2157bd304f4 Author: Alan Cox Date: Tue Feb 1 15:41:45 2011 +0000 staging: et131x: Kill of the eFLOW_CONTROL enum Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 072e9f609cd6d144b64da50b03b712d87b302e12 Author: Alan Cox Date: Tue Feb 1 15:41:32 2011 +0000 staging: et131x: Turn a few more LongCapitalisedThings into Linuxish names Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 7dcef374d17fd20ecd96b1aeccafe8a4a8c15740 Author: Tomas Winkler Date: Thu Feb 3 13:42:51 2011 +0200 staging/easycap: add level 1 tabs in usb_probe/disconnect function Add first level indentation before revamping the functions This of course breaks 80 characters limit but it will be fixed through the revamp Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 30a2cb350fcc34f36f86ecf4a5505f02e6810727 Author: Tomas Winkler Date: Thu Feb 3 13:42:50 2011 +0200 stagine/easycap: make easyoss_fops static easyoss_fops are only accessed from within easycap_sound_oss file Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 7863ff276d2a151aaf1b4ad7798ff2610e7b2996 Author: Tomas Winkler Date: Thu Feb 3 13:42:49 2011 +0200 staging/easycap: kill declaration of not existing variables Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit f8cc1e9373c253902a219ec805977d3b4f16a86c Author: Tomas Winkler Date: Thu Feb 3 13:42:48 2011 +0200 staging/easycap: don't shadow rc variable from macros rc is used extensively in code as return code variable so it is better not shadowing it in macros Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 055e3a3a2cdcb7d39d14857e2fb2175c11168ee7 Author: Tomas Winkler Date: Thu Feb 3 13:42:47 2011 +0200 staging/easycap: replace underscored types with regular once the underscored types should be used in user space headers only Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 1a4cb0fb7da009643368b3577b65a2d1da5485dd Author: Tomas Winkler Date: Thu Feb 3 13:42:46 2011 +0200 staging/easycap: rename variable s16 to tmp naming variable s16 is confusing since it is also a type name. Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 0117f77904a1cbd62cc6e7c25e3ebfc872707712 Author: Tomas Winkler Date: Thu Feb 3 13:42:45 2011 +0200 staging/easycap: rename variable u8 to tmp naming variable u8 is confusing since it is also a type name. Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 27d1766927372bf1410a44e8a22132757b0948b0 Author: Tomas Winkler Date: Thu Feb 3 13:42:44 2011 +0200 staging/easycap: rename variable s32 to tmp 1. naming variable s32 is confusing since it is also a type name. 2. use s32 instead of __s32, the later is for user space Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit b737f3b8cf2425f8e5f23ea31bbb4d377c41be7f Author: Tomas Winkler Date: Thu Feb 3 13:42:43 2011 +0200 staging/easycap: remove explicit NULL initialization remove intializations to NULL where not needed and let the compiler find flows with unitilized variables. Fix one such flow in easycap_vma_fault function Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 6911e7e4a6bed8ac7989137387f6a33ef65c2b56 Author: Tomas Winkler Date: Thu Feb 3 13:42:42 2011 +0200 staging/easycap: improve coding style when checking return value use idiom 'if (rc)' for checking return value instead of if (0 != rc) Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit e0a691e35236d3600c47839c85f82188260e4169 Author: Tomas Winkler Date: Thu Feb 3 13:42:41 2011 +0200 staging/easycap: fix artificial line breaks fix style issue: if (NULL != pdata_urb->purb) { created by the patch: 'staging/easycap: don't cast NULL pointer' After dropping the casting there is no longer 80 columns limitation Reported-by: Dan Carpenter Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 3fc0dae888ee216036ae1898fc9186f1dd04f185 Author: Tomas Winkler Date: Thu Feb 3 13:42:40 2011 +0200 staging/easycap: repace #if defined with simpler #ifdef for sake of readability replace #if defined with #ifdef and #if (!defined with #ifndef Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit f2b3c685b9b1c048cfa8bef98dac037275b9d20d Author: Tomas Winkler Date: Thu Feb 3 13:42:39 2011 +0200 staging/easycap: kill EASYCAP_NEEDS_UNLOCKED_IOCTL we can kill this option for in-kernel driver Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 9306b1bb8b6de05786c8aa79a19988aa15453968 Author: Tomas Winkler Date: Thu Feb 3 13:42:38 2011 +0200 staging/easycap: remove comment: EASYCAP_NEEDS_ALSA Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 3c1fb66ede917d54079a959a95f79777e95920bd Author: Tomas Winkler Date: Thu Feb 3 13:42:37 2011 +0200 staging/easycap: don't cast NULL pointer Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit dfc9539fe88fe548184563d77f1816782289ac1e Author: Marek Belisko Date: Thu Feb 3 11:07:54 2011 +0100 staging: ft1000: Remove unnecessary assignment. dsp_img_info->version and requested_version have same type so additional temporary variable creation could be omitted because variables could be compares directly. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit e7af0786303cfb6c541582839275f1d0addbeb2b Author: Marek Belisko Date: Thu Feb 3 11:07:53 2011 +0100 staging: ft1000: Create common function for buffers check. Same check was done on three places which make code unreadable. Put repeat routine to separate function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 672dfeba92bbb1218b5e39f5aff2d1fd2e2268b8 Author: Marek Belisko Date: Thu Feb 3 11:07:52 2011 +0100 staging: ft1000: Remove unused variables. Remove variables which was defined and assigned but never used in function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 6f953fbbf6a8fdcc54b182a3a528bbd6404d1c55 Author: Marek Belisko Date: Thu Feb 3 11:07:51 2011 +0100 staging: ft1000: Fix indentation in scram_dnldr() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 857af455c8e7865a8a24047534a92e3d016da4ab Author: Marek Belisko Date: Thu Feb 3 11:07:50 2011 +0100 staging: ft1000: Fix coding style in write_blk_fifo() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit d7a7318b387ae4be24619fbac68ce5b5f5a7b7da Author: Marek Belisko Date: Thu Feb 3 11:07:49 2011 +0100 staging: ft1000: Fix coding style in get_handshake() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 78395f672a3befb69e0c0e2d9672ddddce465095 Author: Marek Belisko Date: Thu Feb 3 11:07:48 2011 +0100 staging: ft1000: Fix coding style in hdr_checksum() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit cc4f65bfbf65e94d5be7573951f87998849b38ff Author: Marek Belisko Date: Thu Feb 3 11:07:47 2011 +0100 staging: ft1000: Fix coding style in put_request_value() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 114a06ae848a1ca718f3e2ab077bddb15e576991 Author: Marek Belisko Date: Thu Feb 3 11:07:46 2011 +0100 staging: ft1000: Fix coding style in get_request_value() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit c3ed5d2f25b89b67011f2883a141c5115eef415b Author: Marek Belisko Date: Thu Feb 3 11:07:45 2011 +0100 staging: ft1000: Fix coding style in get_request_type_usb() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 9b43f374686a285f023bc3dbc574c09e6e506f64 Author: Marek Belisko Date: Thu Feb 3 11:07:44 2011 +0100 staging: ft1000: Fix coding style in get_request_type() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 5acc5396af600d0830b4a162b65f8540e5ed17f4 Author: Marek Belisko Date: Thu Feb 3 11:07:43 2011 +0100 staging: ft1000: Fix coding style in put_handshake_usb() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 5865a18eaa170189240f34d4072dd0e0604209ab Author: Marek Belisko Date: Thu Feb 3 11:07:42 2011 +0100 staging: ft1000: Fix coding style in get_handshake_usb() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit a8d4d198a72692852ab44d9026285feb656549b3 Author: Marek Belisko Date: Thu Feb 3 11:07:41 2011 +0100 staging: ft1000: Fix coding style in put_handshake() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit c5d680c0585271593b66b2274658d4b81ff1eb4b Author: Marek Belisko Date: Thu Feb 3 11:07:40 2011 +0100 staging: ft1000: Fix coding style in check_usb_db() function. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 165d290f8a315b8af950aa15b23665c7950f8843 Author: Marek Belisko Date: Thu Feb 3 11:07:39 2011 +0100 staging: ft1000: Remove dead code. Remove code which was under #if 0. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 781a7395d239dbdb59738ca7fe08e71641bf583c Author: Pavan Savoy Date: Fri Feb 4 02:23:15 2011 -0600 drivers:misc: ti-st: remove multiple gpio handling TI shared transport driver previously intended to expose rfkill entries for each of the protocol gpio that the chip would have. However now in case such gpios exist, which requires to be enabled for a specific protocol, the responsibility lay on protocol driver. This patch removes the request/free of multiple gpios, rfkill struct references and also removes the chip_toggle function. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit 6d71ba2105a1d8c1712cdfcf46fc6040e4707cb9 Author: Pavan Savoy Date: Fri Feb 4 02:23:14 2011 -0600 drivers:misc: ti-st: fix hci-ll on wake_ind collision Where file-transfer stops/pauses in between, is result of a HCI-LL anamoly in ST LL driver. ST LL did not copy the contents of WaitQ into the TxQ, when a WAKEUP_IND collision happened. Make also sure, that the copying mechanism is safe, by wrapping it around spin locks inside st_int_recv(). This was easily reproduced when the sleep timeout was reduced to 100ms for HCI-LL. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit ef04d121f030329aae0c2d3ec22beea0c5cbcfd3 Author: Pavan Savoy Date: Fri Feb 4 02:23:13 2011 -0600 drivers:misc: ti-st: firmware download optimization To fasten the process of firmware download, the chip allows disabling of the command complete event generation from host. In these cases, only few very essential commands would have the command complete events and hence the wait associated with them. So now the driver would wait for a command complete event, only when it comes across a wait event during firmware parsing. This would also mean we need to skip not just the change baud rate command but also the wait for it. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit 6710fcff66ef0330cdc458557271ee86026745d0 Author: Pavan Savoy Date: Fri Feb 4 02:23:12 2011 -0600 drivers:misc: ti-st: set right debug levels for logs pr_debug-ing few pr_infos from the data paths such as tty receive and write so as to reduce debugs when we have higher logging levels enabled undef VERBOSE in receive to avoid huge logs when log level 8 is set. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit 704426649dd4324b34cefea322f4333e5280f852 Author: Pavan Savoy Date: Fri Feb 4 02:23:11 2011 -0600 drivers:misc: ti-st: fix error codes set-right the error codes that the shared transport driver returns. Instead of magic numbers like -1, return relevant codes such as ETIMEDOUT or EIO, EAGAIN when wait times out or uart write bytes don't match expected value or when registration fails and needs to be attempted again. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit ec60d0ad20ff8796dc41b30a9dce485478ccd263 Author: Pavan Savoy Date: Fri Feb 4 02:23:10 2011 -0600 drivers:misc: ti-st: move from rfkill to sysfs The communication between ST KIM and UIM was interfaced over the /dev/rfkill device node. Move the interface to a simpler less abusive sysfs entry mechanism and document it in Documentation/ABI/testing/ under sysfs-platform-kim. Shared transport driver would now read the UART details originally received by bootloader or firmware as platform data. The data read will be shared over sysfs entries for the user-space UIM or other n/w manager/plugins to be read, and assist the driver by opening up the UART, setting the baud-rate and installing the line discipline. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit 5c88b02196a99332dacf305c8757674dd7a303ff Author: Pavan Savoy Date: Fri Feb 4 02:23:09 2011 -0600 drivers:misc: ti-st: register with channel IDs The architecture of shared transport had begun with individual protocols like bluetooth, fm and gps telling the shared transport what sort of protocol they are and then expecting the ST driver to parse the incoming data from chip and forward data only relevant to the protocol drivers. This change would mean each protocol drivers would also send information to ST driver as to how to intrepret their protocol data coming out of the chip. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit 6d6a49e9c9dddff61649249c2b0d5d462fa1a692 Author: Harry Wei Date: Fri Feb 4 23:59:39 2011 +0800 Fix a mistake Chinese character in Documentation/zh_CN/SubmittingPatches When i see the file linux-2.6.37/Documentation/zh_CN/SubmittingPatches , i find a mistake Chinese character in it. So i give a patch for correcting this error. Signed-off-by: Harry Wei Signed-off-by: Greg Kroah-Hartman commit ce1fd3585709e833ad102167024e97217734dbfd Author: Marek Szyprowski Date: Fri Jan 28 13:55:36 2011 +0100 USB: gadget: f_fs: even zero-length packets require a buffer Some UDC drivers fails to queue a request if req->buf == NULL even for ZLP requests. This patch adds a poisoned pointer instead of NULL to make the code compliant with the gadget specification and catches possible bug in the UDC driver if it tries to dereference buffer pointer on ZLP request. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Greg Kroah-Hartman commit 9a1b2e64020d41c577881952734fecd114af75f1 Author: Marek Szyprowski Date: Fri Jan 28 10:23:57 2011 +0100 USB: gadget: export functionfs.h to the includes available for userspace To compile functionfs userspace driver one needs definitions from include/linux/usb/functionfs.h. This patch add this file to the list of includes exported to userspace. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Greg Kroah-Hartman commit 2694a48d9007a8bdf1731c1b97d4942c9cc49296 Author: Robert Morell Date: Wed Jan 26 19:06:48 2011 -0800 USB: HCD: Add driver hooks for (un)?map_urb_for_dma Provide optional hooks for the host controller driver to override the default DMA mapping and unmapping routines. In general, these shouldn't be necessary unless the host controller has special DMA requirements, such as alignment contraints. If these are not specified, the general usb_hcd_(un)?map_urb_for_dma functions will be used instead. Also, pass the status to unmap_urb_for_dma so it can know whether the DMA buffer has been overwritten. Finally, add a flag to be used by these implementations if they allocated a temporary buffer so it can be freed properly when unmapping. Signed-off-by: Robert Morell Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c8cf203a1d228fa001b95534f639ffb7a23d5386 Author: Robert Morell Date: Wed Jan 26 19:06:47 2011 -0800 USB: HCD: Add usb_hcd prefix to exported functions The convention is to prefix symbols exported from the USB HCD core with "usb_hcd". This change makes unmap_urb_setup_for_dma() and unmap_urb_for_dma() consistent with that. Signed-off-by: Robert Morell Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d25bc4db723a44c097268b466ff74bfba4bcc4f3 Author: Pete Zaitcev Date: Thu Feb 3 22:01:36 2011 -0700 USB: usbmon: fix-up docs and text API for sparse ISO This is based on a patch that Alan Stern wrote. It did the same simple thing in both text and binary cases. In the same time, Marton and I fixed the binary side properly, but this leaves the text to be fixed. It is not very important due to low maxium data size of text, but let's add it just for extra correctness. The pseudocode is too much to keep fixed up, and we have real code to be used as examples now, so let's drop it too. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit ac8d67417816fa7c568b24a8f2891eb02e6d0462 Author: David Daney Date: Tue Jan 25 09:59:37 2011 -0800 USB: EHCI: Rearrange create_companion_file() to avoid GCC-4.6 warnings. In create_companion_file() there is a bogus assignemt to i created for the express purpose of avoiding an ignored return value warning. With pre-release GCC-4.6, this causes a 'set but not used' warning. Kick the problem further down the road by just returning i. All the callers of create_companion_file() ignore its return value, so all is good: o No warnings are issued. o We still subvert the desires of the authors of device_create_file() by ignorning error conditions. Signed-off-by: David Daney Signed-off-by: Greg Kroah-Hartman commit eb34a90861a290cd271f4b887c0d59070e1b69b0 Author: David Daney Date: Tue Jan 25 09:59:36 2011 -0800 USB: EHCI: Rearrange EHCI_URB_TRACE code to avoid GCC-4.6 warnings. With pre-release GCC-4.6, we get a 'set but not used' warning when EHCI_URB_TRACE is not set because we set the qtd variable without using it. Rearrange the statements so that we only set qtd if it will be used. Signed-off-by: David Daney Signed-off-by: Greg Kroah-Hartman commit 9a1cadb9dd9130345d59638f5b6a8a4982c2b34a Author: David Daney Date: Tue Jan 25 09:59:35 2011 -0800 USB: EHCI: Cleanup and rewrite ehci_vdgb(). The vdbg macro is not used anywhere so it can be removed. With pre-release GCC-4.6, there are several complaints of variables that are 'set but not used' caused by the ehci_vdbg() macro expanding to something that does not contain any of its arguments. We can quiet this warning by rewriting ehci_vdbg() as a variadic static inline that does nothing. Signed-off-by: David Daney Signed-off-by: Greg Kroah-Hartman commit fc427a5a4bf3be770d7fbd933474957062049f1f Author: David Daney Date: Tue Jan 25 09:59:34 2011 -0800 USB: EHCI: Remove dead code from ehci-sched.c The pre-release GCC-4.6 now correctly flags this code as dead. Signed-off-by: David Daney Signed-off-by: Greg Kroah-Hartman commit b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 Author: Andiry Xu Date: Tue Jan 25 18:41:21 2011 +0800 USB host: Move AMD PLL quirk to pci-quirks.c This patch moves the AMD PLL quirk code in OHCI/EHCI driver to pci-quirks.c, and exports the functions to be used by xHCI driver later. AMD PLL quirk disable the optional PM feature inside specific SB700/SB800/Hudson-2/3 platforms under the following conditions: 1. If an isochronous device is connected to OHCI/EHCI/xHCI port and is active; 2. Optional PM feature that powers down the internal Bus PLL when the link is in low power state is enabled. Without AMD PLL quirk, USB isochronous stream may stutter or have breaks occasionally, which greatly impair the performance of audio/video streams. Currently AMD PLL quirk is implemented in OHCI and EHCI driver, and will be added to xHCI driver too. They are doing similar things actually, so move the quirk code to pci-quirks.c, which has several advantages: 1. Remove duplicate defines and functions in OHCI/EHCI (and xHCI) driver and make them cleaner; 2. AMD chipset information will be probed only once and then stored. Currently they're probed during every OHCI/EHCI initialization, move the detect code to pci-quirks.c saves the repeat detect cost; 3. Build up synchronization among OHCI/EHCI/xHCI driver. In current code, every host controller enable/disable PLL only according to its own status, and may enable PLL while there is still isoc transfer on other HCs. Move the quirk to pci-quirks.c prevents this issue. Signed-off-by: Andiry Xu Cc: David Brownell Cc: Alex He Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a51ea8cc9cfcfd719240455ff8f217b4f165d1d0 Author: Fabio Estevam Date: Thu Jan 20 13:51:52 2011 -0200 usb: gadget/fsl_mxc_udc: Detect the CPU type in run-time Make sure we are running on a MX35 processor. Signed-off-by: Fabio Estevam Signed-off-by: Greg Kroah-Hartman commit 553fbcde3481c98a076c9744a59ad08dbc61c099 Author: Jassi Brar Date: Fri Jan 14 11:55:53 2011 +0900 USB: Gadget: Initialize wMaxPacketSize if not already set Currently, for ISO and INT, a protocol driver must chose the value for wMaxPacketSize arbitrarily. The value may be too low, resulting in lesser than efficient operation or high enough to not work with all UDC drivers. Take un-initialized wMaxPacketSize as a hint to provide maximum possible packetsize for the selected endpoint. The protocol may then choose a value not bigger than that. Signed-off-by: Jassi Brar Signed-off-by: Greg Kroah-Hartman commit 7af75af2424c3a866041e7981d91f01f93235533 Author: Vadim Tsozik Date: Sun Jan 9 01:00:11 2011 -0500 USB: serial: mct_u232: added _ioctl, _msr_to_icount and _get_icount functions Added mct_u232_ioctl (implements TIOCMIWAIT command), mct_u232_get_icount (implements TIOCGICOUNT command) and mct_u232_msr_to_icount functions. MCT U232 P9 is one of a few usb to serail adapters which converts USB +/-5v voltage levels to COM +/-15 voltages. So it can also power COM interfaced devices. This makes it very usable for legacy COM interfaced data-acquisition hardware. I tested new implementation with AWARE Electronics RM-60 radiation meter, which sends pulse via RNG COM line whenever new particle is registered. Signed-off-by: Vadim Tsozik Signed-off-by: Greg Kroah-Hartman commit b5d937de0367d26f65b9af1aef5f2c34c1939be0 Author: Grant Likely Date: Fri Feb 4 11:24:11 2011 -0700 powerpc/pci: Make both ppc32 and ppc64 use sysdata for pci_controller Currently, ppc32 uses sysdata for the pci_controller pointer, and ppc64 uses it to hold the device_node pointer. This patch moves the of_node pointer into (struct pci_bus*)->dev.of_node and (struct pci_dev*)->dev.of_node so that sysdata can be converted to always use the pci_controller pointer instead. It also fixes up the allocating of pci devices so that the of_node pointer gets assigned consistently and increments the ref count. Signed-off-by: Grant Likely commit 04bea68b2f0eeebb089ecc67b618795925268b4a Author: Sebastian Andrzej Siewior Date: Mon Jan 24 09:58:55 2011 +0530 of/pci: move of_irq_map_pci() into generic code There is a tiny difference between PPC32 and PPC64. Microblaze uses the PPC32 variant. Signed-off-by: Sebastian Andrzej Siewior [grant.likely@secretlab.ca: Added comment to #endif, moved documentation block to function implementation, fixed for non ppc and microblaze compiles] Signed-off-by: Grant Likely commit c64eae9a73a847c1698f913c893aa4012d2a30b0 Merge: c9e358d ebf5382 Author: Grant Likely Date: Fri Feb 4 11:46:43 2011 -0700 Merge commit 'v2.6.38-rc3' into devicetree/next commit 10b6089a69ed7d0fa4b8f30160c3efbf3342cc9b Author: Mika Westerberg Date: Fri Feb 4 12:22:55 2011 +0200 ASoC: ep93xx-ac97: remove extra empty line Signed-off-by: Mika Westerberg Signed-off-by: Mark Brown commit b6338bdc8305b27688a7feb8689e4ccfd42f0292 Author: Jean Pihet Date: Wed Feb 2 16:38:06 2011 +0100 ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM The new fncpy API is better suited* for copying some code to SRAM at runtime. This patch changes the ad-hoc code to the more generic fncpy API. *: 1. fncpy ensures that the thumb mode bit is propagated, 2. fncpy provides the security of type safety between the original function and the sram function pointer. Tested OK on OMAP3 in low power modes (RET/OFF) using omap2plus_defconfig with !CONFIG_THUMB2_KERNEL. Compile tested on OMAP1/2 using omap1_defconfig. Boot tested on OMAP1 & OMAP2 Tested OK with suspend/resume on OMAP2420/n810 Boots fine on osk5912 and n800 Signed-off-by: Jean Pihet Acked-by: Kevin Hilman Acked-by: Tony Lindgren Reviewed-by: Dave Martin Tested-by: Kevin Hilman Tested-by: Tony Lindgren Signed-off-by: Russell King commit c8ebae37034c0ead62eb4df8ef88e999ddb8d5cf Author: Russell King Date: Tue Jan 11 19:35:53 2011 +0000 ARM: mmci: add dmaengine-based DMA support Based on a patch from Linus Walleij. Add dmaengine based support for DMA to the MMCI driver, using the Primecell DMA engine interface. The changes over Linus' driver are: - rename txsize_threshold to dmasize_threshold, as this reflects the purpose more. - use 'mmci_dma_' as the function prefix rather than 'dma_mmci_'. - clean up requesting of dma channels. - don't release a single channel twice when it's shared between tx and rx. - get rid of 'dma_enable' bool - instead check whether the channel is NULL. - detect incomplete DMA at the end of a transfer. Some DMA controllers (eg, PL08x) are unable to be configured for scatter DMA and also listen to all four DMA request signals [BREQ,SREQ,LBREQ,LSREQ] from the MMCI. They can do one or other but not both. As MMCI uses LBREQ/LSREQ for the final burst/words, PL08x does not transfer the last few words. - map and unmap DMA buffers using the DMA engine struct device, not the MMCI struct device - the DMA engine is doing the DMA transfer, not us. - avoid double-unmapping of the DMA buffers on MMCI data errors. - don't check for negative values from the dmaengine tx submission function - Dan says this must never fail. - use new dmaengine helper functions rather than using the ugly function pointers directly. - allow DMA code to be fully optimized away using dma_inprogress() which is defined to constant 0 if DMA engine support is disabled. - request maximum segment size from the DMA engine struct device and set this appropriately. - removed checking of buffer alignment - the DMA engine should deal with its own restrictions on buffer alignment, not the individual DMA engine users. - removed setting DMAREQCTL - this confuses some DMA controllers as it causes LBREQ to be asserted for the last seven transfers, rather than six SREQ and one LSREQ. - removed burst setting - the DMA controller should not burst past the transfer size required to complete the DMA operation. Tested-by: Linus Walleij Signed-off-by: Russell King commit 51d4375dd72f352594f1a4f1d7598bf9a75b8dfe Author: Russell King Date: Thu Jan 27 10:56:52 2011 +0000 ARM: mmci: no need for separate host->data_xfered We don't need to store the number of bytes transferred in our host structure - we can store this directly in data->bytes_xfered. Signed-off-by: Russell King commit c4d877c1b3df58d89f01d7b211f58b944356eea3 Author: Russell King Date: Thu Jan 27 09:50:13 2011 +0000 ARM: mmci: avoid unnecessary switch to data available PIO interrupts We don't need to switch to data available interrupts if there's at least half a FIFO depth worth of data remaining, as we'll still get the FIFO half full interrupt. Keep this interrupt masked off until we have less than half the FIFO depth worth of data remaining. Signed-off-by: Russell King commit 7d7aa23cf0700f4025cb61bd1ac517ccf79bd460 Author: Russell King Date: Thu Jan 27 09:46:29 2011 +0000 ARM: mmci: no need to call flush_dcache_page() with sg_miter API The sg_miter API provides the required cache maintainence, so we don't need to do that ourselves. Remove the unnecessary additional cache maintainence. Signed-off-by: Russell King commit c8afc9d59ce1100d3f7704e86fda5a25361c45bf Author: Russell King Date: Fri Feb 4 09:19:46 2011 +0000 ARM: mmci: avoid reporting too many completed bytes on fifo overrun The data counter counts the number of bytes transferred on the MMC bus. When a FIFO overrun occurs, we will not have transferred a FIFOs-worth of data to memory, and so the data counter will be a FIFOs-worth ahead. If this occurs on a block boundary, we will report one too many sectors as successful. Fix this. Acked-by: Linus Walleij Signed-off-by: Russell King commit 25a64ec1e7d0cfe172832d06a31215d458dfea7f Author: Pete Zaitcev Date: Thu Feb 3 22:43:48 2011 -0700 fix comment spelling becausse => because Signed-off-by: Pete Zaitcev Signed-off-by: Jiri Kosina commit 2b7bcebf958c74124220ee8103024def8597b36c Author: Ivan Vecera Date: Wed Feb 2 08:05:12 2011 +0000 be2net: use device model DMA API Use DMA API as PCI equivalents will be deprecated. Signed-off-by: Ivan Vecera Acked-by: Ajit Khaparde Signed-off-by: David S. Miller commit 5d6a4ea576bb8d9583d1d12538403661f7d26e31 Author: Ferenc Wagner Date: Mon Jan 10 19:04:22 2011 +0100 sysfs: Capitalize description of SYSFS_DEPRECATED{_V2} options Signed-off-by: Ferenc Wagner Signed-off-by: Greg Kroah-Hartman commit 481e20799bdcf98fd5a1d829d187239a90b15395 Author: Ferenc Wagner Date: Fri Jan 7 15:17:47 2011 +0100 driver core: Replace the dangerous to_root_device macro with an inline function The original macro worked only when applied to variables named 'dev'. While this could have been fixed by simply renaming the macro argument, a more type-safe replacement by an inline function is preferred. Signed-off-by: Ferenc Wagner Signed-off-by: Greg Kroah-Hartman commit 6add7cd618b4d4dc525731beb539c5e06e891855 Author: Nathan Fontenot Date: Mon Jan 31 10:55:23 2011 -0600 memory hotplug: sysfs probe routine should add all memory sections As a follow-on to the recent patches I submitted that allowed for a sysfs memory block to span multiple memory sections, we should also update the probe routine to online all of the memory sections in a memory block. Without this patch the current code will only add a single memory section. I think the probe routine should add all of the memory sections in the specified memory block so that its behavior is in line with memory hotplug actions through the sysfs interfaces. This patch applies on top of the previous sysfs memory updates to allow a sysfs directory o span multiple memory sections. https://lkml.org/lkml/2011/1/20/245 Signed-off-by: Nathan Fontenot Signed-off-by: Greg Kroah-Hartman commit 1dc41aa6d6172d61c10638d11933a3595a41d51a Author: Nathan Fontenot Date: Thu Jan 20 10:46:15 2011 -0600 memory hotplug: Define memory_block_size_bytes for x86_64 with CONFIG_X86_UV Define a version of memory_block_size_bytes for x86_64 when CONFIG_X86_UV is set. Signed-off-by: Robin Holt Signed-off-by: Jack Steiner Signed-off-by: Nathan Fontenot Signed-off-by: Greg Kroah-Hartman commit c540ada2625caabd2dc4dc1e4740bc28765f1b4f Author: Nathan Fontenot Date: Thu Jan 20 10:45:20 2011 -0600 memory hotplug: Define memory_block_size_bytes for powerpc/pseries Define a version of memory_block_size_bytes() for powerpc/pseries such that a memory block spans an entire lmb. Signed-off-by: Nathan Fontenot Reviewed-by: Robin Holt Signed-off-by: Greg Kroah-Hartman commit d33601644cd3b09afb2edd9474517edc441c8fad Author: Nathan Fontenot Date: Thu Jan 20 10:44:29 2011 -0600 memory hotplug: Update phys_index to [start|end]_section_nr Update the 'phys_index' property of a the memory_block struct to be called start_section_nr, and add a end_section_nr property. The data tracked here is the same but the updated naming is more in line with what is stored here, namely the first and last section number that the memory block spans. The names presented to userspace remain the same, phys_index for start_section_nr and end_phys_index for end_section_nr, to avoid breaking anything in userspace. This also updates the node sysfs code to be aware of the new capability for a memory block to contain multiple memory sections and be aware of the memory block structure name changes (start_section_nr). This requires an additional parameter to unregister_mem_sect_under_nodes so that we know which memory section of the memory block to unregister. Signed-off-by: Nathan Fontenot Reviewed-by: Robin Holt Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: Greg Kroah-Hartman commit 0c2c99b1b8ab5d294f176d631e945ebdefcce4cd Author: Nathan Fontenot Date: Thu Jan 20 10:43:34 2011 -0600 memory hotplug: Allow memory blocks to span multiple memory sections Update the memory sysfs code such that each sysfs memory directory is now considered a memory block that can span multiple memory sections per memory block. The default size of each memory block is SECTION_SIZE_BITS to maintain the current behavior of having a single memory section per memory block (i.e. one sysfs directory per memory section). For architectures that want to have memory blocks span multiple memory sections they need only define their own memory_block_size_bytes() routine. Update the memory hotplug documentation to reflect the new behaviors of memory blocks reflected in sysfs. Signed-off-by: Nathan Fontenot Reviewed-by: Robin Holt Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: Greg Kroah-Hartman commit 8e6d3fe1af38bea3f6c003f8737d2e3a02d00fa0 Author: Stephen Boyd Date: Thu Feb 3 15:48:36 2011 -0800 hvc_dcc: Simplify assembly for v6 and v7 ARM The inline assembly differences for v6 vs. v7 in the hvc_dcc driver are purely optimizations. On a v7 processor, an mrc with the pc sets the condition codes to the 28-31 bits of the register being read. It just so happens that the TX/RX full bits the DCC driver is testing for are high enough in the register to be put into the condition codes. On a v6 processor, this "feature" isn't implemented and thus we have to do the usual read, mask, test operations to check for TX/RX full. Since we already test the RX/TX full bits before calling __dcc_getchar() and __dcc_putchar() we don't actually need to do anything special for v7 over v6. The only difference is in hvc_dcc_get_chars(). We would test RX full, poll RX full, and then read a character from the buffer, whereas now we will test RX full, read a character from the buffer, and then test RX full again for the second iteration of the loop. It doesn't seem possible for the buffer to go from full to empty between testing the RX full and reading a character. Therefore, replace the v7 versions with the v6 versions and everything works the same. Acked-by: Tony Lindgren Cc: Arnd Bergmann Acked-by: Nicolas Pitre Cc: Daniel Walker Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman commit bf73bd35a296b31dace098b9104b6b593ee0070f Author: Stephen Boyd Date: Thu Feb 3 15:48:35 2011 -0800 hvc_dcc: Simplify put_chars()/get_chars() loops Casting and anding with 0xff is unnecessary in hvc_dcc_put_chars() since buf is already a char[]. __dcc_get_char() can't return an int less than 0 since it only returns a char. Simplify the if statement in hvc_dcc_get_chars() to take this into account. Cc: Daniel Walker Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman commit a99632014631409483a481a6a0d77d09ded47239 Author: Stephen Boyd Date: Thu Feb 3 15:48:34 2011 -0800 hvc_dcc: Fix bad code generation by marking assembly volatile Without marking the asm __dcc_getstatus() volatile my compiler decides it can cache the value of __ret in a register and then check the value of it continually in hvc_dcc_put_chars() (I had to replace get_wait/put_wait with 1 and fixup the branch otherwise my disassembler barfed on __dcc_(get|put)char). 00000000 : 0: ee103e11 mrc 14, 0, r3, cr0, cr1, {0} 4: e3a0c000 mov ip, #0 ; 0x0 8: e2033202 and r3, r3, #536870912 ; 0x20000000 c: ea000006 b 2c 10: e3530000 cmp r3, #0 ; 0x0 14: 1afffffd bne 10 18: e7d1000c ldrb r0, [r1, ip] 1c: ee10fe11 mrc 14, 0, pc, cr0, cr1, {0} 20: 2afffffd bcs 1c 24: ee000e15 mcr 14, 0, r0, cr0, cr5, {0} 28: e28cc001 add ip, ip, #1 ; 0x1 2c: e15c0002 cmp ip, r2 30: bafffff6 blt 10 34: e1a00002 mov r0, r2 38: e12fff1e bx lr As you can see, the value of the mrc is checked against DCC_STATUS_TX (bit 29) and then stored in r3 for later use. Marking the asm volatile produces the following: 00000000 : 0: e3a03000 mov r3, #0 ; 0x0 4: ea000007 b 28 8: ee100e11 mrc 14, 0, r0, cr0, cr1, {0} c: e3100202 tst r0, #536870912 ; 0x20000000 10: 1afffffc bne 8 14: e7d10003 ldrb r0, [r1, r3] 18: ee10fe11 mrc 14, 0, pc, cr0, cr1, {0} 1c: 2afffffd bcs 18 20: ee000e15 mcr 14, 0, r0, cr0, cr5, {0} 24: e2833001 add r3, r3, #1 ; 0x1 28: e1530002 cmp r3, r2 2c: bafffff5 blt 8 30: e1a00002 mov r0, r2 34: e12fff1e bx lr which looks better and actually works. Mark all the inline assembly in this file as volatile since we don't want the compiler to optimize away these statements or move them around in any way. Acked-by: Tony Lindgren Cc: Arnd Bergmann Acked-by: Nicolas Pitre Cc: Daniel Walker Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman commit e8d9792aa514e49bf618713987c393d93babc2c5 Author: Greg Kroah-Hartman Date: Thu Feb 3 15:59:58 2011 -0800 dynamic_debug: add #include This fixes a build breakage caused by 8ba6ebf583f12da32036fc0f003ab4043e54692e "Dynamic debug: Add more flags" Cc: Bart Van Assche Signed-off-by: Greg Kroah-Hartman commit c47dda7d179dde17697c3f839f150fecaf6770cb Author: Tomoya MORINAGA Date: Wed Dec 22 21:04:11 2010 +0900 pch_phub: add new device ML7213 Add ML7213 device information. ML7213 is companion chip of Intel Atom E6xx series for IVI(In-Vehicle Infotainment). ML7213 is completely compatible for Intel EG20T PCH. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit d66ecccd23bfe1d1416d5fb34778002bb488cce1 Author: Harry Wei Date: Fri Feb 4 01:16:55 2011 +0800 Translate Documentation/SecurityBugs into Chinese Signed-off-by: Harry Wei Signed-off-by: Greg Kroah-Hartman commit f4203e3032e5ae74c3e89df85a5a6d96022d0c49 Author: Borislav Petkov Date: Tue Feb 1 17:19:56 2011 +0100 sysdev: Do not register with sysdev when erroring on add When encountering an error while executing the driver's ->add method, we should cancel registration and unwind what we've regged so far. The low level ->add methods do return proper error codes but those aren't looked at in sysdev_driver_register(). Fix that by sharing the unregistering code. Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman commit 1f7da214e26a8ee4fbb66af50e27147d5d115c5a Author: Amerigo Wang Date: Tue Jan 18 13:09:21 2011 -0800 debugfs: remove module_exit() debugfs can't be a module, so module_exit() is meaningless for it. Signed-off-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 345279bc105e5a331ee81b0e8446b61f2c155784 Author: Borislav Petkov Date: Tue Feb 1 17:19:57 2011 +0100 sysdev: Fixup warning message Use gcc's __func__ instead of the function name. Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman commit 072fc8f0a8df9bf36392f15b729044cb2ad27332 Author: Bob Liu Date: Wed Jan 26 18:33:32 2011 +0800 firmware_classs: change val uevent's type to bool Some place in firmware_class.c using "int uevent" define, but others use "bool uevent". This patch replace all int uevent define to bool. Signed-off-by: Bob Liu Acked-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 8ba6ebf583f12da32036fc0f003ab4043e54692e Author: Bart Van Assche Date: Sun Jan 23 17:17:24 2011 +0100 Dynamic debug: Add more flags Add flags that allow the user to specify via debugfs whether or not the module name, function name, line number and/or thread ID have to be included in the printed message. Signed-off-by: Bart Van Assche Cc: Greg Banks Cc: Konrad Rzeszutek Wilk Signed-off-by: Greg Kroah-Hartman commit 9b99b7f84ea520d2ecaf816bde247a1ad07e454e Author: Bart Van Assche Date: Sat Jan 1 13:51:52 2011 +0100 kobject: Add missing format attribute specifications Several functions in accept printf-style arguments. Some of these functions have been annotated with a format attribute declaration while others have not been annotated. Add a format attribute specification where it is missing. Signed-off-by: Bart Van Assche Signed-off-by: Greg Kroah-Hartman commit d3f70befd9a6ab79413f303109e2c701472e2785 Author: Bart Van Assche Date: Tue Dec 21 13:09:47 2010 +0100 docs/sysfs: show() methods should use scnprintf(). Since snprintf() may return a value that exceeds its second argument, show() methods should use scnprintf() instead of snprintf(). This patch updates the example in the sysfs documentation accordingly. Signed-off-by: Bart Van Assche Cc: Tejun Heo Cc: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 5480bcdd60603f834b7c0c252213ca1932c28bfc Author: Bart Van Assche Date: Tue Dec 21 13:09:23 2010 +0100 docs/sysfs: Update directory/kobject documentation. Some time ago the way how sysfs stores a pointer to a kobject corresponding to a directory was modified. This patch brings the documentation again in sync with the implementation. Signed-off-by: Bart Van Assche Cc: Tejun Heo Cc: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit a5462516aa9942bd68c8769d4bcefa8a7c718300 Author: Timur Tabi Date: Mon Dec 13 14:08:52 2010 -0600 driver-core: document restrictions on device_rename() Add text, courtesy of Kay Sievers, that provides some background on device_rename() and why it shouldn't be used. Signed-off-by: Timur Tabi Signed-off-by: Greg Kroah-Hartman commit 380042f2db653b324ae756d102d872c1ecd412c5 Author: Tomoya MORINAGA Date: Fri Jan 28 18:00:02 2011 +0900 serial: pch_uart: revert Kconfig for non-DMA mode PCH_DMA is not always enabled when a user uses PCH_UART. Since overhead of DMA is not small, in case of low frequent communication, without DMA is better. Thus, "select PCH_DMA" and DMADEVICES are unnecessary Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit 4564e1ef219fa69ed827fe2613569543a6b26fbc Author: Tomoya MORINAGA Date: Fri Jan 28 18:00:01 2011 +0900 serial: pch_uart: support new device ML7213 Support ML7213 device of OKI SEMICONDUCTOR. ML7213 is companion chip of Intel Atom E6xx series for IVI(In-Vehicle Infotainment). ML7213 is completely compatible for Intel EG20T PCH. Signed-off-by: Tomoya MORINAGA Signed-off-by: Greg Kroah-Hartman commit f094298bae5f5d0e1cb3bff4621aae7ef486812a Author: Tejun Heo Date: Mon Jan 24 17:53:41 2011 +0100 68328serial: remove unsed m68k_serial->tqueue_hangup m68k_serial->tqueue_hangup is unused. Remove it. Signed-off-by: Tejun Heo Cc: Greg Ungerer Signed-off-by: Greg Kroah-Hartman commit 5933a161abcb8d83a2c145177f48027c3c0a8995 Author: Yin Kangkai Date: Sun Jan 30 11:15:30 2011 +0800 serial-core: reset the console speed on resume On some platforms, we need to restore the console speed on resume even it was not suspended (no_console_suspend), and on others we don't have to do that. So don't care about the "console_suspend_enabled" and unconditionally reset the console speed if it is a console. This is actually a redo of ba15ab0 (Set proper console speed on resume if console suspend is disabled) from Deepak Saxena. I also tried to investigate more to find out if this change will break others, here is what I've found out: commit 891b9dd10764352926e1e107756aa229dfa2c210 Author: Jason Wang serial-core: restore termios settings when resume console ports commit ca2e71aa8cfb0056ce720f3fd53f59f5fac4a3e1 Author: Jason Wang serial-core: skip call set_termios/console_start when no_console_suspend commit 4547be7809a3b775ce750ec7f8b5748954741523 Author: Stanislav Brabec serial-core: resume serial hardware with no_console_suspend commit ba15ab0e8de0d4439a91342ad52d55ca9e313f3d Author: Deepak Saxena Set proper console speed on resume if console suspend is disabled from ba15ab0, we learned that, even if the console suspend is disabled (when no_console_suspend is set), we may still need to "reset the port to the state it was in before we suspended." Then with 4547be7, this piece of code is removed. And then Jason Wang added that back in ca2e71a and 891b9dd, to fix some breakage on OMAP3EVM platform. From ca2e71a we learned that the "set_termios" things is actually needed by both console is suspended and not suspended. That's why I removed the console_suspended_enabled condition, and only call console_start() when we actually suspeneded it. I also noticed in this thread: http://marc.info/?t=129079257100004&r=1&w=2, which talked about on some platforms, UART HW will be cut power whether or not we set no_console_suspend, and then on resume it does not work quite well. I have a similar HW, and this patch fixed this issue, don't know if this patch also works on their platforms. [Update: Stanislav tested this patch on Zaurus and reported it improves the situation. Thanks.] CC: Greg KH CC: Deepak Saxena CC: Jason Wang CC: Stanislav Brabec CC: Daniel Drake Signed-off-by: Yin Kangkai Signed-off-by: Greg Kroah-Hartman commit d8653d305ef66861c91fa7455fb8038460a7274c Author: Dan Carpenter Date: Tue Jan 25 14:15:11 2011 +0000 serial: mrst_max3110: make buffer larger This is used to store the spi_device ->modalias so they have to be the same size. SPI_NAME_SIZE is 32. Signed-off-by: Dan Carpenter Signed-off-by: Alan Cox Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman commit 0a1f1a0b626d79071ee9fe91b7fcd28be6332677 Author: Tejun Heo Date: Mon Jan 24 17:54:12 2011 +0100 tty_ldisc: don't use flush_scheduled_work() flush_scheduled_work() is scheduled to be deprecated. Explicitly sync flush the used work items instead. Note that before this change, flush_scheduled_work() wouldn't have properly flushed tty->buf.work if it were on timer. Signed-off-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit 78841462d72fe7038cb7ea48adecc6fc395f2dc5 Author: Jarkko Nikula Date: Mon Jan 24 17:51:22 2011 +0200 serial: omap-serial: Enable the UART wake-up bits always OMAP can do also dynamic idling so wake-up enable register should be set also while system is running. If UART_OMAP_WER is not set, then for instance the RX activity cannot wake up the UART port that is sleeping. This RX wake-up feature was working when the 8250 driver was used instead of omap-serial. Reason for this is that the 8250 doesn't set the UART_OMAP_WER and then arch/arm/mach-omap2/pm34xx.c ends up saving and restoring the reset default which is the same than value OMAP_UART_WER_MOD_WKUP here. Fix this by moving the conditional UART_OMAP_WER write from serial_omap_pm into serial_omap_startup where wake-up bits are set unconditionally. Signed-off-by: Jarkko Nikula Cc: Govindraj.R Signed-off-by: Greg Kroah-Hartman commit 681d119047761cc59a15c0bb86891f3a878997cf Author: Jouni Malinen Date: Thu Feb 3 18:35:19 2011 +0200 mac80211: Add testing functionality for TKIP TKIP countermeasures depend on devices being able to detect Michael MIC failures on received frames and for stations to report errors to the AP. In order to test that behavior, it is useful to be able to send out TKIP frames with incorrect Michael MIC. This testing behavior has minimal effect on the TX path, so it can be added to mac80211 for convenient use. The interface for using this functionality is a file in mac80211 netdev debugfs (tkip_mic_test). Writing a MAC address to the file makes mac80211 generate a dummy data frame that will be sent out using invalid Michael MIC value. In AP mode, the address needs to be for one of the associated stations or ff:ff:ff:ff:ff:ff to use a broadcast frame. In station mode, the address can be anything, e.g., the current BSSID. It should be noted that this functionality works correctly only when associated and using TKIP. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 747d753df7fea1d2d29c5c33623f6d2e5d0ed2d6 Author: Jouni Malinen Date: Thu Feb 3 18:34:28 2011 +0200 mac80211: Remove obsolete TKIP flexibility The TKIP implementation was originally prepared to be a bit more flexible in the way Michael MIC TX/RX keys are configured. However, we are now taking care of the TX/RX MIC key swapping in user space, so this code will not be needed. Similarly, there were some remaining WPA testing code that won't be used in their current form. Remove the unneeded extra complexity. Signed-off-by: Jouni Malinen Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 942a84901b71f8ac1edb80c4b9db08441536a440 Author: Justin P. Mattock Date: Tue Feb 1 21:06:21 2011 -0800 drivers:net:ipw2100.c change a typo comamnd to command The below patch fixes a typo comamnd to command. Signed-off-by: Justin P. Mattock Signed-off-by: John W. Linville commit 391bd1c443f70447616ce0e152f13daee5ca448f Author: Rajkumar Manoharan Date: Tue Feb 1 23:05:36 2011 +0530 ath9k: reserve a beacon slot on beaconing vif addition The beaconing vif addition is based on max beacon slot available. So it is better to reserve a beacon slot on interface addition and let it be configured properly on bss_info change. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit e9d7732eafe38a717212648b7615399e68abb551 Author: Johannes Berg Date: Tue Feb 1 15:35:36 2011 +0100 mac80211: allow GO to scan like AP There's no point in disallowing scanning for a GO interface when it's not beaconing yet. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 771bbd09f7febb854dd7c30f983aa57535f9e8c9 Author: Arik Nemtsov Date: Tue Feb 1 13:23:05 2011 +0200 mac80211: pass up beacons from external BSS when operating as AP Beacons from external BSSes are required for updating overlapping BSS info (i.e. ERP protection). Pass them up unconditionally. Signed-off-by: Arik Nemtsov Signed-off-by: John W. Linville commit d057e5a381cbaec5632117bf62ba49438ab16214 Author: Arik Nemtsov Date: Mon Jan 31 22:29:13 2011 +0200 mac80211: add HW flag for disabling auto link-PS in AP mode When operating in AP mode the wl1271 hardware filters out null-data packets as well as management packets. This makes it impossible for mac80211 to monitor the PS mode by using the PM bit of incoming frames. Implement a HW flag to indicate that mac80211 should ignore the PM bit. In addition, expose ieee80211_sta_ps_transition() to make low-level drivers capable of controlling PS-mode. Signed-off-by: Arik Nemtsov Signed-off-by: John W. Linville commit 8fd369eeaa81d05969787c9ddf9cf3f1a8c4e084 Author: Arik Nemtsov Date: Mon Jan 31 22:29:12 2011 +0200 mac80211: do not calc frame duration when using HW rate-control When rate-control is performed in HW, we cannot calculate frame duration as we do not have the skb transmission rate in SW. ieee80211_tx_h_calculate_duration() should only be called when ieee80211_tx_h_rate_ctrl() has been called before to initialize data in skb->cb. This doesn't happen for drivers with HW rate-control. Fixes the following warning when operating in AP-mode in a driver with HW rate-control. WARNING: at net/mac80211/tx.c:57 ieee80211_duration+0x54/0x1d8 [mac80211]() Modules linked in: wl1271_sdio wl1271 firmware_class crc7 mac80211 cfg80211 [] (unwind_backtrace+0x0/0x124) from [] (warn_slowpath_common+0x4c/0x64) [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_null+0x18/0x1c) [] (warn_slowpath_null+0x18/0x1c) from [] (ieee80211_duration+0x54/0x1d8 [mac80211]) [] (ieee80211_duration+0x54/0x1d8 [mac80211]) from [] (invoke_tx_handlers+0xfa0/0x1088 [mac80211]) [] (invoke_tx_handlers+0xfa0/0x1088 [mac80211]) from [] (ieee80211_tx+0x84/0x248 [mac80211]) [] (ieee80211_tx+0x84/0x248 [mac80211]) from [] (ieee80211_tx_pending+0x12c/0x278 [mac80211]) [] (ieee80211_tx_pending+0x12c/0x278 [mac80211]) from [] (tasklet_action+0x68/0xbc) [] (tasklet_action+0x68/0xbc) from [] (__do_softirq+0x84/0x114) [] (__do_softirq+0x84/0x114) from [] (do_softirq+0x48/0x54) [] (do_softirq+0x48/0x54) from [] (local_bh_enable+0x98/0xcc) [] (local_bh_enable+0x98/0xcc) from [] (wl1271_rx+0x2e8/0x3a4 [wl1271]) [] (wl1271_rx+0x2e8/0x3a4 [wl1271]) from [] (wl1271_irq_work+0x230/0x310 [wl1271]) [] (wl1271_irq_work+0x230/0x310 [wl1271]) from [] (process_one_work+0x208/0x350) [] (process_one_work+0x208/0x350) from [] (worker_thread+0x1cc/0x300) [] (worker_thread+0x1cc/0x300) from [] (kthread+0x84/0x8c) [] (kthread+0x84/0x8c) from [] (kernel_thread_exit+0x0/0x8) Signed-off-by: Arik Nemtsov Signed-off-by: John W. Linville commit 2cf22b897c63df65e7360a1897e5312c58617fbd Author: Ben Greear Date: Mon Jan 31 11:30:09 2011 -0800 mac80211: Recalculate channel-type on iface removal. When a vif goes away, it could cause the super-chan to be recalculated differently, so do that calculation on iface removal. Signed-off-by: Ben Greear Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 4e6975f7b8ca31febaa94a1ee1acfb5322f8a82b Author: Ben Greear Date: Mon Jan 31 10:37:36 2011 -0800 ath9k: Show channel type and frequency in debugfs. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 4c89fe954d929781126af41691fba1bc670293a5 Author: Rajkumar Manoharan Date: Mon Jan 31 23:47:46 2011 +0530 ath9k: do not access hw registers in FULL SLEEP The opmode recalculation is accessing hw registers. When it is called from remove interface callback and if there are no vifs present then hw is moved to FULL SLEEP by radio disable. So use power save wrappers before accessing hw registers in calculating opmode state. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit b2a5c3dfecf3d0e1db08ac7cd94ee4c1cf9bc998 Author: Rajkumar Manoharan Date: Mon Jan 31 23:47:45 2011 +0530 ath9k_htc: make use common of function to update txpower Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 5048e8c378d095a548fe8a6ecd2f07d277ac5be2 Author: Rajkumar Manoharan Date: Mon Jan 31 23:47:44 2011 +0530 ath9k: move update tx power to common move ath_update_txpow to common to remove code duplication in both ath9k & ath9k_htc. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit c344c9cb01d1dc65f2d5c85f22790e7f01d7dcd8 Author: Rajkumar Manoharan Date: Mon Jan 31 23:47:43 2011 +0530 ath9k: use common get current channel function Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 45655baa42ce4116dd8a8d93832d75b4b264137a Author: Rajkumar Manoharan Date: Mon Jan 31 23:47:42 2011 +0530 ath9k_htc: cancel ani work in ath9k_htc_stop ani work is cancelled in dissaoctiation. But in some cases during suspend, deauthention never be called. So we failed to stop ani work which was identified by the following warning. Call Trace: [] ieee80211_can_queue_work.clone.17+0x2d/0x40 [mac80211] [] ieee80211_queue_delayed_work+0x30/0x60 [mac80211] [] ath9k_ani_work+0x142/0x250 [ath9k_htc] [] async_run_entry_fn+0x0/0x180 [] ath9k_ani_work+0x0/0x250 [ath9k_htc] Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit bf6a0579f60ae5225280c82cc52b51db1255e7fb Author: Juuso Oikarinen Date: Mon Jan 31 15:52:58 2011 +0200 cfg80211: Fix power save state after interface type change Currently cfg80211 only configures the PSM state to the driver upon creation of a new virtual interface, but not after interface type change. The mac80211 on the other hand reinitializes its sdata structure every time the interface type is changed, losing the PSM configuration. Hence, if the interface type is changed to, say, ad-hoc and then back to managed, "iw wlan0 get power_save" will claim that PSM is enabled, when in fact on mac80211 level it is not. Fix this in cfg80211 by configuring the PSM state to the driver each time the interface is brought up instead of just when the interface is created. Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 73b30dfe4f756315b8cc431fca3ff340090c0ae4 Author: David Gnedt Date: Sun Jan 30 20:11:10 2011 +0100 wl1251: set rate index and preamble flag on received packets Set the rate index rate_idx and preamble flag RX_FLAG_SHORTPRE on received packets. Signed-off-by: David Gnedt Acked-by: Kalle Valo Signed-off-by: John W. Linville commit 43d136442a0af3b26df3f16c7b935b5ea12e493f Author: David Gnedt Date: Sun Jan 30 20:11:04 2011 +0100 wl1251: enable adhoc mode Enable adhoc support in wl1251 driver. Signed-off-by: David Gnedt Acked-by: Kalle Valo Signed-off-by: John W. Linville commit 8964e492b5740dae0f4f68e08f4a9a45d4b57620 Author: David Gnedt Date: Sun Jan 30 20:11:00 2011 +0100 wl1251: implement connection quality monitoring Implement connection quality monitoring similar to the wl1271 driver. It triggers ieee80211_cqm_rssi_notify with the corresponding event when RSSI drops blow RSSI threshold or rises again above the RSSI threshold. It should be noted that wl1251 doesn't support RSSI hysteresis, instead it uses RSSI averageing and delays events until a certain count of frames proved RSSI change. Signed-off-by: David Gnedt Acked-by: Kalle Valo Signed-off-by: John W. Linville commit c3e334d29484423e78009790a3d3fa78da8b43a1 Author: David Gnedt Date: Sun Jan 30 20:10:57 2011 +0100 wl1251: enable beacon early termination while in power-saving mode Port the beacon early termination feature from wl1251 driver version included in the Maemo Fremantle kernel. It is enabled when going to power-saving mode and disabled when leaving power-saving mode. Signed-off-by: David Gnedt Acked-by: Kalle Valo Signed-off-by: John W. Linville commit bb4793b3c6370a1fed86978c6590241d770cb43e Author: David Gnedt Date: Sun Jan 30 20:10:48 2011 +0100 wl1251: fix 4-byte TX buffer alignment This implements TX buffer alignment for cloned or too small skb by copying and replacing the original skb. Recent changes in wireless-testing seems to make this really necessary. Signed-off-by: David Gnedt Acked-by: Kalle Valo Signed-off-by: John W. Linville commit e7332a41442bde1c14550998cadceca34c967dfc Author: David Gnedt Date: Sun Jan 30 20:10:46 2011 +0100 wl1251: fix queue stopping/waking for TX path The queue stopping/waking functionality was broken in a way that could cause the TX to stall if the right circumstances are met. The problem was caused by tx_work, which is scheduled on each TX operation. If the firmware buffer is full, tx_work does nothing. In combinition with stopped queues or non-continues transfers, tx_work is never scheduled again. Moreover the low watermark introduced by 9df86e2e702c6d5547aced7f241addd2d698bb11 never takes effect because of some old code. Solve this by scheduling tx_work every time tx_queue is non-empty and firmware buffer is freed on tx_complete. This also solves a possible but unlikely case: If less frames than the high watermark are queued, but more than firmware buffer can hold. This results in queues staying awake but the only scheduled tx_work doesn't transfer all frames, so the remaining frames are stuck in the queue until more frames get queued and tx_work is scheduled again. Signed-off-by: David Gnedt Acked-by: Kalle Valo Signed-off-by: John W. Linville commit 172710bf8305c1b145796e34426c865480884024 Author: Ben Greear Date: Fri Jan 28 17:05:43 2011 -0800 mac80211: Warn users if HT fails because of freq mismatch. I have a netgear WNDR3700 that appears to have an off-by-four bug in how it fills out the hti->control_chan (I configure the AP to channel 11, it reports 15 as control_chan). Poke a message into the kernel logs to give users a clue as to why they are not getting the expected channel-type or rate. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 0fa025f0a29ec6848b67a3021db4248c9dcc78ed Author: Ben Greear Date: Fri Jan 28 17:05:42 2011 -0800 mac80211: Show configured channel-type in netdev debugfs. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit eeabee7e53f6fb5e63027519982b19616e8f166e Author: Ben Greear Date: Fri Jan 28 10:20:47 2011 -0800 mac80211: Be more careful when changing channels. If we cannot set the channel type, set the channel back to the original. Don't update the driver hardware if nothing actually changed. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 75abde4d193fe300a2c1d3ee7f632eb777aa48b2 Author: Vasily Khoruzhick Date: Fri Jan 21 22:44:49 2011 +0200 libertas: Prepare stuff for if_spi.c pm support To support suspend/resume in if_spi we need two things: - re-setup fw in lbs_resume(), because if_spi powercycles card; - don't touch hwaddr on second lbs_update_hw_spec() call for same reason; Signed-off-by: Vasily Khoruzhick Signed-off-by: John W. Linville commit 16f775befc1ccf67e6b223c4d9bb17ac3502ab2c Author: Vasily Khoruzhick Date: Fri Jan 21 22:44:48 2011 +0200 libertas_spi: Use workqueue in hw_host_to_card Use workqueue to perform SPI xfers, it's necessary to fix nasty "BUG: scheduling while atomic", because spu_write() calls spi_sync() and spi_sync() may sleep, but hw_host_to_card() callback can be called from atomic context. Remove kthread completely, workqueue now does its job. Restore intermediate buffers which were removed in commit 86c34fe89e9cad9e1ba4d1a8bbf98259035f4caf that introduced mentioned bug. Signed-off-by: Vasily Khoruzhick Signed-off-by: John W. Linville commit dbd98308a5dc6bc7e8e79ca8b7a0038638d24605 Merge: fa9a741 c52bf9b Author: John W. Linville Date: Thu Feb 3 16:35:20 2011 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit fd95240568977ebd1ebb15b071464e0e392cde1a Merge: cdfb74d fa9a741 Author: David S. Miller Date: Thu Feb 3 13:06:43 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 7d7a7e043872d2ebf91e90fd4ce5845179cf5b00 Merge: c45bfcc 6ed8f14 Author: Mark Brown Date: Thu Feb 3 20:17:54 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit c45bfccfa299a9b3a20373963c286b4e9bd3c40f Author: Mark Brown Date: Thu Feb 3 14:07:15 2011 +0000 ASoC: Sort ALC5623 in Kconfig and Makefile Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 364a6ece62455f669336e50d5b00f14ba650da93 Author: Thomas Weber Date: Tue Feb 1 08:30:41 2011 +0100 OMAP: Enable Magic SysRq on serial console ttyOx Magic SysRq key is not working for OMAP on new serial console ttyOx because SUPPORT_SYSRQ is not defined for omap-serial. This patch defines SUPPORT_SYSRQ in omap-serial and enables handling of Magic SysRq character. Further there is an issue of losing first break character. Removing the reset of the lsr_break_flag fixes this issue. Signed-off-by: Thomas Weber Acked-by: Govindraj.R Tested-by: Manjunath G Kondaiah Acked-by: Kevin Hilman Signed-off-by: Greg Kroah-Hartman commit 2f1522eccb09188f0008168f75420bc2fedc9cae Author: Russ Gorby Date: Wed Feb 2 12:56:58 2011 -0800 serial: ifx6x60: expanded info available from platform data Some platform attributes (e.g. max_hz, use_dma) were being intuited from the modem type. These things should be specified by the platform data. Added max_hz, use_dma to ifx_modem_platform_data definition, replaced is_6160 w/ modem_type, and changed clients accordingly Signed-off-by: Russ Gorby Signed-off-by: Greg Kroah-Hartman commit a5f4dbf0ae972510faca799a809d3771fab323b7 Author: Feng Tang Date: Wed Jan 12 15:03:42 2011 +0800 serial: mfd: remove the timeout workaround for A0 This is kind of a revert for commit 669b7a0938e "hsu: add a periodic timer to check dma rx channel", which is a workaround for a bug in A0 stepping silicon, where a dma rx data timeout is missing for some case. Since new silicon has fixed it and the old version is phasing out, no need to carry on it any more. Signed-off-by: Feng Tang Signed-off-by: Greg Kroah-Hartman commit 940f3be4058e0aff0505fd6f68e29e547e10e552 Author: Vasiliy Kulikov Date: Mon Jan 17 13:08:52 2011 +0300 tty: serial: bfin_sport_uart: fix signedness error sport->port.irq is unsigned, check for <0 doesn't make sense. Explicitly cast it to int to check for error. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit 7d48ec3698e7b747efa744fd340b0f2d1dbfd3e0 Author: Bernhard Walle Date: Thu Feb 3 09:37:18 2011 +0100 spi/spidev: Add 32 bit compat ioctl() Add the compat_ioctl for operations on /dev/spi* so that 32 bit userspace applications can access SPI. As far as I can see all data structure are already prepared for that, so no additional conversion has to be done. My use case is MIPS with N32 userspace ABI and toolchain, and that was also the platform where I tested it successfully (Cavium Octeon). Signed-off-by: Bernhard Walle Reviewed-by: Arnd Bergmann Signed-off-by: Grant Likely commit 759ae89a6e29472cde17b80778a690430252049a Author: Stefan Achatz Date: Thu Feb 3 17:10:30 2011 +0100 HID: roccat: Add 'Users:' tag to sysfs documentation Added 'Users:' tag to sysfs documentation of roccat device drivers pointing to project website at sourceforge. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 75b07022462fc33d6be15669ad604118653210a9 Author: Chris Schlund Date: Thu Feb 3 16:41:47 2011 +0100 HID: add support for wireless remote LC Power model RC1000MCE Signed-off-by: Chris Schlund Signed-off-by: Jiri Kosina commit 5dc0c9835fb96c75c8dbf657393764bd0abbac04 Author: Stefan Achatz Date: Thu Feb 3 16:14:43 2011 +0100 HID: roccat: Rename header roccat.h -> hid-roccat.h It was desired that the header roccat.h should be named hid-roccat.h Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit e6fa47af5542df3383a78d7cc78f5d5ef63c0d42 Author: Stefan Achatz Date: Sun Jan 30 13:38:30 2011 +0100 HID: roccat: Fix bug that prevented roccat chardev from removing devices pointer to device was cleared too early. This is fixed now. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 74b643dac475e29f53f4132d2349ec1dba3c9e44 Author: Stefan Achatz Date: Sun Jan 30 13:38:27 2011 +0100 HID: roccat: Fix NULL pointer dereference when unloading module Class was destroyed before starting the unregistering driver chain. Disconnecting a device from roccat chardev in this process then raised a NULL pointer dereference. Fixed this by destroying class after unregistering driver. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 8211e46004518c977f70f2661da961d5ba617399 Author: Stefan Achatz Date: Sun Jan 30 13:38:25 2011 +0100 HID: roccat: Add ioctl command to retreive report size from chardev Roccat chardev was reworked to support only a defined report size per device and this can be retreived by an ioctl now to enable future changes in report definitions. Header was moved/renamed from drivers/hid to include/linux for accessibility. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 432762e28b8146d0feff61cc8063b26c517acf26 Author: Stefan Achatz Date: Sun Jan 30 13:38:26 2011 +0100 HID: roccat: Increase waiting time for Kone[+] to prevent occasional freezes On newer kernels the device freezes occasionally on initialization with just 70msec between reads. Increased this value to safe 100msec. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 0e70f97f257edcef4daa92ab9371a9aac0c851ed Author: Stefan Achatz Date: Sun Jan 30 13:38:24 2011 +0100 HID: roccat: Add support for Kova[+] mouse This patch adds support for Roccat Kova[+] mouse. Userland tools can soon be found at http://sourceforge.net/projects/roccat Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 5772f63613ce0a6777e82a7e8fb553e49da27719 Author: Stefan Achatz Date: Sun Jan 30 13:38:23 2011 +0100 HID: roccat: Introduce module hid-roccat-common Module hid-roccat-common contains functions used by roccat device driver modules to reduce code duplication. At the moment it contains just two wrapper methods for usb_control_msg that ensure that the buffer used for transfer is dma capable which wasn't the case before. The kconfig option is not visible to the user but will be selected by the device specific drivers. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit a28764ef80dd5aef657f810a9c295ccda421c823 Author: Stefan Achatz Date: Sun Jan 30 13:38:21 2011 +0100 HID: roccat: Use new hid_err macros Using the new hid_err macros instead of dev_err. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit cb38cd87862aa515cd0559473e94d4495372a590 Author: Stefan Achatz Date: Sun Jan 30 13:38:20 2011 +0100 HID: roccat: Remove empty function definitions for roccat chardev Roccat chardev is a dependency of all device specific drivers, so the empty definitions are not needed anymore. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 22cbba1b82de458028f4aa270e88492b622c1ea8 Author: Marc Kleine-Budde Date: Wed Feb 2 13:50:30 2011 +0100 ARM: mxs: dynamically register flexcan devices for mx28 Signed-off-by: Marc Kleine-Budde Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 6ea038a7771be6652784fd06ad01f44028e3a43c Author: Marc Kleine-Budde Date: Wed Feb 2 13:50:29 2011 +0100 ARM: mxs: adjust flexcan clock definition Signed-off-by: Marc Kleine-Budde Signed-off-by: Sascha Hauer commit d95f412200652694e63e64bfd49f0ae274a54479 Author: Mike Galbraith Date: Tue Feb 1 09:50:51 2011 -0500 sched: Add yield_to(task, preempt) functionality Currently only implemented for fair class tasks. Add a yield_to_task method() to the fair scheduling class. allowing the caller of yield_to() to accelerate another thread in it's thread group, task group. Implemented via a scheduler hint, using cfs_rq->next to encourage the target being selected. We can rely on pick_next_entity to keep things fair, so noone can accelerate a thread that has already used its fair share of CPU time. This also means callers should only call yield_to when they really mean it. Calling it too often can result in the scheduler just ignoring the hint. Signed-off-by: Rik van Riel Signed-off-by: Marcelo Tosatti Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <20110201095051.4ddb7738@annuminas.surriel.com> Signed-off-by: Ingo Molnar commit ac53db596cc08ecb8040cfb6f71ae40c6f2041c4 Author: Rik van Riel Date: Tue Feb 1 09:51:03 2011 -0500 sched: Use a buddy to implement yield_task_fair() Use the buddy mechanism to implement yield_task_fair. This allows us to skip onto the next highest priority se at every level in the CFS tree, unless doing so would introduce gross unfairness in CPU time distribution. We order the buddy selection in pick_next_entity to check yield first, then last, then next. We need next to be able to override yield, because it is possible for the "next" and "yield" task to be different processen in the same sub-tree of the CFS tree. When they are, we need to go into that sub-tree regardless of the "yield" hint, and pick the correct entity once we get to the right level. Signed-off-by: Rik van Riel Signed-off-by: Peter Zijlstra LKML-Reference: <20110201095103.3a79e92a@annuminas.surriel.com> Signed-off-by: Ingo Molnar commit 2c13c919d9e9a3db9896143a501f83dcbbe1ced4 Author: Rik van Riel Date: Tue Feb 1 09:48:37 2011 -0500 sched: Limit the scope of clear_buddies The clear_buddies function does not seem to play well with the concept of hierarchical runqueues. In the following tree, task groups are represented by 'G', tasks by 'T', next by 'n' and last by 'l'. (nl) / \ G(nl) G / \ \ T(l) T(n) T This situation can arise when a task is woken up T(n), and the previously running task T(l) is marked last. When clear_buddies is called from either T(l) or T(n), the next and last buddies of the group G(nl) will be cleared. This is not the desired result, since we would like to be able to find the other type of buddy in many cases. This especially a worry when implementing yield_task_fair through the buddy system. The fix is simple: only clear the buddy type that the task itself is indicated to be. As an added bonus, we stop walking up the tree when the buddy has already been cleared or pointed elsewhere. Signed-off-by: Rik van Riel Signed-off-by: Peter Zijlstra LKML-Reference: <20110201094837.6b0962a9@annuminas.surriel.com> Signed-off-by: Ingo Molnar commit 725e7580aaf98e9f7b22b8ccfc640ad0c09e2b08 Author: Rik van Riel Date: Tue Feb 1 09:47:15 2011 -0500 sched: Check the right ->nr_running in yield_task_fair() With CONFIG_FAIR_GROUP_SCHED, each task_group has its own cfs_rq. Yielding to a task from another cfs_rq may be worthwhile, since a process calling yield typically cannot use the CPU right now. Therefor, we want to check the per-cpu nr_running, not the cgroup local one. Signed-off-by: Rik van Riel Signed-off-by: Peter Zijlstra LKML-Reference: <20110201094715.798c4f86@annuminas.surriel.com> Signed-off-by: Ingo Molnar commit 8525d6f84f576402278a552ed17d2ba3b61f8e3c Author: Simon Horman Date: Thu Feb 3 07:22:43 2011 +0900 IPVS: Use correct lock in SCTP module Use sctp_app_lock instead of tcp_app_lock in the SCTP protocol module. This appears to be a typo introduced by the netns changes. Signed-off-by: Simon Horman Signed-off-by: Hans Schillstrom commit fe4b04fa31a6dcf4358aa84cf81e5a7fd079469b Author: Peter Zijlstra Date: Wed Feb 2 13:19:09 2011 +0100 perf: Cure task_oncpu_function_call() races Oleg reported that on architectures with __ARCH_WANT_INTERRUPTS_ON_CTXSW the IPI from task_oncpu_function_call() can land before perf_event_task_sched_in() and cause interesting situations for eg. perf_install_in_context(). This patch reworks the task_oncpu_function_call() interface to give a more usable primitive as well as rework all its users to hopefully be more obvious as well as remove the races. While looking at the code I also found a number of races against perf_event_task_sched_out() which can flip contexts between tasks so plug those too. Reported-and-reviewed-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit cdfb74d4c2e3bcc9383121af2591d0ae15007ba7 Author: David S. Miller Date: Wed Feb 2 23:06:31 2011 -0800 sch_choke: Need linux/vmalloc.h Signed-off-by: David S. Miller commit 45e144339ac59971eb44be32e1282760aaabe861 Author: stephen hemminger Date: Wed Feb 2 15:21:10 2011 +0000 sched: CHOKe flow scheduler CHOKe ("CHOose and Kill" or "CHOose and Keep") is an alternative packet scheduler based on the Random Exponential Drop (RED) algorithm. The core idea is: For every packet arrival: Calculate Qave if (Qave < minth) Queue the new packet else Select randomly a packet from the queue if (both packets from same flow) then Drop both the packets else if (Qave > maxth) Drop packet else Admit packet with proability p (same as RED) See also: Rong Pan, Balaji Prabhakar, Konstantinos Psounis, "CHOKe: a stateless active queue management scheme for approximating fair bandwidth allocation", Proceeding of INFOCOM'2000, March 2000. Help from: Eric Dumazet Patrick McHardy Signed-off-by: Stephen Hemminger Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 119b3d386985fcd477b3131190c041516a73f83a Author: stephen hemminger Date: Wed Feb 2 15:19:51 2011 +0000 sfq: deadlock in error path The change to allow divisor to be a parameter (in 2.6.38-rc1) commit 817fb15dfd988d8dda916ee04fa506f0c466b9d6 introduced a possible deadlock caught by sparse. The scheduler tree lock was left locked in the case of an incorrect divisor value. Simplest fix is to move test outside of lock which also solves problem of partial update. Signed-off-by: Stephen Hemminger Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit b299e4f001cfa16205f9121f4630970049652268 Author: David S. Miller Date: Wed Feb 2 20:48:10 2011 -0800 ipv4: Fix fib_trie build in some configurations. If we end up including include/linux/node.h (either explicitly or implicitly) that header has a definition of "structt node" too. So rename the one we use in fib_trie to "rt_trie_node" to avoid the conflict. Reported-by: Stephen Rothwell Signed-off-by: David S. Miller commit 442b9635c569fef038d5367a7acd906db4677ae1 Author: David S. Miller Date: Wed Feb 2 17:05:11 2011 -0800 tcp: Increase the initial congestion window to 10. Signed-off-by: David S. Miller Acked-by: Nandita Dukkipati commit 5ea74318c68fcb38f02fc2fc920abd37d9a9bc33 Author: Ivan Vecera Date: Wed Feb 2 04:37:02 2011 +0000 bna: use device model DMA API Use DMA API as PCI equivalents will be deprecated. Signed-off-by: Ivan Vecera Signed-off-by: David S. Miller commit 8fe73503fae8cb8f00c80dd6444c1ddcd19257bd Merge: 123b973 9291747 Author: David S. Miller Date: Wed Feb 2 15:24:48 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 9291747f118d6404e509747b85ff5f6dfec368d2 Author: Patrick McHardy Date: Thu Feb 3 00:05:43 2011 +0100 netfilter: xtables: add device group match Add a new 'devgroup' match to match on the device group of the incoming and outgoing network device of a packet. Signed-off-by: Patrick McHardy commit 5f52bc3cdd1bb2e12e61639df19d9dcd530c4568 Author: Jozsef Kadlecsik Date: Wed Feb 2 23:56:00 2011 +0100 netfilter: ipset: send error message manually When a message carries multiple commands and one of them triggers an error, we have to report to the userspace which one was that. The line number of the command plays this role and there's an attribute reserved in the header part of the message to be filled out with the error line number. In order not to modify the original message received from the userspace, we construct a new, complete netlink error message and modifies the attribute there, then send it. Netlink is notified not to send its ACK/error message. Signed-off-by: Jozsef Kadlecsik commit 724bab476bcac9f7d0b5204cb06e346216d42166 Author: Patrick McHardy Date: Wed Feb 2 23:50:01 2011 +0100 netfilter: ipset: fix linking with CONFIG_IPV6=n Add a dummy ip_set_get_ip6_port function that unconditionally returns false for CONFIG_IPV6=n and convert the real function to ipv6_skip_exthdr() to avoid pulling in the ip6_tables module when loading ipset. Signed-off-by: Patrick McHardy commit 4f69cef0a978e8efc2b2a5c0666bb59f39426685 Author: Joe Perches Date: Wed Feb 2 14:05:57 2011 -0800 staging: ath6kl: Remove #define A_OK Just use 0. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit a1d46529630cbe1072b7b7b1a0104655b47cd7de Author: Joe Perches Date: Wed Feb 2 14:05:56 2011 -0800 staging: ath6kl: Convert (status != A_OK) to (status) Just use the status variable as a test not a comparison. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit f68057e6fab6943ea2c5867d8b72e4b08bef5f6e Author: Joe Perches Date: Wed Feb 2 14:05:55 2011 -0800 staging: ath6kl: Convert A_INT32 to s32 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit cb1e370987c3651707e30e404e41ebdc83571fba Author: Joe Perches Date: Wed Feb 2 14:05:54 2011 -0800 staging: ath6kl: Convert A_INT16 to s16 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit f2ab1275cb1cfd033868cf0b7c67d1143199630e Author: Joe Perches Date: Wed Feb 2 14:05:53 2011 -0800 staging: ath6kl: Convert A_INT8 to s8 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit c353f4b397982e210b890c1f1a246611ba222b92 Author: Joe Perches Date: Wed Feb 2 14:05:52 2011 -0800 staging: ath6kl: Convert A_UINT64 to u64 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit e1ce2a3afe041c36ae397abf73f8059eb599e36e Author: Joe Perches Date: Wed Feb 2 14:05:51 2011 -0800 staging: ath6kl: Convert A_UINT32 to u32 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 4853ac05cff7745979830c52fe6fb46a7be6fa94 Author: Joe Perches Date: Wed Feb 2 14:05:50 2011 -0800 staging: ath6kl: Convert A_UINT16 to u16 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit ab3655dae4948a82a3be52681af0b778ead2c0ff Author: Joe Perches Date: Wed Feb 2 14:05:49 2011 -0800 staging: ath6kl: Convert A_UINT8 to u8 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 4c42080f3e4efba6f79fe1840eb0b728f286702d Author: Joe Perches Date: Wed Feb 2 14:05:48 2011 -0800 staging: ath6kl: Convert A_CHAR to char Remove obfuscating A_CHAR uses, just use char. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 1071a134d0822663f497a1dda4866cffa7df4e36 Author: Joe Perches Date: Wed Feb 2 14:05:47 2011 -0800 staging: ath6kl: Remove A_BOOL and TRUE/FALSE Use kernel bool and true/false. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 949c3676cd6b2717c2abda5d9b10e6d6d7daf741 Merge: 836aded ebf5382 Author: Greg Kroah-Hartman Date: Wed Feb 2 13:35:58 2011 -0800 Staging: Merge branch 'staging-next' into 2.6.38-rc3 This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman commit 774c096bf9e49eebf7b5d2d9fdddf632c29ccea0 Author: Russell King Date: Sun Jan 23 13:04:53 2011 +0000 ARM: v6/v7 cache: allow cache calls to be optimized The v6 cache call optimization was disabled to allow the optional block cache operations to be subsituted on CPUs which supported those operations. However, as that functionality was removed, we no longer need to prevent this optimization being taken advantage of. The v7 cache call optimization was just a copy of the v6, so also fix that too. Tested-by: Will Deacon Signed-off-by: Russell King commit 3bc28c8edc4f5f78d9ec23fb0f20df29b7b3a072 Author: Russell King Date: Tue Jan 18 13:30:33 2011 +0000 ARM: v6k: DMA_CACHE_RWFO isn't appropriate for non-v6k CPUs Limit DMA_CACHE_RWFO to only v6k SMP CPUs - V6 CPUs aren't SMP capable, so the read/write for ownership work-around doesn't apply to them. Acked-by: Will Deacon Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit fbb4ddacb6b70b3178fcb7e3debc5180e6b6cd2f Author: Russell King Date: Mon Jan 17 18:01:58 2011 +0000 ARM: v6k: only allow SMP if we have v6k or v7 CPU SMP extensions are only supported on ARMv6k or ARMv7 architectures, so only offer the option if we're building for such an architecture. Acked-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit 581388c15bd61a2548af0b87152648741d038571 Author: Russell King Date: Mon Jan 17 17:27:48 2011 +0000 ARM: v6k: allow swp emulation again when ARMv7 is enabled Now that we build a v6+v6k+v7 kernel with -march=armv6k for everything, we don't need to disable swp emulation to work around the build problem with OMAP. Tested-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit 60799c6dd727b72b9c6794e9d1ab2d2b01a87ca4 Author: Russell King Date: Sat Jan 15 16:25:04 2011 +0000 ARM: v6k: do not disable CPU_32v6K based on platform selection CPU_32v6K controls whether we use the ARMv6K extension instructions in the kernel, and in some places whether we use SMP-safe code sequences (eg, bitops.) MX3 prevents the selection of this option to ensure that it is not enabled for their CPU, which is ARMv6 only. Now that we've split the CPU_V6 option, V6K support won't be offered for MX3 anymore. OMAP prevents the selection of this option in an attempt to produce a kernel which runs on architectures from ARMv6 to ARMv7 MPCore. We now achieve this in a different way (see the previous patches). As such, we no longer need to offer this as a configuration option to the user. Tested-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit 8762df4d5c5462bea8ad0f76473f39e9ce9b8662 Author: Russell King Date: Mon Jan 17 15:53:56 2011 +0000 ARM: v6k: use CPU domain feature if we include support for arch < ARMv6K Rather than turning off CPU domain switching when the build architecture includes ARMv6K, thereby causing problems for ARMv6-supporting kernels, turn it on when it's required to support a CPU architecture. Acked-by: Nicolas Pitre Acked-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit 37bc618fe2689a7f8de8fac82e72b00ecea4d43d Author: Russell King Date: Mon Jan 17 16:38:56 2011 +0000 ARM: v6k: select TLS register code according to V6 variants If CONFIG_CPU_V6 is enabled, we may or may not have the TLS register. Use the conditional code which copes with this variability. Otherwise, if CONFIG_CPU_32v6K is set, we know we have the TLS register on all supported CPUs, so use it unconditionally. Acked-by: Nicolas Pitre Acked-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit a41297a0ffb43fda0a565bdd3ee405d16505820c Author: Russell King Date: Mon Jan 17 15:48:33 2011 +0000 ARM: v6k: select generic atomic64 code according to V6 variants If CONFIG_CPU_V6 is enabled, avoid using the double-word exclusive instructions in the kernel's atomic implementations as these are not supported. Fall back to the generic spinlock code instead. Acked-by: Tony Lindgren Acked-by: Will Deacon Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit 4ed67a53591db641543d57f31c182591a429dc93 Author: Russell King Date: Mon Jan 17 15:42:42 2011 +0000 ARM: v6k: select cmpxchg code sequences according to V6 variants If CONFIG_CPU_V6 is enabled, we must avoid the byte/halfword/doubleword exclusive operations, which aren't implemented before V6K. Use the generic versions (or omit them) instead. If CONFIG_CPU_V6 is not set, but CONFIG_CPU_32v6K is enabled, we have the K extnesions, so use these new instructions. Acked-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit 7db44c75a241c18d03e82540c5b825216d4c668b Author: Russell King Date: Mon Jan 17 15:35:37 2011 +0000 ARM: v6k: select clear exclusive code seqences according to V6 variants If CONFIG_CPU_V6 is enabled, then the kernel must support ARMv6 CPUs which don't have the V6K extensions implemented. Always use the dummy store-exclusive method to ensure that the exclusive monitors are cleared. If CONFIG_CPU_V6 is not set, but CONFIG_CPU_32v6K is enabled, then we have the K extensions available on all CPUs we're building support for, so we can use the new clear-exclusive instruction. Acked-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit c786282e6dd18fe2ff43ab44411085dc40e7fbc5 Author: Russell King Date: Mon Jan 17 18:20:05 2011 +0000 ARM: v6k: Dove platforms use V6K architecture CPUs Make Dove platforms select the new V6K CPU option. Tested-by: Nicolas Pitre Signed-off-by: Russell King commit 74200e6421882bfb53677d63a134d89a919815c1 Author: Russell King Date: Mon Jan 17 18:23:31 2011 +0000 ARM: v6k: Realview EB 11MPCore and PB11MPCore use V6K architecture CPUs Make Realview EB ARM11MPCore and PB11MPCore select the new V6K CPU option. Tested-by: Will Deacon Signed-off-by: Russell King commit e399b1a4e1d205bdc816cb550d2064f2eb1ddc4c Author: Russell King Date: Mon Jan 17 15:08:32 2011 +0000 ARM: v6k: introduce CPU_V6K option Introduce a CPU_V6K configuration option for platforms to select if they have a V6K CPU core. This allows us to identify whether we need to support ARMv6 CPUs without the V6K SMP extensions at build time. Currently CPU_V6K is just an alias for CPU_V6, and all places which reference CPU_V6 are replaced by (CPU_V6 || CPU_V6K). Select CPU_V6K from platforms which are known to be V6K-only. Acked-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit 000d9c78eb5cd7f18e3d6a381d66e606bc9b8196 Author: Russell King Date: Sat Jan 15 16:22:12 2011 +0000 ARM: v6k: remove CPU_32v6K dependencies in asm/spinlock.h SMP requires at least the ARMv6K extensions to be present, so if we're running on SMP, the WFE and SEV instructions must be available. However, when we run on UP, the v6K extensions may not be available, and so we don't want WFE/SEV to be in the instruction stream. Use the SMP alternatives infrastructure to replace these instructions with NOPs if we build for SMP but run on UP. Tested-by: Tony Lindgren Tested-by: Sourav Poddar Tested-by: Will Deacon Signed-off-by: Russell King commit 6323f0ccedf756dfe5f46549cec69a2d6d97937b Author: Russell King Date: Sun Jan 16 18:02:17 2011 +0000 ARM: bitops: switch set/clear/change bitops to use ldrex/strex Switch the set/clear/change bitops to use the word-based exclusive operations, which are only present in a wider range of ARM architectures than the byte-based exclusive operations. Tested record: - Nicolas Pitre: ext3,rw,le - Sourav Poddar: nfs,le - Will Deacon: ext3,rw,le - Tony Lindgren: ext3+nfs,le Reviewed-by: Nicolas Pitre Tested-by: Sourav Poddar Tested-by: Will Deacon Tested-by: Tony Lindgren Signed-off-by: Russell King commit a16ede35a2659170c855c5d267776666c0630f1f Author: Russell King Date: Sun Jan 16 17:59:44 2011 +0000 ARM: bitops: ensure set/clear/change bitops take a word-aligned pointer Add additional instructions to our assembly bitops functions to ensure that they only operate on word-aligned pointers. This will be necessary when we switch these operations to use the word-based exclusive operations. Signed-off-by: Russell King commit 567d6f48759a30f4578c88c2672a8c0b0394be4c Merge: 13fd179 0962bb2 Author: Mark Brown Date: Wed Feb 2 20:52:14 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 13fd179f14712cc89b5b3812673891b96e0ab3a2 Author: Dimitris Papastamos Date: Wed Feb 2 13:58:58 2011 +0000 ASoC: soc-core: Support debugfs entries larger than PAGE_SIZE bytes For some codecs with large register maps, it was not possible to dump all registers via the codec_reg file but only up to PAGE_SIZE bytes. This patch fixes this problem. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a591e969fae8b79484cb94a12aceb9799e06ac22 Author: Sven Neumann Date: Mon Jan 31 16:10:50 2011 +0100 ASoC: PXA: formatting Signed-off-by: Sven Neumann Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b9c93bb7deadc7cdd00415edc6b38d67a26c1c7a Author: Steven Whitehouse Date: Wed Feb 2 14:48:10 2011 +0000 GFS2: Improve cluster mmap scalability The mmap system call grabs a glock when an update to atime maybe required. It does this in order to ensure that the flags on the inode are uptodate, but since it will only mark atime for a future update, an exclusive lock is not required here (one will be taken later when the actual update is performed). Also, the lock can be skipped when the mount is marked noatime in addition to the original check which only looked at the noatime flag for the inode itself. This should increase the scalability of the mmap call when multiple nodes are all mmaping the same file. Reported-by: Scooter Morris Signed-off-by: Steven Whitehouse commit 0606f422b453f76c31ab2b1bd52943ff06a2dcf2 Author: Richard Cochran Date: Tue Feb 1 13:52:35 2011 +0000 posix clocks: Introduce dynamic clocks This patch adds support for adding and removing posix clocks. The clock lifetime cycle is patterned after usb devices. Each clock is represented by a standard character device. In addition, the driver may optionally implement custom character device operations. The posix clock and timer system calls listed below now work with dynamic posix clocks, as well as the traditional static clocks. The following system calls are affected: - clock_adjtime (brand new syscall) - clock_gettime - clock_getres - clock_settime - timer_create - timer_delete - timer_gettime - timer_settime [ tglx: Adapted to the posix-timer cleanup. Moved clock_posix_dynamic to posix-clock.c and made all referenced functions static ] Signed-off-by: Richard Cochran Acked-by: John Stultz LKML-Reference: <20110201134420.164172635@linutronix.de> Signed-off-by: Thomas Gleixner commit 527087374faa488776a789375a7d6ea74fda6f71 Author: Thomas Gleixner Date: Wed Feb 2 12:10:09 2011 +0100 posix-timers: Cleanup namespace Rename register_posix_clock() to posix_timers_register_clock(). That's what the function really does. As a side effect this cleans up the posix_clock namespace for the upcoming dynamic posix_clock infrastructure. Signed-off-by: Thomas Gleixner Tested-by: Richard Cochran Cc: John Stultz LKML-Reference: commit 81e294cba2596f5f10848bbe19d98b344c2a2d5c Author: Richard Cochran Date: Tue Feb 1 13:52:32 2011 +0000 posix-timers: Add support for fd based clocks Extend the negative clockids which are currently used by posix cpu timers to encode the PID with a file descriptor based type which encodes the fd in the upper bits. Originally-from: Richard Cochran Signed-off-by: Thomas Gleixner Acked-by: John Stultz LKML-Reference: <20110201134420.062860200@linutronix.de> commit ce26efdefa5e8f22d933df72d7f7482725091d6d Author: Richard Cochran Date: Tue Feb 1 13:52:30 2011 +0000 x86: Add clock_adjtime for x86 This patch adds the clock_adjtime system call to the x86 architecture. Signed-off-by: Richard Cochran Acked-by: John Stultz LKML-Reference: <20110201134419.968905083@linutronix.de> Signed-off-by: Thomas Gleixner commit f1f1d5ebd10ffa4242bce7a90a56a222d6b7bc77 Author: Richard Cochran Date: Tue Feb 1 13:52:26 2011 +0000 posix-timers: Introduce a syscall for clock tuning. A new syscall is introduced that allows tuning of a POSIX clock. The new call, clock_adjtime, takes two parameters, the clock ID and a pointer to a struct timex. Any ADJTIMEX(2) operation may be requested via this system call, but various POSIX clocks may or may not support tuning. [ tglx: Adapted to the posix-timer cleanup series. Avoid copy_to_user in the error case ] Signed-off-by: Richard Cochran Acked-by: John Stultz LKML-Reference: <20110201134419.869804645@linutronix.de> Signed-off-by: Thomas Gleixner commit 65f5d80bdf83ec0d7f3887db10153bf3f36ed73c Author: Richard Cochran Date: Tue Feb 1 13:52:23 2011 +0000 time: Splitout compat timex accessors Split out the compat timex accessors into separate functions. Preparatory patch for a new syscall. [ tglx: Split that patch from Richards "posix-timers: Introduce a syscall for clock tuning.". Keeps the changes strictly separate ] Originally-from: Richard Cochran Acked-by: John Stultz Signed-off-by: Thomas Gleixner LKML-Reference: <20110201134419.772343089@linutronix.de> commit 094aa1881fdc1b8889b442eb3511b31f3ec2b762 Author: Richard Cochran Date: Tue Feb 1 13:52:20 2011 +0000 ntp: Add ADJ_SETOFFSET mode bit This patch adds a new mode bit into the timex structure. When set, the bit instructs the kernel to add the given time value to the current time. Signed-off-by: Richard Cochran Acked-by: John Stultz LKML-Reference: <20110201134320.688829863@linutronix.de> Signed-off-by: Thomas Gleixner commit c528f7c6c208f1fae6b4025957173dec045e5f21 Author: John Stultz Date: Tue Feb 1 13:52:17 2011 +0000 time: Introduce timekeeping_inject_offset This adds a kernel-internal timekeeping interface to add or subtract a fixed amount from CLOCK_REALTIME. This makes it so kernel users or interfaces trying to do so do not have to read the time, then add an offset and then call settimeofday(), which adds some extra error in comparision to just simply adding the offset in the kernel timekeeping core. Signed-off-by: John Stultz Signed-off-by: Richard Cochran LKML-Reference: <20110201134419.584311693@linutronix.de> Signed-off-by: Thomas Gleixner commit 0061748dd2400d0bcd4d49d258db5d7b5d106ca0 Author: Richard Cochran Date: Tue Feb 1 13:52:15 2011 +0000 posix-timer: Update comment Pick the cleanup to the comment in posix-timers.c from Richards all in one conversion patch. Originally-from: Richard Cochran Signed-off-by: Thomas Gleixner Acked-by: John Stultz LKML-Reference: <20110201134419.487708516@linutronix.de> commit bc2c8ea483d73e95fc88f1fc9e7755180f89b892 Author: Thomas Gleixner Date: Tue Feb 1 13:52:12 2011 +0000 posix-timers: Make posix-cpu-timers functions static All functions are accessed via clock_posix_cpu now. So make them static. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134419.389755466@linutronix.de> commit 0aa3975f02ce78f27be3076fbfa3d94ae5a659d5 Author: Thomas Gleixner Date: Tue Feb 1 13:52:09 2011 +0000 posix-timers: Remove CLOCK_DISPATCH leftovers All users gone. Remove the cruft. Huge thanks to Richard Cochran who tackled that maze first. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134419.294620613@linutronix.de> commit 6761c6702e2c647582e1829abe8cf90794f61d9d Author: Thomas Gleixner Date: Tue Feb 1 13:52:07 2011 +0000 posix-timers: Convert timer_delete() to clockid_to_kclock() Set the common function for CLOCK_MONOTONIC and CLOCK_REALTIME kclocks and use the new decoding function. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134419.198999420@linutronix.de> commit a7319fa253a549c4c6528fb550ae6e72a9c83811 Author: Thomas Gleixner Date: Tue Feb 1 13:52:04 2011 +0000 posix-timers: Convert timer_gettime() to clockid_to_kclock() Set the common function for CLOCK_MONOTONIC and CLOCK_REALTIME kclocks and use the new decoding function. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134419.101243181@linutronix.de> commit 27722df16ef143017db55ac7baac1703a68017ff Author: Thomas Gleixner Date: Tue Feb 1 13:52:01 2011 +0000 posix-timers: Convert timer_settime() to clockid_to_kclock() Set the common function for CLOCK_MONOTONIC and CLOCK_REALTIME kclocks and use the new decoding function. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134419.001863714@linutronix.de> commit 838394fbf989973ec7f5a0ad82cb6ff09e5c39aa Author: Thomas Gleixner Date: Tue Feb 1 13:51:58 2011 +0000 posix-timers: Convert timer_create() to clockid_to_kclock() Setup timer_create for CLOCK_MONOTONIC and CLOCK_REALTIME kclocks and remove the no_timer_create() implementation. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.903604289@linutronix.de> commit ebaac757acae0431e2c79c00e09f1debdabbddd7 Author: Thomas Gleixner Date: Tue Feb 1 13:51:56 2011 +0000 posix-timers: Remove useless res field from k_clock The res member of kclock is only used by mmtimer.c, but even there it contains redundant information. Remove the field and fixup mmtimer. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.808714587@linutronix.de> commit e5e542eea9075dd008993c2ee80b2cc9f31fc494 Author: Thomas Gleixner Date: Tue Feb 1 13:51:53 2011 +0000 posix-timers: Convert clock_getres() to clockid_to_kclock() Use the new kclock decoding. Fixup the fallout in mmtimer.c Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.709802797@linutronix.de> commit 4359ac0ace1a2a267927390ad27f781a2f8e0ab8 Author: Thomas Gleixner Date: Wed Feb 2 11:45:23 2011 +0100 posix-timers: Make clock_getres and clock_get mandatory Richard said: "I would think that we can require k_clocks to provide the read function. This could be checked and enforced in register_posix_clock()." Add checks for clock_getres and clock_get in the register function. Suggested-by: Richard Cochran Cc: John Stultz Signed-off-by: Thomas Gleixner commit 42285777631aa0654fbb6442057b3e176445c6c5 Author: Thomas Gleixner Date: Tue Feb 1 13:51:50 2011 +0000 posix-timers: Convert clock_gettime() to clockid_to_kclock() Use the new kclock decoding mechanism and rename the misnomed common_clock_get() to posix_clock_realtime_get(). Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.611097203@linutronix.de> commit 26f9a4796af330173d790c8d2b5e2efcc489e755 Author: Thomas Gleixner Date: Tue Feb 1 13:51:48 2011 +0000 posix-timers: Convert clock_settime to clockid_to_kclock() Use the new kclock decoding function in clock_settime and cleanup all kclocks which use the default functions. Rename the misnomed common_clock_set() to posix_clock_realtime_set(). Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.518851246@linutronix.de> commit 79c9da0d0539fb341a1b48a2a5a23d974726de90 Author: Thomas Gleixner Date: Tue Feb 1 13:51:45 2011 +0000 posix-cpu-timers: Remove the stub nanosleep functions CLOCK_THREAD_CPUTIME_ID implements stub functions for nanosleep and nanosleep_restart, which return -EINVAL. That return value is wrong. The correct return value is -ENOTSUP. Remove the stubs and let the new dispatch code return the correct error code. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.422446502@linutronix.de> commit d608c18203a969e5d14572a9861c646d0bb66872 Author: Thomas Gleixner Date: Tue Feb 1 13:51:43 2011 +0000 thread_info: Remove legacy arg0-3 from restart_block posix timers were the last users of the legacy arg0-3 members of restart_block. Remove the cruft. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.326209775@linutronix.de> commit 3751f9f29bcbc19bd10e92254a273486f150c245 Author: Thomas Gleixner Date: Tue Feb 1 13:51:20 2011 +0000 posix-timers: Cleanup restart_block usage posix timers still use the legacy arg0-arg3 members of restart_block. Use restart_block.nanosleep instead Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.232288779@linutronix.de> commit 59bd5bc24aa69f6c62da1e242c16f09f667def96 Author: Thomas Gleixner Date: Tue Feb 1 13:51:17 2011 +0000 posix-timers: Convert clock_nanosleep_restart to clockid_to_kclock() Use the new kclock decoding function in clock_nanosleep_restart. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.131263211@linutronix.de> commit a5cd2880106cb2c79b3fe24f1c53dadba6a542a0 Author: Thomas Gleixner Date: Tue Feb 1 13:51:11 2011 +0000 posix-timers: Convert clock_nanosleep to clockid_to_kclock() Use the new kclock decoding function in clock_nanosleep and cleanup all kclocks which use the default functions. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134418.034175556@linutronix.de> commit cc785ac22b17ed53e8ff5c1501e422be6d10be3c Author: Thomas Gleixner Date: Tue Feb 1 13:51:09 2011 +0000 posix-timers: Introduce clockid_to_kclock() New function to find the kclock for a given clockid. Returns a pointer to clock_posix_cpu if clockid < 0. If clockid >= MAXCLOCK or if the clock_getres pointer is not set it returns NULL. For valid clocks it returns a pointer to the matching posix_clock. Signed-off-by: Thomas Gleixner Cc: John Stultz Acked-by: Richard Cochran LKML-Reference: <20110201134417.938447839@linutronix.de> commit 1976945eeaab5fa461735a6225a82c3cf1e65d62 Author: Thomas Gleixner Date: Tue Feb 1 13:51:06 2011 +0000 posix-timers: Introduce clock_posix_cpu The CLOCK_DISPATCH() macro is a horrible magic. We call common functions if a function pointer is not set. That's just backwards. To support dynamic file decriptor based clocks we need to cleanup that dispatch logic. Create a k_clock struct clock_posix_cpu which has all the posix-cpu-timer functions filled in. After the cleanup the functions can be made static. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134417.841974553@linutronix.de> commit 2fd1f04089cb657c5d6c484b280ec4d3398aa157 Author: Thomas Gleixner Date: Tue Feb 1 13:51:03 2011 +0000 posix-timers: Cleanup struct initializers Cosmetic. No functional change Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134417.745627057@linutronix.de> commit 65da528d7cc94966cf24d2a1e0837b689159b543 Author: Thomas Gleixner Date: Tue Feb 1 13:51:01 2011 +0000 posix-timers: Define nanosleep not supported error separate Define the conditional nanosleep not supported error value outside of do_posix_clock_nonanosleep(). Preparatory patch for further cleanups. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Tested-by: Richard Cochran LKML-Reference: <20110201134417.643486574@linutronix.de> commit 1e6d767924c74929c0cfe839ae8f37bcee9e544e Author: Richard Cochran Date: Tue Feb 1 13:50:58 2011 +0000 time: Correct the *settime* parameters Both settimeofday() and clock_settime() promise with a 'const' attribute not to alter the arguments passed in. This patch adds the missing 'const' attribute into the various kernel functions implementing these calls. Signed-off-by: Richard Cochran Acked-by: John Stultz LKML-Reference: <20110201134417.545698637@linutronix.de> Signed-off-by: Thomas Gleixner commit 21a06b0459f5e3ecdeccacfbf076c229514c1840 Author: Dave Kleikamp Date: Wed Jan 26 06:17:59 2011 +0000 powerpc/476: Workaround for PLB6 hang The 476FP core may hang if an instruction fetch happens during an msync following a tlbsync. This workaround makes sure that enough instruction cache lines are pre-fetched before executing the msync. (sync and msync are the same to the compiler.) Signed-off-by: Dave Kleikamp Signed-off-by: Josh Boyer commit c48d0dbaac7f27c083430170c66194d6a523bc2a Author: Dave Kleikamp Date: Wed Jan 26 06:17:58 2011 +0000 powerpc/476: define specific cpu table entry DD2 core The DD2 core still has some unstability. Define CPU_FTR_476_DD2 to enable workarounds in later patches. This is based on an earlier, unreleased patch for DD1 by Ben Herrenschmidt. Signed-off-by: Dave Kleikamp Signed-off-by: Josh Boyer commit 8960f7ff508064de1896d8539911411179b8433c Author: Rupjyoti Sarmah Date: Wed Dec 15 02:27:10 2010 +0000 powerpc/44x: PHY fixup for USB on canyonlands board This fix is a reset for USB PHY that requires some amount of time for power to be stable on Canyonlands. Signed-off-by: Rupjyoti Sarmah Signed-off-by: Josh Boyer commit c89b3458d8cc1925a9ca90408ff3bfe43dab6522 Author: Tirumala Marri Date: Wed Dec 8 14:49:05 2010 +0000 powerpc/44x: Add USB DWC DTS entry to Canyonlands board Add Synopsys Designware DTS entry for 460EX based Canyonlands board. Signed-off-by: Tirumala R Marri Signed-off-by: Josh Boyer commit 88ee1c611d0ac0f771212f907bdfb33905a5dc89 Author: Mark Brown Date: Wed Feb 2 10:43:26 2011 +0000 ASoC: Update PM ifdefs for exported suspend/resume Signed-off-by: Mark Brown commit 8e572bab39c484cdf512715f98626337f25cfc32 Author: Justin P. Mattock Date: Wed Feb 2 11:31:21 2011 +0100 fix typos 'comamnd' -> 'command' in comments Signed-off-by: Justin P. Mattock commit 316ed388802533bcfd3dffb38d2ba29ac5428456 Author: Patrick McHardy Date: Wed Feb 2 09:31:37 2011 +0100 netfilter: ipset: add missing break statemtns in ip_set_get_ip_port() Don't fall through in the switch statement, otherwise IPv4 headers are incorrectly parsed again as IPv6 and the return value will always be 'false'. Signed-off-by: Patrick McHardy commit b84defe6036e6dea782d41b80a4590e54f249671 Merge: 8104a47 cdb0861 Author: Ingo Molnar Date: Wed Feb 2 07:11:02 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 8104a4775ad8a7863af0b898224b15aa708582db Merge: f6bbc1d ebf5382 Author: Ingo Molnar Date: Wed Feb 2 07:10:03 2011 +0100 Merge commit 'v2.6.38-rc3' into perf/core Merge reason: Pick up latest fixes. Signed-off-by: Ingo Molnar commit 123b9731b14f49cd41c91ed2b6c31e515615347c Author: David S. Miller Date: Tue Feb 1 15:34:21 2011 -0800 ipv4: Rename fib_hash_* locals in fib_semantics.c To avoid confusion with the recently deleted fib_hash.c code, use "fib_info_hash_*" instead of plain "fib_hash_*". Signed-off-by: David S. Miller commit 5348ba85a02ffe80a8af33a524b6610966760d3d Author: David S. Miller Date: Tue Feb 1 15:30:56 2011 -0800 ipv4: Update some fib_hash centric interface names. fib_hash_init() --> fib_trie_init() fib_hash_table() --> fib_trie_table() Signed-off-by: David S. Miller commit 3630b7c050d9c3564f143d595339fc06b888d6f3 Author: David S. Miller Date: Tue Feb 1 15:15:39 2011 -0800 ipv4: Remove fib_hash. The time has finally come to remove the hash based routing table implementation in ipv4. FIB Trie is mature, well tested, and I've done an audit of it's code to confirm that it implements insert, delete, and lookup with the same identical semantics as fib_hash did. If there are any semantic differences found in fib_trie, we should simply fix them. I've placed the trie statistic config option under advanced router configuration. Signed-off-by: David S. Miller Acked-by: Stephen Hemminger commit cdb0861c85c03fe80f4da033aab69df949579dc6 Author: Yinghai Lu Date: Tue Feb 1 10:51:23 2011 -0800 perf top: Fix TUI compilation > + slsmg_write_nstring(width >= syme->map->dso->long_name_len ? > + syme->map->dso->long_name : > + syme->map->dso->short_name, width); need update macro for that calling util/ui/browsers/top.c: In function ‘perf_top_browser__write’: util/ui/browsers/top.c:60:2: error: cast to pointer from integer of different size util/ui/browsers/top.c:60:2: error: comparison between pointer and integer util/ui/browsers/top.c:60:2: error: passing argument 1 of ‘SLsmg_write_nstring’ discards qualifiers from pointer target type /usr/include/slang.h:1728:16: note: expected ‘char *’ but argument is of type ‘const char *’ make: *** [util/ui/browsers/top.o] Error 1 Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Tom Zanussi LKML-Reference: <4D48562B.20006@kernel.org> Signed-off-by: Yinghai Lu Signed-off-by: Arnaldo Carvalho de Melo commit 978f626c4e5b9524d1898788d8e34d86dfa00795 Author: Arnaldo Carvalho de Melo Date: Tue Feb 1 16:40:51 2011 -0200 perf tools: Don't try to build python bindings if Python.h not available Just leverage the test done for python support in 'python script', emitting a warning about losing those features if python-dev[el] is not installed. Reported-by: Peter Zijlstra Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 0015e2e101f5fd3256ab8b5a374c0e8806098871 Author: Arnaldo Carvalho de Melo Date: Tue Feb 1 16:18:10 2011 -0200 perf stat: Fix up resource release order That was causing a SEGV on selected old distros. Problem introduced in 7e2ed09. Reported-by: Peter Zijlstra Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit e3e241b2769b27669d05f0a05083acd21b4faa2c Author: Patrick McHardy Date: Tue Feb 1 18:52:42 2011 +0100 netfilter: ipset: install ipset related header files Signed-off-by: Patrick McHardy commit ed3d1e7b72069a3463b7e227b18cae4a09b0ddad Author: Simon Horman Date: Tue Feb 1 18:30:26 2011 +0100 IPVS: Remove ip_vs_sync_cleanup from section __exit ip_vs_sync_cleanup() may be called from ip_vs_init() on error and thus needs to be accesible from section __init Reporte-by: Randy Dunlap Signed-off-by: Simon Horman Acked-by: Randy Dunlap Signed-off-by: Hans Schillstrom Tested-by: Hans Schillstrom Signed-off-by: Patrick McHardy commit 0443929ff0ecc4d1e690edaffa338cabe0863d3b Author: Simon Horman Date: Tue Feb 1 18:29:04 2011 +0100 IPVS: Allow compilation with CONFIG_SYSCTL disabled This is a rather naieve approach to allowing PVS to compile with CONFIG_SYSCTL disabled. I am working on a more comprehensive patch which will remove compilation of all sysctl-related IPVS code when CONFIG_SYSCTL is disabled. Reported-by: Randy Dunlap Signed-off-by: Simon Horman Acked-by: Randy Dunlap Signed-off-by: Hans Schillstrom Tested-by: Hans Schillstrom Signed-off-by: Patrick McHardy commit a13676476e289ba03a23e27df130c7f33ab00e2f Author: Simon Horman Date: Tue Feb 1 18:27:51 2011 +0100 IPVS: Remove unused variables These variables are unused as a result of the recent netns work. Signed-off-by: Simon Horman Acked-by: Randy Dunlap Signed-off-by: Hans Schillstrom Tested-by: Hans Schillstrom Signed-off-by: Patrick McHardy commit 258e958b85cef23b1598515504426e8d0576d223 Author: Simon Horman Date: Tue Feb 1 18:24:09 2011 +0100 IPVS: remove duplicate initialisation or rs_table Signed-off-by: Simon Horman Acked-by: Randy Dunlap Signed-off-by: Hans Schillstrom Tested-by: Hans Schillstrom Signed-off-by: Patrick McHardy commit a870c8c5cbe41bcf42cf4fa9f43d969b5134090b Author: Simon Horman Date: Tue Feb 1 18:21:53 2011 +0100 IPVS: use z modifier for sizeof() argument Reported-by: Randy Dunlap Signed-off-by: Simon Horman Acked-by: Randy Dunlap Signed-off-by: Hans Schillstrom Tested-by: Hans Schillstrom Signed-off-by: Patrick McHardy commit 568bb7b8e856b9efb98a3f63259c717adc1b96b8 Author: Arnaldo Carvalho de Melo Date: Tue Feb 1 15:05:00 2011 -0200 perf tools: Fix up 'make clean' target It wasn't using $(OUTPUT) to rm *.o and there were some funny looking automake files that never get created but were being deleted anyway. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit fa9a741b841d0c2db04875310a06e8718c56fd4f Merge: 7c3ee9e 4796007 Author: John W. Linville Date: Tue Feb 1 12:01:27 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/wl12xx/spi.c commit 067187fc9f1d09738fc833392e117f125cb6bbad Author: Arnaldo Carvalho de Melo Date: Tue Feb 1 14:57:02 2011 -0200 perf tools: Remove verbose build messages for the python binding Also now it builds it in a well known location: [acme@felicio linux]$ rm -rf ../build/perf/ [acme@felicio linux]$ mkdir ../build/perf [acme@felicio linux]$ make -j2 O=~acme/git/build/perf -C tools/perf/ [acme@felicio linux]$ ls -la ../build/perf/python/ total 152 -rwxrwxr-x 1 acme acme 147957 Feb 1 14:56 perf.so drwxrwxr-x 3 acme acme 17 Feb 1 14:56 temp [acme@felicio linux]$ [root@felicio ~]# strip ~acme/git/build/perf/python/perf.so [root@felicio ~]# ls -la ~acme/git/build/perf/python/perf.so -rwxrwxr-x 1 acme acme 46264 Feb 1 14:58 /home/acme/git/build/perf/python/perf.so [root@felicio ~]# export PYTHONPATH=~acme/git/build/perf/python/ [root@felicio ~]# ~acme/git/linux/tools/perf/python/twatch.py cpu: 0, pid: 7751, tid: 7751 { type: exit, pid: 7751, ppid: 7751, tid: 7751, ptid: 7751, time: 54562393512356} cpu: 0, pid: 13700, tid: 13700 { type: fork, pid: 7756, ppid: 13700, tid: 7756, ptid: 13700, time: 54562393746739} cpu: 1, pid: 7756, tid: 7756 { type: fork, pid: 7757, ppid: 7756, tid: 7757, ptid: 7756, time: 54562394246152} cpu: 1, pid: 7757, tid: 7757 { type: comm, pid: 7757, tid: 7757, comm: awk } cpu: 1, pid: 7757, tid: 7757 { type: exit, pid: 7757, ppid: 7757, tid: 7757, ptid: 7757, time: 54562395456813} Reported-by: Ingo Molnar Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 4916ca401e3051dad326ddd69765bd0e3f32fb9b Author: Lucian Adrian Grijincu Date: Tue Feb 1 18:44:56 2011 +0200 security: remove unused security_sysctl hook The only user for this hook was selinux. sysctl routes every call through /proc/sys/. Selinux and other security modules use the file system checks for sysctl too, so no need for this hook any more. Signed-off-by: Lucian Adrian Grijincu Signed-off-by: Eric Paris commit 8e6c96935fcc1ed3dbebc96fddfef3f2f2395afc Author: Lucian Adrian Grijincu Date: Tue Feb 1 18:42:22 2011 +0200 security/selinux: fix /proc/sys/ labeling This fixes an old (2007) selinux regression: filesystem labeling for /proc/sys returned -r--r--r-- unknown /proc/sys/fs/file-nr instead of -r--r--r-- system_u:object_r:sysctl_fs_t:s0 /proc/sys/fs/file-nr Events that lead to breaking of /proc/sys/ selinux labeling: 1) sysctl was reimplemented to route all calls through /proc/sys/ commit 77b14db502cb85a031fe8fde6c85d52f3e0acb63 [PATCH] sysctl: reimplement the sysctl proc support 2) proc_dir_entry was removed from ctl_table: commit 3fbfa98112fc3962c416452a0baf2214381030e6 [PATCH] sysctl: remove the proc_dir_entry member for the sysctl tables 3) selinux still walked the proc_dir_entry tree to apply labeling. Because ctl_tables don't have a proc_dir_entry, we did not label /proc/sys/ inodes any more. To achieve this the /proc/sys/ inodes were marked private and private inodes were ignored by selinux. commit bbaca6c2e7ef0f663bc31be4dad7cf530f6c4962 [PATCH] selinux: enhance selinux to always ignore private inodes commit 86a71dbd3e81e8870d0f0e56b87875f57e58222b [PATCH] sysctl: hide the sysctl proc inodes from selinux Access control checks have been done by means of a special sysctl hook that was called for read/write accesses to any /proc/sys/ entry. We don't have to do this because, instead of walking the proc_dir_entry tree we can walk the dentry tree (as done in this patch). With this patch: * we don't mark /proc/sys/ inodes as private * we don't need the sysclt security hook * we walk the dentry tree to find the path to the inode. We have to strip the PID in /proc/PID/ entries that have a proc_dir_entry because selinux does not know how to label paths like '/1/net/rpc/nfsd.fh' (and defaults to 'proc_t' labeling). Selinux does know of '/net/rpc/nfsd.fh' (and applies the 'sysctl_rpc_t' label). PID stripping from the path was done implicitly in the previous code because the proc_dir_entry tree had the root in '/net' in the example from above. The dentry tree has the root in '/1'. Signed-off-by: Eric W. Biederman Signed-off-by: Lucian Adrian Grijincu Signed-off-by: Eric Paris commit a00f1f3686d6a062b5295c092a9dff059adbdbf5 Author: Patrick McHardy Date: Tue Feb 1 17:26:37 2011 +0100 netfilter: ctnetlink: fix ctnetlink_parse_tuple() warning net/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_parse_tuple': net/netfilter/nf_conntrack_netlink.c:832:11: warning: comparison between 'enum ctattr_tuple' and 'enum ctattr_type' Use ctattr_type for the 'type' parameter since that's the type of all attributes passed to this function. Signed-off-by: Patrick McHardy commit 652bb9b0d6ce007f37c098947b2cc0c45efa3f66 Author: Eric Paris Date: Tue Feb 1 11:05:40 2011 -0500 SELinux: Use dentry name in new object labeling Currently SELinux has rules which label new objects according to 3 criteria. The label of the process creating the object, the label of the parent directory, and the type of object (reg, dir, char, block, etc.) This patch adds a 4th criteria, the dentry name, thus we can distinguish between creating a file in an etc_t directory called shadow and one called motd. There is no file globbing, regex parsing, or anything mystical. Either the policy exactly (strcmp) matches the dentry name of the object or it doesn't. This patch has no changes from today if policy does not implement the new rules. Signed-off-by: Eric Paris commit 2a7dba391e5628ad665ce84ef9a6648da541ebab Author: Eric Paris Date: Tue Feb 1 11:05:39 2011 -0500 fs/vfs/security: pass last path component to LSM on inode creation SELinux would like to implement a new labeling behavior of newly created inodes. We currently label new inodes based on the parent and the creating process. This new behavior would also take into account the name of the new object when deciding the new label. This is not the (supposed) full path, just the last component of the path. This is very useful because creating /etc/shadow is different than creating /etc/passwd but the kernel hooks are unable to differentiate these operations. We currently require that userspace realize it is doing some difficult operation like that and than userspace jumps through SELinux hoops to get things set up correctly. This patch does not implement new behavior, that is obviously contained in a seperate SELinux patch, but it does pass the needed name down to the correct LSM hook. If no such name exists it is fine to pass NULL. Signed-off-by: Eric Paris commit 582e1fc85ca3727abd4e99109a267c514ea5c260 Author: Patrick McHardy Date: Tue Feb 1 16:57:37 2011 +0100 netfilter: ipset: remove unnecessary includes None of the set types need uaccess.h since this is handled centrally in ip_set_core. Most set types additionally don't need bitops.h and spinlock.h since they use neither. tcp.h is only needed by those using before(), udp.h is not needed at all. Signed-off-by: Patrick McHardy commit 8da560ced56c423cd6d35803cd0244c944c676bd Author: Patrick McHardy Date: Tue Feb 1 16:27:25 2011 +0100 netfilter: ipset: use nla_parse_nested() Replace calls of the form: nla_parse(tb, ATTR_MAX, nla_data(attr), nla_len(attr), policy) by: nla_parse_nested(tb, ATTR_MAX, attr, policy) Signed-off-by: Patrick McHardy commit d956798d82d2d331c031301965d69e17a1a48a2b Author: Jozsef Kadlecsik Date: Tue Feb 1 15:56:00 2011 +0100 netfilter: xtables: "set" match and "SET" target support The patch adds the combined module of the "SET" target and "set" match to netfilter. Both the previous and the current revisions are supported. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 273de37655369e57919f19e157fafb2b4b1e4472 Merge: 3d8b2ce 8cda975 Author: Mark Brown Date: Tue Feb 1 14:55:10 2011 +0000 Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.39 commit f830837f0eed0f9e371b8fd65169365780814bb1 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:54:59 2011 +0100 netfilter: ipset: list:set set type support The module implements the list:set type support in two flavours: without and with timeout. The sets has two sides: for the userspace, they store the names of other (non list:set type of) sets: one can add, delete and test set names. For the kernel, it forms an ordered union of the member sets: the members sets are tried in order when elements are added, deleted and tested and the process stops at the first success. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 21f45020a3084f80fcdd5f056a0c6389f5406399 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:53:55 2011 +0100 netfilter: ipset: hash:net,port set type support The module implements the hash:net,port type support in four flavours: for IPv4 and IPv6, both without and with timeout support. The elements are two dimensional: IPv4/IPv6 network address/prefix and protocol/port pairs. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit b38370299eeaba4cf8a9e0c5c6acc2a1e049be23 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:52:54 2011 +0100 netfilter: ipset: hash:net set type support The module implements the hash:net type support in four flavours: for IPv4 and IPv6, both without and with timeout support. The elements are one dimensional: IPv4/IPv6 network address/prefixes. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 41d22f7b2e48c77175b62cec3797d7d7173a626e Author: Jozsef Kadlecsik Date: Tue Feb 1 15:51:00 2011 +0100 netfilter: ipset: hash:ip,port,net set type support The module implements the hash:ip,port,net type support in four flavours: for IPv4 and IPv6, both without and with timeout support. The elements are three dimensional: IPv4/IPv6 address, protocol/port and IPv4/IPv6 network address/prefix triples. The different prefixes are searched/matched from the longest prefix to the shortes one (most specific to least). In other words the processing time linearly grows with the number of different prefixes in the set. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 5663bc30e6114b6ba88cc428619ede46a3246a7b Author: Jozsef Kadlecsik Date: Tue Feb 1 15:41:26 2011 +0100 netfilter: ipset: hash:ip,port,ip set type support The module implements the hash:ip,port,ip type support in four flavours: for IPv4 and IPv6, both without and with timeout support. The elements are three dimensional: IPv4/IPv6 address, protocol/port and IPv4/IPv6 address triples. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 07896ed37b94599a1b8ea97f4bd5766be71390f4 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:39:52 2011 +0100 netfilter: ipset: hash:ip,port set type support The module implements the hash:ip,port type support in four flavours: for IPv4 and IPv6, both without and with timeout support. The elements are two dimensional: IPv4/IPv6 address and protocol/port pairs. The port is interpeted for TCP, UPD, ICMP and ICMPv6 (at the latters as type/code of course). Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 6c027889696a7a694b0e2f6e3cabadefec7553b6 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:38:36 2011 +0100 netfilter: ipset: hash:ip set type support The module implements the hash:ip type support in four flavours: for IPv4 or IPv6, both without and with timeout support. All the hash types are based on the "array hash" or ahash structure and functions as a good compromise between minimal memory footprint and speed. The hashing uses arrays to resolve clashes. The hash table is resized (doubled) when searching becomes too long. Resizing can be triggered by userspace add commands only and those are serialized by the nfnl mutex. During resizing the set is read-locked, so the only possible concurrent operations are the kernel side readers. Those are protected by RCU locking. Because of the four flavours and the other hash types, the functions are implemented in general forms in the ip_set_ahash.h header file and the real functions are generated before compiling by macro expansion. Thus the dereferencing of low-level functions and void pointer arguments could be avoided: the low-level functions are inlined, the function arguments are pointers of type-specific structures. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 543261907dc3c4e90845acfcd602ebdbfdfcb4f0 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:37:04 2011 +0100 netfilter: ipset; bitmap:port set type support The module implements the bitmap:port type in two flavours, without and with timeout support to store TCP/UDP ports from a range. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit de76021a1bb35e3560afccf741d1119a872aea49 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:35:12 2011 +0100 netfilter: ipset: bitmap:ip,mac type support The module implements the bitmap:ip,mac set type in two flavours, without and with timeout support. In this kind of set one can store IPv4 address and (source) MAC address pairs. The type supports elements added without the MAC part filled out: when the first matching from kernel happens, the MAC part is automatically filled out. The timing out of the elements stars when an element is complete in the IP,MAC pair. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 72205fc68bd13109576aa6c4c12c740962d28a6c Author: Jozsef Kadlecsik Date: Tue Feb 1 15:33:17 2011 +0100 netfilter: ipset: bitmap:ip set type support The module implements the bitmap:ip set type in two flavours, without and with timeout support. In this kind of set one can store IPv4 addresses (or network addresses) from a given range. In order not to waste memory, the timeout version does not rely on the kernel timer for every element to be timed out but on garbage collection. All set types use this mechanism. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 3d8b2ce01b2de7c3c5cbf18b9b97d26cfaf11c14 Author: Mark Brown Date: Mon Jan 31 20:14:38 2011 +0000 ASoC: Use snd_pcm_format_width() in snd_soc_params_to_frame_size() Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a7b4f989a629493bb4ec4a354def784d440b32c4 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:28:35 2011 +0100 netfilter: ipset: IP set core support The patch adds the IP set core support to the kernel. The IP set core implements a netlink (nfnetlink) based protocol by which one can create, destroy, flush, rename, swap, list, save, restore sets, and add, delete, test elements from userspace. For simplicity (and backward compatibilty and for not to force ip(6)tables to be linked with a netlink library) reasons a small getsockopt-based protocol is also kept in order to communicate with the ip(6)tables match and target. The netlink protocol passes all u16, etc values in network order with NLA_F_NET_BYTEORDER flag. The protocol enforces the proper use of the NLA_F_NESTED and NLA_F_NET_BYTEORDER flags. For other kernel subsystems (netfilter match and target) the API contains the functions to add, delete and test elements in sets and the required calls to get/put refereces to the sets before those operations can be performed. The set types (which are implemented in independent modules) are stored in a simple RCU protected list. A set type may have variants: for example without timeout or with timeout support, for IPv4 or for IPv6. The sets (i.e. the pointers to the sets) are stored in an array. The sets are identified by their index in the array, which makes possible easy and fast swapping of sets. The array is protected indirectly by the nfnl mutex from nfnetlink. The content of the sets are protected by the rwlock of the set. There are functional differences between the add/del/test functions for the kernel and userspace: - kernel add/del/test: works on the current packet (i.e. one element) - kernel test: may trigger an "add" operation in order to fill out unspecified parts of the element from the packet (like MAC address) - userspace add/del: works on the netlink message and thus possibly on multiple elements from the IPSET_ATTR_ADT container attribute. - userspace add: may trigger resizing of a set Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 836aded1613dc93bebe7b1d2710f4a416725db50 Author: Alan Cox Date: Tue Feb 1 11:34:40 2011 +0000 staging: sep: Further tidying More debug printk pruning and turn down some that the user can cause intentionally to debug level. Tidy up the ioctl code a bit more Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 38a26ef272d8a93c88de54d8d3bd14ac3ce36056 Author: Alan Cox Date: Tue Feb 1 11:31:40 2011 +0000 staging: usbvideo: vicam: Fix build in -next Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2bc9a81e2aa3c95b1e709f3109c3bbc6d969cc06 Author: Dimitris Papastamos Date: Tue Feb 1 12:24:08 2011 +0000 ASoC: soc-core: Ensure codec_reg has fixed length fields Make the format of the codec_reg file more easily parsable. Remove the header field which gives the codec name. These changes are important when it comes to extend the debugfs codec_reg file to dump more than PAGE_SIZE bytes to make it easier to calculate offsets within the file. We still need to handle the case when the snd_soc_read() call fails and is outputted. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 2cfec93fecc086c5af3c58ad15b7841f36af205c Merge: f9eabc3 f019ee5 47f5ae5 Author: Mark Brown Date: Tue Feb 1 14:21:09 2011 +0000 Merge branches 'for-2.6.38' and 'tegra-arch' into for-2.6.39 commit f703651ef870bd6b94ddc98ae07488b7d3fd9335 Author: Jozsef Kadlecsik Date: Tue Feb 1 15:20:14 2011 +0100 netfilter: NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros The patch adds the NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros to the vanilla kernel. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy commit 47f5ae51f2aedac2f3006c1252f1020fdfc1d3c0 Author: Stephen Warren Date: Mon Jan 31 15:37:15 2011 -0700 ARM: tegra: Add to struct harmony_audio_platform_data Add fields to describe all the audio-related GPIOs on Harmony, except for the codec's GPIO IRQ, which will be passed in its i2c_board_info. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f9eabc3deedccf545bd73fd72b3af2759d44f6f3 Author: Stephen Warren Date: Mon Jan 31 11:00:17 2011 -0700 ASoC: Tegra: Harmony: Remove redundant !! gpio_set_value* should accept logic values not just 0 or 1. The WM8903 GPIO driver has been fixed to work this way, so remove the redundant !! previously required when it didn't accept values >1. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8cda975174945e3b7119d48341052d0dc0c87cf2 Author: Jarkko Nikula Date: Mon Jan 31 14:43:48 2011 +0200 ASoC: omap: rx51: Add earphone support Earphone in Nokia RX-51/N900 is connected to left HP output of B part of the TLV320AIC34 dual codec. In RX-51 the codec A is used as a traditional codec and the codec B as an auxiliary device. Audio from codec A goes via the codec B to earphone: MONO_LOUT of A -> LINE2R of B (B interconnects) -> HPLOUT of B -> Earphone. Take earphone into use by utilizing the recent ASoC auxiliary and cross-device support. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit c534a107e8fe446202b0fab102abc015c56c0317 Author: Tejun Heo Date: Tue Feb 1 11:42:43 2011 +0100 rds/ib: use system_wq instead of rds_ib_fmr_wq With cmwq, there's no reason to use dedicated rds_ib_fmr_wq - it's not in the memory reclaim path and the maximum number of concurrent work items is bound by the number of devices. Drop it and use system_wq instead. This rds_ib_fmr_init/exit() noops. Both removed. Signed-off-by: Tejun Heo Cc: Andy Grover commit aa70c585b15f64da6948bdacc7a7692addd65364 Author: Tejun Heo Date: Tue Feb 1 11:42:43 2011 +0100 net/9p: replace p9_poll_task with a work Now that cmwq can handle high concurrency, it's more efficient to use work than a dedicated kthread. Convert p9_poll_proc() to a work function for p9_poll_work and make p9_pollwake() schedule it on each poll event. The work is sync flushed on module exit. Signed-off-by: Tejun Heo Cc: Eric Van Hensbergen Cc: Ron Minnich Cc: Latchesar Ionkov Cc: v9fs-developer@lists.sourceforge.net commit 61edeeed917958dce5b43134d6704451ddf421fa Author: Tejun Heo Date: Tue Feb 1 11:42:43 2011 +0100 net/9p: use system_wq instead of p9_mux_wq With cmwq, there's no reason to use a dedicated workqueue in trans_fd. Drop p9_mux_wq and use system_wq instead. The used work items are already sync canceled in p9_conn_destroy() and doesn't require further synchronization. Signed-off-by: Tejun Heo Cc: Eric Van Hensbergen Cc: Ron Minnich Cc: Latchesar Ionkov Cc: v9fs-developer@lists.sourceforge.net commit 83e759043abe9d0291f58f2427ba12bbb0a6e4f1 Author: Tejun Heo Date: Tue Feb 1 11:42:43 2011 +0100 xfs: convert to alloc_workqueue() Convert from create[_singlethread]_workqueue() to alloc_workqueue(). * xfsdatad_workqueue and xfsconvertd_workqueue are identity converted. Using higher concurrency limit might be useful but given the complexity of workqueue usage in xfs, proceeding cautiously seems better. * xfs_mru_reap_wq is converted to non-ordered workqueue with max concurrency of 1 as the work items don't require any specific ordering and already have proper synchronization. It seems it was singlethreaded to save worker threads, which is no longer a concern. Signed-off-by: Tejun Heo Cc: Alex Elder Cc: xfs-masters@oss.sgi.com Cc: Christoph Hellwig commit 28aadf51693f56c41326ebbc795318a49011b12d Author: Tejun Heo Date: Tue Feb 1 11:42:42 2011 +0100 reiserfs: make commit_wq use the default concurrency level The maximum number of concurrent work items queued on commit_wq is bound by the number of active journals. Convert to alloc_workqueue() and use the default concurrency level so that they can be processed in parallel. Signed-off-by: Tejun Heo Cc: reiserfs-devel@vger.kernel.org commit 316873c958eee302952edcadb8dc72d6d3d19d3c Author: Tejun Heo Date: Tue Feb 1 11:42:42 2011 +0100 ocfs2: use system_wq instead of ocfs2_quota_wq ocfs2_quota_wq is not depended upon during memory reclaim and, with cmwq, there's no reason to use a dedicated workqueue. Drop ocfs2_quota_wq and use system_wq instead. dqi_sync_work is already sync canceled on quota disable and no further synchronization is necessary. This change makes ocfs2_quota_setup/shutdown() noops. Both functions removed. Signed-off-by: Tejun Heo Cc: Mark Fasheh Cc: Joel Becker commit fd89d5f2030ac83324330bfd0bc73abf1beadaa6 Author: Tejun Heo Date: Tue Feb 1 11:42:42 2011 +0100 ext4: convert to alloc_workqueue() Convert create_workqueue() to alloc_workqueue(). This is an identity conversion. Signed-off-by: Tejun Heo Cc: "Theodore Ts'o" Cc: Andreas Dilger Cc: linux-ext4@vger.kernel.org commit 40f38ffb72cd58452dc5afc25ca5215bb90538a4 Author: Tejun Heo Date: Tue Feb 1 11:42:42 2011 +0100 scsi/scsi_tgt_lib: scsi_tgtd isn't used in memory reclaim path Workqueue scsi_tgtd isn't used during memory reclaim. Convert to alloc_workqueue() without WQ_MEM_RECLAIM. Signed-off-by: Tejun Heo Cc: FUJITA Tomonori Cc: "James E.J. Bottomley" Cc: linux-scsi@vger.kernel.org commit 278274d544e6c6b02312fee59817faa6e810b03a Author: Tejun Heo Date: Tue Feb 1 11:42:42 2011 +0100 scsi/be2iscsi,qla2xxx: convert to alloc_workqueue() Switch to new workqueue interface alloc_workqueue(). These are identity conversions. Signed-off-by: Tejun Heo Acked-by: Madhuranath Iyengar Cc: Jayamohan Kallickal Cc: Andrew Vasquez Cc: "James E.J. Bottomley" Cc: linux-scsi@vger.kernel.org commit 51f50f815778b91c699fbcc3aac0dda891a7b795 Author: Tejun Heo Date: Tue Feb 1 11:42:42 2011 +0100 misc/iwmc3200top: use system_wq instead of dedicated workqueues With cmwq, there's no reason to use separate workqueues in iwmc3200top. Drop them and use system_wq instead. The used work items are sync flushed before driver detach. Signed-off-by: Tejun Heo Cc: Tomas Winkler commit 52286713a9ae1c4c80d521a8990e8c3ba14118f3 Author: Tejun Heo Date: Tue Feb 1 11:42:42 2011 +0100 i2o: use alloc_workqueue() instead of create_workqueue() This is an identity conversion. Signed-off-by: Tejun Heo Cc: Markus Lidel commit 44d2588e1102b4e35022d03b7f124dd6ea013ce8 Author: Tejun Heo Date: Tue Feb 1 11:42:42 2011 +0100 acpi: kacpi*_wq don't need WQ_MEM_RECLAIM ACPI workqueues aren't used during memory reclaming. Use alloc_workqueue() to create workqueues w/o rescuers. If the purpose of the separation between kacpid_wq and kacpi_notify_wq was to give notifications better response time, kacpi_notify_wq can be dropped and kacpi_wq can be created with higher @max_active. Signed-off-by: Tejun Heo Cc: Len Brown Cc: linux-acpi@vger.kernel.org commit 17292ecc07857bb16737c340dda289ab9d219e05 Merge: cd7bb53 0ce0887 Author: Paul Mundt Date: Tue Feb 1 19:38:49 2011 +0900 Merge branch 'sh/urgent' into sh-latest commit 3a22ebe9cc76acac2511b1d3979a35609924ce42 Author: Stefan Achatz Date: Sat Jan 29 02:17:30 2011 +0100 HID: hidraw: fix hidraw_disconnect() hidraw_disconnect() first sets an entry in hidraw_table to NULL and calls device_destroy() afterwards. The thereby called hidraw_release() tries to read this already cleared value resulting in never removing any device from the list. This got fixed by changing the order of events. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit b4a65f4ef59b0ce36ccd518cd2b696afdd932d96 Author: Nikolai Kondrashov Date: Fri Jan 28 14:50:53 2011 +0300 HID: update dragonrise Kconfig description Add list of (supposedly) supported gamepads to dragonrise driver Kconfig description. Signed-off-by: Nikolai Kondrashov Signed-off-by: Jiri Kosina commit e05eefb9be109e6cbbfd362b49ee83397130a7e4 Author: Nikolai Kondrashov Date: Fri Jan 28 14:50:52 2011 +0300 HID: add support for DragonRise PID 0011 gamepad Add support for DragonRise Inc. gamepad with USB PID 0x0011 by fixing its report descriptor. This mainly removes spurious axis. Signed-off-by: Nikolai Kondrashov Signed-off-by: Jiri Kosina commit 152fd6347e63d176d1f03c8d142e534a5227ef3f Author: Nikolai Kondrashov Date: Fri Jan 28 14:50:51 2011 +0300 HID: rename hid-drff.c to hid-dr.c Rename drivers/hid/hid-drff.c (a DragonRise Inc. force feedback gamepad driver) to driver/hid/hid-dr.c. This prepares it for addition of support for another gamepad, without force feedback. Signed-off-by: Nikolai Kondrashov Signed-off-by: Jiri Kosina commit df42c8a720ff2e0d52d187bb1120339e79f58604 Author: Fabio Estevam Date: Mon Jan 31 15:12:54 2011 -0200 ARM: mx5/board-mx53_evk.c: Make UART1 functional Fix UART1 IOMUX settings and configure UART1 to work with only RX/TX pins. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit cdb2daa4ffcb331d08e356ed66b57bd14d105746 Author: Fabio Estevam Date: Mon Jan 31 10:32:27 2011 -0200 ARM: mx5/board-mx53_smd.c: Make UART1 functional Fix UART1 IOMUX settings and configure UART1 to work with only RX/TX pins. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit abc1813dc0285353d9ce387b90ffce8acc26227e Author: Fabio Estevam Date: Tue Jan 25 13:08:35 2011 -0200 ARM: mach-mx5/board-mx53_loco: Remove unused UARTs On mx53_loco only UART1 is used and its signals go to connector J16. Remove UART2 and UART3 as they are not used on this board. Signed-off-by: Fabio Estevam Acked-by: Richard Zhao Signed-off-by: Sascha Hauer commit 528f65271f24d1fe9b46065e0fef9571698bd78c Author: Fabio Estevam Date: Tue Jan 25 13:08:34 2011 -0200 ARM: mach-mx5/board-mx53_loco: Make UART1 functional Fix IOMUX settings for UART1 and make UART1 functional. Signed-off-by: Fabio Estevam Acked-by: Richard Zhao Signed-off-by: Sascha Hauer commit 67f2a87f92716c3126415e114af57164736bbca5 Author: Fabio Estevam Date: Tue Jan 25 13:08:33 2011 -0200 ARM: mach-mx5: Fix build for mx53_loco and mx53_smd Commit 816ad74 (ARM: i.MX53: Add full iomux support for mx53) renamed some of the pad names. Make the changes accordingly so that mx53_loco and mx53_cmd can build without errors. Signed-off-by: Fabio Estevam Acked-by: Richard Zhao Signed-off-by: Sascha Hauer commit 8f9a3f9b63b8cd3f03be9dc53533f90bd4120e5f Author: Chris Wilson Date: Tue Feb 1 09:01:13 2011 +0000 drm/i915: Enable GMBUS for post-gen2 chipsets With the recent SDVO fix, this is working on all the machines I have to hand - except for an 845G. Signed-off-by: Chris Wilson commit 4a1dc3ff68807bf3c76563bf439166854d063adc Merge: 72557b4 78c6e17 Author: Chris Wilson Date: Tue Feb 1 08:49:07 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Merge resume fixes from -fixes and an important fix for SDVO GMBUS. commit 72557b4f326ac2f7d469ae5a35fab57e13d9a602 Author: Chris Wilson Date: Mon Jan 31 10:29:55 2011 +0000 drm/i915: Remove unreachable condition Fortunately unreachable. For Crestline, the watermarks must always be programmed to 8... Signed-off-by: Chris Wilson commit 5a1e5b6c460dccfd189c7e962281c8cce75da728 Author: Chris Wilson Date: Sat Jan 29 16:50:25 2011 +0000 drm/i915: Override SDVO panel type in VBT Judging by comments in the BIOS, if the SDVO LVDS option h40 is enabled, then we are supposed to query the real panel type via Int15. We don't do this and so for the Sony Vaio VGC-JS210J which has otherwise default values, we choose the wrong mode. This patch adds a driver option, i915.vbt_sdvo_panel_type, which can be used to override the value in the VBT. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33691 Signed-off-by: Chris Wilson commit 309cfea822413a306a5a4e24c2aa832e8e8217a1 Author: Chris Wilson Date: Fri Jan 28 13:54:53 2011 +0000 drm/i915: Trivial spelling mistake 'assertiing' Signed-off-by: Chris Wilson commit 7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4 Author: Thomas Gleixner Date: Tue Feb 1 09:34:58 2011 +0100 time: Fix legacy arch fallout The xtime/dotimer cleanup broke architectures which do not implement clockevents. Time to send out another __do_IRQ threat. Signed-off-by: Thomas Gleixner Reported-by: Ingo Molnar Cc: Torben Hohn Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: yong.zhang0@gmail.com Cc: hch@infradead.org LKML-Reference: <20110127145905.23248.30458.stgit@localhost> Signed-off-by: Ingo Molnar commit 039c4644b49ea707a2159c22f638f4f1c0144c69 Author: Alexander Stein Date: Mon Jan 31 17:00:24 2011 +0100 plat-mxc: Provide irq_chip name for GPIO IRQs Signed-off-by: Alexander Stein Signed-off-by: Sascha Hauer commit 2546bcc2d64c3bd0e7cb802cb8fc6cf757c6be0b Author: Dmitry Torokhov Date: Mon Jan 31 21:06:34 2011 -0800 Input: input-polldev - fix a couple of typos Signed-off-by: Dmitry Torokhov commit aebd636bd60e2dda0ebc907dd5f7f4a45174411c Author: Dmitry Torokhov Date: Mon Jan 31 21:06:39 2011 -0800 Input: switch completely over to the new versions of get/setkeycode All users of old style get/setkeycode methids have been converted so it is time to retire them. Acked-by: Mauro Carvalho Chehab Acked-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit f06e6a52ca3dbe927f58653b1e90cbb53f5ceb55 Author: Dmitry Torokhov Date: Mon Jan 31 21:06:39 2011 -0800 Input: dvb-usb-remote - convert to new style of get/setkeycode Acked-by: Mauro Carvalho Chehab Signed-off-by: Dmitry Torokhov commit a1f3d4bba8ea395a39d34ade6017afee8be16031 Merge: 723d928 ebf5382 Author: Dmitry Torokhov Date: Mon Jan 31 21:16:22 2011 -0800 Merge commit 'v2.6.38-rc3' into next commit 723d928417bffff6467da155d8ebbbe016464012 Author: Mark Brown Date: Mon Jan 31 21:09:25 2011 -0800 Input: wm831x-ts - remove use of ternary operator While being applied the driver was modified to add use of the ternary operator. Write the conditionals out longhand as I find it terribly unhelpful for legibility. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 2ba451421b23636c45fabfa522858c5c124b3673 Author: Vladislav Zolotarov Date: Mon Jan 31 14:39:17 2011 +0000 bnx2x, cnic: Consolidate iSCSI/FCoE shared mem logic in bnx2x Move all shared mem code to bnx2x to avoid code duplication. bnx2x now performs: - Read the FCoE and iSCSI max connection information. - Read the iSCSI and FCoE MACs from NPAR configuration in shmem. - Block the CNIC for the current function if there is neither FCoE nor iSCSI valid configuration by returning NULL from bnx2x_cnic_probe(). Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 0c838ff1ade71162775afffd9e5c6478a60bdca6 Author: David S. Miller Date: Mon Jan 31 16:16:50 2011 -0800 ipv4: Consolidate all default route selection implementations. Both fib_trie and fib_hash have a local implementation of fib_table_select_default(). This is completely unnecessary code duplication. Since we now remember the fib_table and the head of the fib alias list of the default route, we can implement one single generic version of this routine. Looking at the fib_hash implementation you may get the impression that it's possible for there to be multiple top-level routes in the table for the default route. The truth is, it isn't, the insert code will only allow one entry to exist in the zero prefix hash table, because all keys evaluate to zero and all keys in a hash table must be unique. Signed-off-by: David S. Miller commit 5b4704419cbd0b7597a91c19f9e8e8b17c1af071 Author: David S. Miller Date: Mon Jan 31 16:10:03 2011 -0800 ipv4: Remember FIB alias list head and table in lookup results. This will be used later to implement fib_select_default() in a completely generic manner, instead of the current situation where the default route is re-looked up in the TRIE/HASH table and then the available aliases are analyzed. Signed-off-by: David S. Miller commit f6bbc1daac964da551130dbf01809d3fbd178b2d Author: Arnaldo Carvalho de Melo Date: Mon Jan 31 20:56:27 2011 -0200 perf python: Fix build on 32-bit Where there are lots of errors related to python methods receiving 'char *' for things like file open mode, which break the build, also disable strict aliasing and fixup some other warnings. Now builds on both 32-bit and 64-bit fedora systems. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit bc8bf90a643123f99f98027040f7256ce79b45da Author: Nick Robinson Date: Mon Jan 31 10:56:50 2011 -0600 Staging: comedi: Fix checpatch.pl issues in file rtd520.c This patch fixes the checkpatch errors listed below: ERROR: code indent should use tabs where possible WARNING: space prohibited between function name and open parenthesis '(' WARNING: please, no spaces at the start of a line WARNING: braces {} are not necessary for single statement blocks WARNING: printk() should include KERN_ facility level Signed-off-by: Nick Robinson Signed-off-by: Greg Kroah-Hartman commit e80528b78e8d33494a0784dc214e71a728162d92 Author: Adam Thompson Date: Sat Jan 29 02:08:50 2011 -0500 Staging: wlan-ng: fix 2 space coding style issues This patch to p80211conv.c fixes to space coding style warnings found with checkpatch.pl Signed-off-by: Adam Thompson Signed-off-by: Greg Kroah-Hartman commit ae639830fe6299d67407ca63f43bb28ea781684a Author: Roland Stigge Date: Sat Jan 29 16:27:17 2011 +0100 Staging: iio: ad7476_core.c: Fixed i2c -> spi documentation typo ad7476_core.c: Fixed i2c -> spi documentation typo Minor documentation fix in comment Signed-off-by: Roland Stigge Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 826514b4ee347bf683f043e0900590cfac4d6da5 Author: Roland Stigge Date: Sat Jan 29 16:36:46 2011 +0100 Staging: iio: max517.c: Fix client obtainment by using iio_dev_get_devdata() max517.c: Fix client obtainment by using iio_dev_get_devdata() This patch uses dev_get_drvdata() and iio_dev_get_devdata() instead of to_i2c_client() (broken!) to obtain i2c_client data. Further, some minor typo fixes are included. Signed-off-by: Roland Stigge Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 868788278eaa5b841ec1a810b41e156f5fba0ab5 Author: Timo von Holtz Date: Sun Jan 30 22:19:39 2011 +0100 Staging: dabusb: fixed coding style issues Fixed coding style issues Signed-off-by: Timo von Holtz Signed-off-by: Greg Kroah-Hartman commit 046d747e0d2cb597e0b6fa4a79c32b43e97ed792 Author: Timo von Holtz Date: Sun Jan 30 20:04:55 2011 +0100 Staging: usbvideo: vicam: fixed some coding style issues fixed coding style issues. Signed-off-by: Timo von Holtz Signed-off-by: Greg Kroah-Hartman commit 61ceb7f91b7a56c129abb8d94a1267786fefcf70 Author: Timo von Holtz Date: Sun Jan 30 19:24:03 2011 +0100 Staging: usbvideo: usbvideo: fixed some coding style issues fixed coding style issues. Signed-off-by: Timo von Holtz Signed-off-by: Greg Kroah-Hartman commit 0ffbf8bf21db0186e9fbb024a1796c3148790578 Author: Greg Kroah-Hartman Date: Mon Jan 31 14:03:00 2011 -0800 Revert "appletalk: move to staging" This reverts commit a6238f21736af3f47bdebf3895f477f5f23f1af9 Appletalk got some patches to fix up the BLK usage in it in the network tree, so this removal isn't needed. Cc: Arnd Bergmann Cc: Cc: netdev@vger.kernel.org, Cc: David Miller Signed-off-by: Greg Kroah-Hartman commit 51da8e2b4e0e4b14e5ec0fd32473dcfc2562b822 Author: Mike McCormack Date: Mon Jan 31 22:11:15 2011 +0900 Staging: rtl8192e: Remove unused card type Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 1694027394a625fc880d8a6d5357d17d48d64978 Author: Mike McCormack Date: Mon Jan 31 22:11:02 2011 +0900 Staging: rtl8192e: Remove unused endian_swap function Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 11aacc282d6755f452fb88f76a883ea77c3b982e Author: Mike McCormack Date: Mon Jan 31 22:10:48 2011 +0900 Staging: rtl8192e: Remove #if 1 blocks Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 83184e692826975c296aa0f5ed18d3809b2d1630 Author: Mike McCormack Date: Mon Jan 31 22:10:38 2011 +0900 Staging: rtl8192e: Move static variable to device struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit d163f324af5cd2c504796f471f29a8b62d71bf93 Author: Mike McCormack Date: Mon Jan 31 22:10:12 2011 +0900 Staging: rtl8192e: Move static variable to device struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit d5fdaa3ae73ef61de5a82b63a601afa9c4dc1d3b Author: Mike McCormack Date: Mon Jan 31 22:09:58 2011 +0900 Staging: rtl8192e: Move static variable to device struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 935ce8991a9760d101311a34a53503b291faaa11 Author: Mike McCormack Date: Mon Jan 31 22:09:44 2011 +0900 Staging: rtl8192e: Move static variable to device struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit b3bb17e6dada06a4b68a7b1414dbfc6c46f6d9ff Author: Mike McCormack Date: Mon Jan 31 22:09:27 2011 +0900 Staging: rtl8192e: Remove PF_SYNCTHREADifdefs Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 6376f210aeca59c89c67efe8ccf28c36bb98b832 Author: Mike McCormack Date: Mon Jan 31 22:09:15 2011 +0900 Staging: rtl8192e: Don't mess with carrier before registering device Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 890a6850b34d81e0052d5953a14f97fe6511b83b Author: Mike McCormack Date: Mon Jan 31 22:09:02 2011 +0900 Staging: rtl8192e: Remove support for legacy wireless extentions Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit d128eaccbedc8f3799492b5a590a72674c580308 Author: Mike McCormack Date: Mon Jan 31 22:08:36 2011 +0900 Staging: rtl8192e: Remove unused struct members Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 8875899c05ebf596934fcb9dde2f7601930f28f9 Author: Mike McCormack Date: Mon Jan 31 22:08:18 2011 +0900 Staging: rtl8192e: Delete dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 356955aefd93ba5b36960701c21b5f14dca64c99 Author: Mike McCormack Date: Mon Jan 31 22:08:08 2011 +0900 Staging: rtl8192e: Remove unused statistics Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit c282f2e3458a4ee51e2d97328633ee4679f5dc55 Author: Mike McCormack Date: Mon Jan 31 22:07:54 2011 +0900 Staging: rtl8192e: Remove variable that is never written Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 8205669a4026d593a6b87c8cc983563e51997021 Author: Joe Perches Date: Thu Jan 27 20:04:32 2011 -0800 staging: ath6kl: Convert tspecCompliance from A_BOOL to int Make the use in wmi_verify_tspec_params match the declaration of the variable. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 34603829c46d3c23fac99b0d5528878602a81862 Author: Joe Perches Date: Thu Jan 27 20:04:31 2011 -0800 staging: ath6kl: Convert sets of scanSpecificSsid to TRUE/FALSE. Don't use 0/1 for an A_BOOL. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 5bb5572ab6cee2887d87ce1de433a44bba15a998 Author: Joe Perches Date: Thu Jan 27 20:04:30 2011 -0800 staging: ath6kl: Convert A_NETBUF_QUEUE_EMPTY to return TRUE or FALSE Make the return an A_BOOL not int. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit ebb8e4909860474060ff7fcdcfd05f183f0f3568 Author: Joe Perches Date: Thu Jan 27 20:04:29 2011 -0800 staging: ath6kl: Convert A_UINT8 is_amsdu and is_acl_data_frame to A_BOOL Use A_BOOL as appropriate for actual variable uses. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit e2ad9082eb8c88793a9aa1475b28932d48ce7a7e Author: Joe Perches Date: Thu Jan 27 20:04:28 2011 -0800 staging: ath6kl: cfg80211: Convert forceFgScan to A_UINT32 It's declared that way in the prototype, use it that way too. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 6be02be5f95269978e033345d9938066f157c6bf Author: Joe Perches Date: Thu Jan 27 20:04:27 2011 -0800 staging: ath6kl: Convert 0 to FALSE Convert a set of an A_BOOL from 0 to FALSE. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit bd1188851eb075a99508d3e724571d506b119895 Author: Joe Perches Date: Thu Jan 27 20:04:26 2011 -0800 staging: ath6kl: Convert A_BOOL compressed sets from 0 to FALSE Use the appropriate define. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 807208fe775e3c41776007544bc7d4f7e5d2ef25 Author: Joe Perches Date: Thu Jan 27 20:04:25 2011 -0800 staging: ath6kl: Convert BDADDR_Present uses to TRUE/FALSE bugfix The previous uses of BDADDR_Present set the initial value to A_ERROR (-1) when not present and A_OK (0) when present. A later test for (!BDADDR_Present) was therefore logically inverted. Convert the values to TRUE/FALSE and the test is now logically correct. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 879cf160ed0494ea1ffa8959c388d3aa391f3be2 Author: Joe Perches Date: Thu Jan 27 20:04:24 2011 -0800 staging: ath6kl: Convert type of streamExists to A_UINT8 Make the declaration type match the assigned from type. It's not a bool, it's a u8. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit f192c2bdede465481cad49095ec71d4dfad904b1 Author: Joe Perches Date: Thu Jan 27 20:04:23 2011 -0800 staging: ath6kl: Convert bypasswmi to bool Types should match logical uses. Remove unused extern, make static. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit ae8e1e7ad2ecdf4ecd68cf02d54a5ed6054b01c3 Author: Joe Perches Date: Thu Jan 27 20:04:22 2011 -0800 staging: ath6kl: wmi.h: Convert packed structures with A_BOOL to u32 These structures are device native and need to be 4 bytes long. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 391bb2116a4ffeeee75dfbbe2e9de678d2fac88d Author: Joe Perches Date: Thu Jan 27 20:04:21 2011 -0800 staging: ath6kl: Remove A_FAILED macro Remove obfuscating A_FAILED(foo) macro. Just test for foo instead. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 509c9d973055e3d98c0d2aa2cb40c9139526fd74 Author: Joe Perches Date: Thu Jan 27 20:04:20 2011 -0800 staging: ath6kl: Remove A_SUCCESS macro Remove obfuscating A_SUCCESS(foo) macro. Just test for !foo instead. Reformat a few macros that used A_SUCCESS for better readability. Add do { foo } while (0) surrounds to those macros too. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit 1f4c34bded914e81b4388ccfdfab8a31da5ab0c3 Author: Joe Perches Date: Thu Jan 27 20:04:19 2011 -0800 staging: ath6kl: Convert enum A_STATUS to int Convert enum members to int as well. Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit a789325dc3aa89bb5001d26b542d7abc775b46f1 Author: Joe Perches Date: Thu Jan 27 20:04:18 2011 -0800 staging: ath6kl: Update cfg80211 to recent calling convention changes Add bool unicast and bool multicast to set_default_key Return struct net_device * to add_virtual_intf Signed-off-by: Joe Perches Acked-by: Vipin Mehta Signed-off-by: Greg Kroah-Hartman commit d7ddd16933ca9f7957b6caed5b323f7f167faa60 Author: Coly Li Date: Thu Jan 27 20:12:35 2011 +0800 Staging: wl_cfg80211.c: use BUG_ON correctly This patch removes explicit unlikely() when using BUG_ON() in wl_cfg80211.c Signed-off-by: Coly Li Signed-off-by: Greg Kroah-Hartman commit 823c7164a92a6347d46bb64aaae728b6d08f3bb8 Author: Arnaldo Carvalho de Melo Date: Mon Jan 31 19:45:38 2011 -0200 perf probe: Use %td for pointer arithmetic result %td is for ptrdiff_t, avoiding this warning on 32-bit: cc1: warnings being treated as errors builtin-probe.c: In function ‘opt_set_filter’: builtin-probe.c:176:4: error: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘int’ Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 3073acd61cf278e4f85521186e937ab6e7fee739 Author: Julia Lawall Date: Thu Jan 27 16:49:07 2011 +0100 staging: msm/lcdc.c: Convert IS_ERR result to PTR_ERR This code elsewhere returns a negative constant to an indicate an error, while IS_ERR returns the result of a >= operation. The semantic patch that fixes this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x; @@ if (...) { ... - return IS_ERR(x); + return PTR_ERR(x); } // Signed-off-by: Julia Lawall Acked-by: David Brown Signed-off-by: Greg Kroah-Hartman commit da9fcb7260af0cd85351740b526afdc88d4f348a Author: Haiyang Zhang Date: Wed Jan 26 12:12:14 2011 -0800 staging: hv: Convert camel cased struct fields in vmbus_private.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 415f228712d86dd5598f809e8e379ff5ad729652 Author: Haiyang Zhang Date: Wed Jan 26 12:12:13 2011 -0800 staging: hv: Convert camel cased struct fields in vmbus_packet_format.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 767dff6853ae0f68438e623199cc7137441a286d Author: Haiyang Zhang Date: Wed Jan 26 12:12:12 2011 -0800 staging: hv: Convert camel cased struct fields in vmbus_channel_interface.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit ca623ad3558f71efa08ec0fdefd79989a32a88e2 Author: Haiyang Zhang Date: Wed Jan 26 12:12:11 2011 -0800 staging: hv: Convert camel cased struct fields in vmbus_api.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 646f1ea3796c7bd46587e4a9b58f64cf005efdfe Author: Haiyang Zhang Date: Wed Jan 26 12:12:10 2011 -0800 staging: hv: Convert camel cased functions in vmbus_drv.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit adf874cb355fcc3293aa489f427f682e708cf586 Author: Haiyang Zhang Date: Wed Jan 26 12:12:09 2011 -0800 staging: hv: Convert camel cased variables in vmbus_drv.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit c69776771f5fcc49d9a49580234d3a481409c80e Author: Haiyang Zhang Date: Wed Jan 26 12:12:08 2011 -0800 staging: hv: Convert camel cased functions in connection.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 15b2f6479b5c5220848ba159248665d56694d2f9 Author: Haiyang Zhang Date: Wed Jan 26 12:12:07 2011 -0800 staging: hv: Convert camel cased variables in connection.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit a6238f21736af3f47bdebf3895f477f5f23f1af9 Author: Arnd Bergmann Date: Tue Jan 25 23:17:27 2011 +0100 appletalk: move to staging For all I know, Appletalk is dead, the only reasonable use right now would be nostalgia, and that can be served well enough by old kernels. The code is largely not in a bad shape, but it still uses the big kernel lock, and nobody seems motivated to change that. FWIW, the last release of MacOS that supported Appletalk was MacOS X 10.5, made in 2007, and it has been abandoned by Apple with 10.6. Using TCP/IP instead of Appletalk has been supported since MacOS 7.6, which was released in 1997 and is able to run on most of the legacy hardware. Signed-off-by: Arnd Bergmann Cc: Arnaldo Carvalho de Melo Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman commit 939cbe5af5fb04de1a53942a8c4a6e0160f4f38b Author: Arnd Bergmann Date: Tue Jan 25 23:17:21 2011 +0100 staging: remove smbfs smbfs got moved to staging in 2.6.37, so we can finally remove it in the 2.6.39 merge window. All users should by now have migrated to cifs. Signed-off-by: Arnd Bergmann Cc: linux-cifs@vger.kernel.org Cc: Jeff Layton Signed-off-by: Greg Kroah-Hartman commit 561c5cf9236a7eb5a52971b6e7e02c5bd094c6d5 Author: Arnd Bergmann Date: Tue Jan 25 23:17:20 2011 +0100 staging: Remove autofs3 autofs3 was moved to staging in 2.6.37, so we can remove it in the 2.6.39 merge window. If we have a reason to bring it back after that, this patch can get reverted. Signed-off-by: Arnd Bergmann About-fscking-timed-by: H. Peter Anvin Cc: Ian Kent Cc: autofs@linux.kernel.org Signed-off-by: Greg Kroah-Hartman commit 8aea5882c54feb246ef20399cc55ae4672697ac0 Author: Arnd Bergmann Date: Tue Jan 25 23:17:19 2011 +0100 staging/go7007: remove the BKL There is nothing that the BKL can possibly protect here, so just remove it. Cc: Ross Cohen Signed-off-by: Greg Kroah-Hartman commit 27a16811ab4dc819eebbd4e7b07d485f6e8f0134 Author: Randy Dunlap Date: Mon Jan 31 13:11:28 2011 -0800 staging: fix rts_pstor build errors Fix multiple rts_pstor build errors. When CONFIG_PCI is not enabled: drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_acquire_irq': drivers/staging/rts_pstor/rtsx.c:324: error: implicit declaration of function 'pci_intx' drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_read_pci_cfg_byte': drivers/staging/rts_pstor/rtsx.c:336: error: implicit declaration of function 'pci_get_domain_bus_and_slot' drivers/staging/rts_pstor/rtsx.c:336: warning: assignment makes pointer from integer without a cast drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_shutdown': drivers/staging/rts_pstor/rtsx.c:462: error: implicit declaration of function 'pci_disable_msi' drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_probe': drivers/staging/rts_pstor/rtsx.c:981: error: implicit declaration of function 'pci_enable_msi' When CONFIG_SCSI is not enabled: In file included from drivers/staging/rts_pstor/rtsx.h:45, from drivers/staging/rts_pstor/rtsx.c:28: include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defined include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB In file included from drivers/staging/rts_pstor/rtsx.h:45, from drivers/staging/rts_pstor/rtsx.c:28: include/scsi/scsi_cmnd.h: In function 'scsi_bidi_cmnd': include/scsi/scsi_cmnd.h:184: error: implicit declaration of function 'blk_bidi_rq' include/scsi/scsi_cmnd.h:185: error: dereferencing pointer to incomplete type include/scsi/scsi_cmnd.h: In function 'scsi_in': include/scsi/scsi_cmnd.h:191: error: dereferencing pointer to incomplete type include/scsi/scsi_cmnd.h: In function 'scsi_get_lba': CC drivers/gpu/drm/nouveau/nv04_tv.o include/scsi/scsi_cmnd.h:269: error: implicit declaration of function 'blk_rq_pos' In file included from drivers/staging/rts_pstor/rtsx.h:48, from drivers/staging/rts_pstor/rtsx.c:28: include/scsi/scsi_eh.h: At top level: include/scsi/scsi_eh.h:84: error: 'BLK_MAX_CDB' undeclared here (not in a function) drivers/staging/rts_pstor/rtsx.c: In function 'slave_configure': drivers/staging/rts_pstor/rtsx.c:107: error: implicit declaration of function 'blk_queue_dma_alignment' Signed-off-by: Randy Dunlap Cc: wei_wang@realsil.com.cn Signed-off-by: Greg Kroah-Hartman commit a5e3c2aae23a3719105c1ae662c67ef282f213db Merge: 6b28ff3 091b948 Author: David S. Miller Date: Mon Jan 31 13:24:56 2011 -0800 Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge commit 6b28ff3be829a851378551245fd6b3f9bf93b0ad Author: Yaniv Rosner Date: Mon Jan 31 04:22:57 2011 +0000 bnx2x: Update bnx2x version to 1.62.11-0 Update bnx2x version to 1.62.11-0 Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 02a23165f807901818c33acd0facc4ab8f3ebdf7 Author: Yaniv Rosner Date: Mon Jan 31 04:22:53 2011 +0000 bnx2x: Remove support for emulation/FPGA Remove unneeded support for emulation/FPGA from the code Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 1bef68e3f5d25e17adc5232dc0ad7c0ea0188374 Author: Yaniv Rosner Date: Mon Jan 31 04:22:46 2011 +0000 bnx2x: Add CMS functionality for 848x3 Add CMS(Common Mode Sense) functionality for 848x3 as this reduces power consumption and allows a better 10G link stability Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit c87bca1eaa493779392378b69fe646644580942a Author: Yaniv Rosner Date: Mon Jan 31 04:22:41 2011 +0000 bnx2x: Add support for new PHY BCM84833 Add support for new PHY BCM84833. This PHY is very similar to the BCM84823, only it has different register offset compared to the BCM84823, which needs to be handled correctly. Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit a8db5b4cbde619246cd3db9a59dac5d0757aff36 Author: Yaniv Rosner Date: Mon Jan 31 04:22:28 2011 +0000 bnx2x: Enhance SFP+ module control Add flexible support to control various SFP+ module features either throughout MDIO registers or GPIO pins according to NVRAM configuration Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 6d870c391ec0e4da4fd75df7e6aca7252162c408 Author: Yaniv Rosner Date: Mon Jan 31 04:22:20 2011 +0000 bnx2x: Add and change some net_dev messages Add and modify some net dev prints to improve error control Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 65a001bad18eb80f6f953e5e0601132f09bfe197 Author: Yaniv Rosner Date: Mon Jan 31 04:22:03 2011 +0000 bnx2x: Fix compilation warning messages Fix annoying compilation warning, mainly related to static declarations Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 2cf7acf98ef8327588e49bf74b7653ca4a063f09 Author: Yaniv Rosner Date: Mon Jan 31 04:21:55 2011 +0000 bnx2x: Set comments according to preferred Linux style This patch contains cosmetic changes only of restyling comments according to Linux coding standard, and add comment for get_emac_base function. Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit cd2be89b8ed7a50b781fae43a43f20d6ef1a137b Author: Yaniv Rosner Date: Mon Jan 31 04:21:45 2011 +0000 bnx2x: Rename CL45 macro This patch contains cosmetic changes only of renaming CL45_WR_OVER_CL22 macro to CL22_WR_OVER_CL45 as it should be. Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit cd88ccee1da3626d1c40dfcff8617b2c83271365 Author: Yaniv Rosner Date: Mon Jan 31 04:21:34 2011 +0000 bnx2x: Fix line indentation This patch contains cosmetic changes only to fix code alignment, and update copyright comment year Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit c52bf9b73ad1086fbf7f8b5fdd0acdc66637e80b Author: Wey-Yi Guy Date: Sat Jan 29 08:13:27 2011 -0800 iiwlagn: remove unused parameter sco_cmd is not being used, remove it Signed-off-by: Wey-Yi Guy commit 187bc4f6b2f81e1c8f6b1e9d5dee3e8e9018ebbf Author: Wey-Yi Guy Date: Thu Jan 27 13:01:33 2011 -0800 iwlagn: remove unsupported BT SCO command During the period of BT coex changes, REPLY_BT_COEX_SCO host command is no longer needed to support SCO/eSCO type of traffic. delete it. Signed-off-by: Wey-Yi Guy commit 96234cc84e0cce55421e981a865a4817db24ba4a Author: Wey-Yi Guy Date: Mon Jan 24 11:44:42 2011 -0800 iwlagn: use 2030 macro for 2030 devices For 2030 series of devices, 2030 macro need to be used. Signed-off-by: Wey-Yi Guy commit 241887a2d3b725fd0f87113bb7c4a51b5c6a2d06 Author: Johannes Berg Date: Wed Jan 19 11:11:22 2011 -0800 iwlwifi: fix beacon notification parsing The beacon notification changed between 4965 and agn because the embedded TX response changed, but iwlwifi was never updated to know about this. Update it now so the IBSS manager status will be tracked correctly. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 7b09068721b1a1bbba9372d0293c21d2425b14de Author: Johannes Berg Date: Wed Jan 19 02:53:54 2011 -0800 iwlwifi: use maximum aggregation size Use the values from the peer to set up the ucode for the right maximum number of subframes in an aggregate. Since the ucode only tracks this per station, use the minimum across all aggregation sessions with this peer. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 9b7688328422b88a7a15dc0dc123ad9ab1a6e22d Author: Johannes Berg Date: Wed Jan 19 02:54:18 2011 -0800 iwlwifi: advertise max aggregate size Allow peers to size their reorder buffer more accurately by advertising that we'll never send aggregates longer than the default (31). Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 274102a8a2a4a0b67c401b75a96694db76cfc701 Author: Johannes Berg Date: Tue Jan 18 04:44:03 2011 -0800 iwlwifi: support RSN IBSS In order to support RSN IBSS, we need to (ok actually maybe it's just easiest to) disable group key programming so that any group-addressed frames will be decrypted in software which handles the per-station keys for this easily. We could keep the encryption in the device, but that takes more work and seems unnecessary. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 9dc2153315650eae220898668b6aa56a25c130be Author: Wey-Yi Guy Date: Mon Jan 17 11:05:52 2011 -0800 iwlwifi: always support idle mode for agn devices For agn devices, always support idle mode which help power consumption in idle unassociated state. Signed-off-by: Wey-Yi Guy commit 52e6b85fe07ed1d2b5c76fd42ce1d77f1a190c72 Author: Wey-Yi Guy Date: Tue Jan 18 08:58:48 2011 -0800 iwlagn: add IQ inversion support for 2000 series devices The I/Q swapping is extremely important and should be dealt with extra care. It will affects OFDM and CCK differently. For 6000/6005/6030 series devices, the I/Q were swapped, and for 2000 series devices, it is in non-swapped status (but its swapped with respected to 6000/6005/6030). so the CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER register need to be set to support the correct behavior. Signed-off-by: Wey-Yi Guy commit 7fc11e9bbe3436e8110febf0da5c58bcb4342ede Author: Wey-Yi Guy Date: Sat Jan 15 09:16:59 2011 -0800 iwlagn: adjust rate table Minor adjustment for rate scale table Signed-off-by: Wey-Yi Guy commit 10480b056662dc9595850598f0bbc5a16a4884f4 Author: Wey-Yi Guy Date: Fri Jan 14 17:48:06 2011 -0800 iwlwifi: check ucode loading error and restart Driver check alive message from ucode, if it is not ok, then need to restart the loading process. instead of checking multiple places for failure, only need to check in once place when receive alive message from uCode. Signed-off-by: Wey-Yi Guy commit 5403c8a29521a6eb02f9283dbbe0184527f8f42b Merge: c79b9e4 c4c9310 Author: David S. Miller Date: Mon Jan 31 13:13:24 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit c79b9e4936142d5ed26073d58bdd4a5a0ac62f32 Merge: b8dad61 6a4ddef Author: David S. Miller Date: Mon Jan 31 12:31:24 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 78d12c237ca2e32ac6570b161d2137b5288c5511 Merge: 7c3ee9e b955fba Author: John W. Linville Date: Mon Jan 31 15:24:31 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/wl12xx/spi.c commit c0443df1b69b59675fc6790e0ddce87c8ca00abf Author: Arnaldo Carvalho de Melo Date: Mon Jan 31 18:19:33 2011 -0200 perf top: Introduce slang based TUI Disabled by default as there are features found in the stdio based one that aren't implemented, like live annotation, filtering knobs data entry. Annotation hopefully will get somehow merged with the 'perf annotate' code. To use it: perf top --tui Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 7c3ee9e3fd065e878a2dbaec9d417441c59799be Author: Luciano Coelho Date: Mon Jan 31 09:41:52 2011 +0200 wl12xx: fix warning due to missing arg in ampdu_action Commit 0b01f030d38e00650e2db42da083d8647aad40a5 added a new argument to the ampdu_action operation. The ampdu_action operation in the wl12xx driver currently doesn't have that argument and this generates a warning. This happened during merging of the latest mac80211 patches with the wl12xx BA patches. CC [M] drivers/net/wireless/wl12xx/main.o drivers/net/wireless/wl12xx/main.c:3035: warning: initialization from incompatible pointer type The wl12xx driver doesn't need to do anything about the buf_size argument since the AMPDU TX is fully handled by the firmware. Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 229ade9ba36341f7369ecb4f134bcec9133520bf Author: Arnaldo Carvalho de Melo Date: Mon Jan 31 18:08:39 2011 -0200 perf tools: Don't fallback to setup_pager unconditionally Because in tools like 'top' we don't want the pager. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8c7914dec29f39a6a8ca348a5eeace40a59be65d Author: Rajkumar Manoharan Date: Tue Feb 1 00:28:59 2011 +0530 mac80211: disable power save if an infra AP vif exists PS should not be enabled if an infra AP vif exists in the interface list. So while recalculating PS, AP vif type should be taken into account. Reviewed-by: Johannes Berg Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 5a3a0352f39c81dfa5c30a190ad04d115616c3e6 Author: Stanislaw Gruszka Date: Mon Jan 31 13:01:35 2011 +0100 iwlwifi: correct frequency settings After commit 59eb21a6504731fc16db4cf9463065dd61093e08 "cfg80211: Extend channel to frequency mapping for 802.11j" we use uninitialized sband->band when assign channel frequencies, what results that 5GHz channels have erroneous (zero) center_freq value. Patch fixes problem and simplifies code a bit. Signed-off-by: Stanislaw Gruszka Reviewed-by: Johannes Berg Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 0439f5367c8d8bb2ebaca8d7329f51f3148b2fb2 Author: Ivo van Doorn Date: Sun Jan 30 13:24:05 2011 +0100 rt2x00: Move TX/RX work into dedicated workqueue The TX/RX work structures must be able to run independently of other workqueues. This is because mac80211 might use the flush() callback function from various context, which depends on the TX/RX work to complete while the main thread is blocked (until the the TX queues are empty). This should reduce the number of 'Queue %d failed to flush' warnings. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit e1f4e808bb7a884d6563553c2c94cbdd901a16c7 Author: Ivo van Doorn Date: Sun Jan 30 13:23:42 2011 +0100 rt2x00: Kill all tasklets during device removal During device removal all pending work and tasklets must be guaranteed to be halted. So far only the txstatus_tasklet was killed. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit a0aff623ca8bc8779e6c3a394772d70d8a65dee9 Author: Gertjan van Wingerde Date: Sun Jan 30 13:23:22 2011 +0100 rt2x00: Fix FIXME comments in rt61pci and rt73usb on Michael MIC. Both rt61pci and rt73usb check the Michael MIC in hardware and strip the Michael MIC from received frames. This is perfectly allowed by mac80211 as long as this is properly reported to mac80211. Both these drivers reported the Michael MIC handling properly to mac80211, but still contained a FIXME comment on this, which is not needed to be handled, since mac80211 doesn't really need the Michael MIC in this case. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 10026f77b3555af13e43b8de0a91ad94cd2119d7 Author: Gertjan van Wingerde Date: Sun Jan 30 13:23:03 2011 +0100 rt2x00: Copy the MAC address to the WCID entry properly. Use the specific mac field of the wcid_entry structure to copy the MAC address to, instead of just overwriting the structure. Previous code resulted in the same, but this form is cleaner. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a45f369d477c0e1b15b77c7b09ccfa043097e9ab Author: Gertjan van Wingerde Date: Sun Jan 30 13:22:41 2011 +0100 rt2x00: Fix WPA TKIP Michael MIC failures. As reported and found by Johannes Stezenbach: rt2800{pci,usb} do not report the Michael MIC in RXed frames, but do check the Michael MIC in hardware. Therefore we have to report to mac80211 that the received frame does not include the Michael MIC. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 21957c31f6b388c7feaac59e56f765b5cc41377d Author: Johannes Stezenbach Date: Sun Jan 30 13:22:22 2011 +0100 rt2x00: trivial: add \n to WARNING message Acked-by: Gertjan van Wingerde Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f5a9987dfbe219ffc361ebf126e1797db4abbcfe Author: Mark Einon Date: Sun Jan 30 13:22:03 2011 +0100 Trivial typo fix in comment Fixing a trivial comment typo. Signed-off-by: Mark Einon Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f198f98ed3066e6a8a307748db73a27f19d75523 Author: Helmut Schaa Date: Sun Jan 30 13:21:41 2011 +0100 rt2x00: Update MAINTAINERS Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c6fcc0e5f72ef6ad61e1d58cf99e27661ee206e4 Author: RA-Jay Hung Date: Sun Jan 30 13:21:22 2011 +0100 rt2x00: Correct initial value of US_CYC_CNT register for pcie interface CLOCK CYCLE: Clock cycle count in 1us PCI:0x21, PCIE:0x7d, USB:0x1e Signed-off-by: RA-Jay Hung Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit b550911abc0db069bb157f9769ffb7cf22c6c868 Author: Helmut Schaa Date: Sun Jan 30 13:20:52 2011 +0100 rt2x00: Remove STATE_RADIO_IRQ_OFF_ISR and STATE_RADIO_IRQ_ON_ISR Remove STATE_RADIO_IRQ_OFF_ISR and STATE_RADIO_IRQ_ON_ISR as they are not used anymore. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit e88399bcdb71f2cdb195410151edf9c04980adbd Author: Helmut Schaa Date: Sun Jan 30 13:20:29 2011 +0100 rt2x00: Remove interrupt thread registration No driver uses interrupt threads anymore. Remove the remaining interrupt thread artifacts. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit bcf3cfd047d599cd0e6758c422bd7a4835c00d4a Author: Helmut Schaa Date: Sun Jan 30 13:20:05 2011 +0100 rt2x00: Convert rt2400pci interrupt handling to use tasklets Fix interrupt processing on slow machines by using individual tasklets for each different device interrupt. This ensures that while a RX or TX status tasklet is scheduled only the according device interrupt is masked and other interrupts such as TBTT can still be processed. Also, this allows us to use tasklet_hi_schedule for TBTT processing which is required to not send out beacons with a wrong DTIM count (due to delayed periodic beacon updates). Furthermore, this improves the latency between the TBTT and sending out buffered multi- and broadcast traffic. As a nice bonus, the interrupt handling overhead should be much lower. Compile-tested only. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 16222a0d06f5032d7e8bc7c65e8bf299e21f413a Author: Helmut Schaa Date: Sun Jan 30 13:19:37 2011 +0100 rt2x00: Convert rt2500pci interrupt handling to use tasklets Fix interrupt processing on slow machines by using individual tasklets for each different device interrupt. This ensures that while a RX or TX status tasklet is scheduled only the according device interrupt is masked and other interrupts such as TBTT can still be processed. Also, this allows us to use tasklet_hi_schedule for TBTT processing which is required to not send out beacons with a wrong DTIM count (due to delayed periodic beacon updates). Furthermore, this improves the latency between the TBTT and sending out buffered multi- and broadcast traffic. As a nice bonus, the interrupt handling overhead should be much lower. Compile-tested only. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5846a550b5838ea7fe8e280caff159a5ddb5c7e1 Author: Helmut Schaa Date: Sun Jan 30 13:19:08 2011 +0100 rt2x00: Convert rt61pci to use tasklets Fix interrupt processing on slow machines by using individual tasklets for each different device interrupt. This ensures that while a RX or TX status tasklet is scheduled only the according device interrupt is masked and other interrupts such as TBTT can still be processed. Also, this allows us to use tasklet_hi_schedule for TBTT processing which is required to not send out beacons with a wrong DTIM count (due to delayed periodic beacon updates). Furthermore, this improves the latency between the TBTT and sending out buffered multi- and broadcast traffic. As a nice bonus, the interrupt handling overhead should be much lower. Compile-tested only. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a9d61e9e779579c66c0d4c8af203d51dbca1473c Author: Helmut Schaa Date: Sun Jan 30 13:18:38 2011 +0100 rt2x00: Convert rt2800pci to use tasklets Fix interrupt processing on slow machines by using individual tasklets for each different device interrupt. This ensures that while a RX or TX status tasklet is scheduled only the according device interrupt is masked and other interrupts such as TBTT can still be processed. Also, this allows us to use tasklet_hi_schedule for TBTT and PRETBTT processing which is required to not send out beacons with a wrong DTIM count (due to delayed periodic beacon updates). Furthermore, this improves the latency between the TBTT and sending out buffered multi- and broadcast traffic. As a nice bonus, the interrupt handling overhead is reduced such that rt2800pci gains around 25% more throuhput on a rt3052 MIPS board. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c8e15a1e2c93880160f31ed2e6b02c1322f7f48d Author: Helmut Schaa Date: Sun Jan 30 13:18:13 2011 +0100 rt2x00: Disable txstatus tasklet by default Enable the txstatus tasklet when interrupts are enabled and disable it together with the interrupts. Also make the txstatus tasklet useful even without the tx status FIFO and make use of the generic rt2x00 tasklet initialization macro. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c5c65761839e3d85cc620cc1c85db8d4a7173f53 Author: Helmut Schaa Date: Sun Jan 30 13:17:52 2011 +0100 rt2x00: Introduce tasklets for interrupt handling No functional changes, just preparation for moving interrupt handling to tasklets. The tasklets are disabled by default. Drivers making use of them need to enable the tasklets when the device state is set to IRQ_ON. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8d59c4e993427df37fb8bfc3470c298194a68e7a Author: Helmut Schaa Date: Sun Jan 30 13:17:29 2011 +0100 rt2x00: Make periodic beacon updates for PCI devices atomic Allow the beacondone and pretbtt functions to update the beacon from atomic context by using the beacon update functions with caller locking. This is a preparation for moving the periodic beacon handling into tasklets that require atomic context. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 1dae8d342e842cb9971f44d7b68580c7b9f26174 Author: Helmut Schaa Date: Sun Jan 30 13:16:52 2011 +0100 rt2x00: Limit beacon updates in bss_info_changed to USB devices Currently there are two places that trigger a beacon update on PCI devices. The bss_info_changed callback and the periodic update triggered by the TBTT or PRETBTT interrupt. Since the next TBTT or PRETBTT interrupt will periodically fetch an updated beacon remove the update_beacon call in the bss_info_changed callback for PCI devices. In the worst case it will take one beacon interval longer to fetch the new beacon then before. For devices that have a PRETBTT interrupt there should be no change at all. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8414ff07ac8802e282683812514ef5b0ea133cb8 Author: Helmut Schaa Date: Sun Jan 30 13:16:28 2011 +0100 rt2x00: Introduce beacon_update_locked that requires caller locking Introduce a beacon_update_locked function that does not acquire the according beacon mutex to allow beacon updates from atomic context. The caller has to take care of synchronization. No functional changes. Just preparation for beacon updates from tasklet context. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 69cf36a4523be026bc16743c5c989c5e82edb7d9 Author: Helmut Schaa Date: Sun Jan 30 13:16:03 2011 +0100 rt2x00: Refactor beacon code to make use of start- and stop_queue This patch allows to dynamically remove beaconing interfaces without shutting beaconing down on all interfaces. The only place to start and stop beaconing are now the start- and stop_queue callbacks. Hence, we can remove some register writes during interface bring up (config_intf) and only write the correct sync mode to the register there. When multiple beaconing interfaces are present we should enable beaconing as soon as mac80211 enables beaconing on at least one of them. The beacon queue gets stopped when the last beaconing interface was stopped by mac80211. Therefore, introduce another interface counter to keep track ot the number of enabled beaconing interfaces and start or stop the beacon queue accordingly. To allow single interfaces to stop beaconing, add a new driver callback clear_beacon to clear a single interface's beacon without affecting the other interfaces. Don't overload the clear_entry callback for clearing beacons as that would introduce additional overhead (check for each TX queue) into the clear_entry callback which is used on the drivers TX/RX hotpaths. Furthermore, the write beacon callback doesn't need to enable beaconing anymore but since beaconing should be disabled while a new beacon is written or cleared we still disable beacon generation and enable it afterwards again in the driver specific callbacks. However, beacon related interrupts should not be disabled/enabled here, that's solely done from the start- and stop queue callbacks. It would be nice to stop the beacon queue just before the beacon update and enable it afterwards in rt2x00queue itself instead of the current implementation that relies on the driver doing the right thing. However, since start- and stop_queue are mutex protected we cannot use them for atomic beacon updates. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit d828cd5a95e532636dbc495e4b94b625ab9abdad Author: Stanislaw Gruszka Date: Fri Jan 28 16:47:49 2011 +0100 iwl3945: do not use agn specific IWL_RATE_COUNT Only use IWL_RATE_COUNT_3945 in 3945 code. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit b955fba29b2082bba8cb94a959a8ec0a375aec8f Author: Mohammed Shafi Shajakhan Date: Mon Jan 31 13:25:29 2011 +0530 ath9k: Fix memory leak due to failed PAPRD frames free the skb's when the Tx of PAPRD frames fails and also add a debug message indicating that. Signed-off-by: Mohammed Shafi Shajakhan Cc: stable@kernel.org Signed-off-by: John W. Linville commit e2830b5c1b2b2217894370a3b95af87d4a958401 Author: Torben Hohn Date: Thu Jan 27 16:00:32 2011 +0100 time: Make do_timer() and xtime_lock local to kernel/time/ All callers of do_timer() are converted to xtime_update(). The only users of xtime_lock are in kernel/time/. Make both local to kernel/time/ and remove them from the global header files. [ tglx: Reuse tick-internal.h instead of creating another local header file. Massaged changelog ] Signed-off-by: Torben Hohn Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: yong.zhang0@gmail.com Cc: hch@infradead.org Signed-off-by: Thomas Gleixner commit eff9073790e1286aa12bf1c65814d3e0132b12e1 Author: Tejun Heo Date: Mon Jan 31 16:59:05 2011 +0100 x86: Rename incorrectly named parameter of numa_cpu_node() numa_cpu_node() prototype in numa_32.h has wrongly named parameter @apicid when it actually takes the CPU number. Change it to @cpu. Reported-by: Yinghai Lu Signed-off-by: Tejun Heo LKML-Reference: <20110131155905.GM7459@htj.dyndns.org> Signed-off-by: Ingo Molnar commit 8c3e10eb1968877d6a1957b7e790c6ce01bd56fc Author: Arnaldo Carvalho de Melo Date: Mon Jan 31 14:50:39 2011 -0200 perf top: Move display agnostic routines to util/top.[ch] Paving the way for a slang browser a la 'perf report --tui'. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit c8059930f0aafb77d94d268dfb4fceaa15cd2ad9 Author: Mark Brown Date: Mon Jan 31 13:41:17 2011 +0000 ASoC: Accept any logical value WM8903 GPIO set() Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d71bb810be602b7194d0dc336854e2f4a3d44492 Author: Mark Brown Date: Mon Jan 31 13:41:03 2011 +0000 ASoC: Accept any logical value for WM8962 GPIO set() Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 4e8d76373c9fd7a1c1b401fc97ba01c0ecbb888f Author: Russell King Date: Fri Jan 28 21:00:39 2011 +0000 ARM: footbridge: convert to clockevents/clocksource The Footbridge platforms have some reasonable timers in the host bridge, which we use for most footbridge-based platforms. However, NetWinder's clock these using a spread-spectrum clock which makes them too unstable for time keeping. So we have to rely on the PIT. Convert both Footbridge timers and PIT timers to use the clocksource and clockevent infrastructure. Tested on Netwinder. Signed-off-by: Russell King commit cf28a673666fba5770b40fb084584391f451c07d Author: Alan Ott Date: Wed Jan 26 22:25:18 2011 -0500 HID: hidraw: Replace Confusing += Operator with = Setting of the return value of hidraw_read() uses the += operator when = is more appropriate. There is no case where ret can be anything other than zero when the assignment is made, making = equivalent to += and much more clear. Signed-off-by: Alan Ott Signed-off-by: Jiri Kosina commit 7e2ed097538c57ff5268e9a6bced7c0b885809c8 Author: Arnaldo Carvalho de Melo Date: Sun Jan 30 11:59:43 2011 -0200 perf evlist: Store pointer to the cpu and thread maps So that we don't have to pass it around to the several methods that needs it, simplifying usage. There is one case where we don't have the thread/cpu map in advance, which is in the parsing routines used by top, stat, record, that we have to wait till all options are parsed to know if a cpu or thread list was passed to then create those maps. For that case consolidate the cpu and thread map creation via perf_evlist__create_maps() out of the code in top and record, while also providing a perf_evlist__set_maps() for cases where multiple evlists share maps or for when maps that represent CPU sockets, for instance, get crafted out of topology information or subsets of threads in a particular application are to be monitored, providing more granularity in specifying which cpus and threads to monitor. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 4dfcced8a1f42248f9e7a461485f6aa5f66d2105 Author: Benjamin Tissoires Date: Mon Jan 31 11:28:22 2011 +0100 HID: hid-multitouch: introduce IrTouch Infrared USB device This patch adds support for IrTouch 42 inches. Tested-by: Victor Zhuk Signed-off-by: Benjamin Tissoires Reviewed-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit ef2fafb3e233ca9cb390fc3c1461b7f3859998fc Author: Benjamin Tissoires Date: Mon Jan 31 11:28:21 2011 +0100 HID: hid-multitouch: add Benjamin Tissoires as module_author Signed-off-by: Benjamin Tissoires Signed-off-by: Jiri Kosina commit 1e9cf35b995610e7ba2934d3dc92e3a03fa361a1 Author: Benjamin Tissoires Date: Mon Jan 31 11:28:20 2011 +0100 HID: hid-multitouch: Rename MT_CLS_DUAL1 and MT_CLS_DUAL2 This patch renames MT_CLS_DUAL1 to MT_CLS_DUAL_INRANGE_CONTACTID and MT_CLS_DUAL2 to MT_CLS_DUAL_INRANGE_CONTACTNUMBER for better readability. Signed-off-by: Benjamin Tissoires Reviewed-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit b79b36be56da0ba61fa10a3fa96939c3a3eb499a Author: Benjamin Tissoires Date: Mon Jan 31 11:28:19 2011 +0100 HID: hid-multitouch: change default mt_class The safest quirk for a device (the one that works out of the box for most of them) is MT_QUIRK_NOT_SEEN_MEANS_UP. Indeed, it does not make any assumption on the device. When adding a new device, we can easily test it against MT_CLS_DEFAULT, and then optimize it with other quirks: that's why no device use MT_CLS_DEFAULT right now. Signed-off-by: Benjamin Tissoires Reviewed-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit 51563cd53c4b1c1790fccd2e0af0e2b756589af9 Merge: d123375 8161239 Author: Thomas Gleixner Date: Mon Jan 31 15:08:43 2011 +0100 Merge branch 'tip/rtmutex' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into core/locking *git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace tip/rtmutex: rtmutex: Simplify PI algorithm and make highest prio task get lock commit 091b948306d2628320e77977eb7ae4a757b12180 Author: Sven Eckelmann Date: Thu Jan 27 10:56:56 2011 +0100 batman-adv: Merge README of v2011.0.0 release Signed-off-by: Sven Eckelmann commit 64afe35398269577ef9809474dd7dc0e5d265176 Author: Sven Eckelmann Date: Thu Jan 27 10:38:15 2011 +0100 batman-adv: Update copyright years Signed-off-by: Sven Eckelmann commit 1299bdaa1cb522de940d912f661bef59b9a39dd7 Author: Sven Eckelmann Date: Thu Jan 27 13:48:54 2011 +0100 batman-adv: Remove unused variables Signed-off-by: Sven Eckelmann commit fb86d7648ffdfc8778db2cd70d4bc5c6093e04c5 Author: Sven Eckelmann Date: Thu Jan 27 13:16:08 2011 +0100 batman-adv: Remove declaration of batman_skb_recv batman_skb_recv can be defined in hard-interface.c as static because it is never used outside of that file. Signed-off-by: Sven Eckelmann commit 335f94c981248e9f326986e0ac8d31f187ffeed0 Author: Sven Eckelmann Date: Thu Jan 27 13:12:04 2011 +0100 batman-adv: Remove unused definitions Signed-off-by: Sven Eckelmann commit 633979b43f23d776f6fb757f0f3d6d8089ab57b1 Author: Sven Eckelmann Date: Thu Jan 27 13:10:23 2011 +0100 batman-adv: Remove dangling declaration of hash_remove_element Signed-off-by: Sven Eckelmann commit 74ef115359f5beb565baddfb250f264d9177c108 Author: Simon Wunderlich Date: Wed Dec 29 16:15:19 2010 +0000 batman-adv: remove unused parameters Some function parameters are obsolete now and can be removed. Reported-by: Sven Eckelmann Signed-off-by: Simon Wunderlich Signed-off-by: Sven Eckelmann commit ae361ce19fa135035c6b83ac1f07090b72fd4b8f Author: Sven Eckelmann Date: Tue Jan 25 22:02:31 2011 +0000 batman-adv: Calculate correct size for merged packets The routing algorithm must be able to decide if a fragment can be merged with the missing part and still be passed to a forwarding interface. The fragments can only differ by one byte in case that the original payload had an uneven length. In that situation the sender has to inform all possible receivers that the tail is one byte longer using the flag UNI_FRAG_LARGETAIL. The combination of UNI_FRAG_LARGETAIL and UNI_FRAG_HEAD flag makes it possible to calculate the correct length for even and uneven sized payloads. The original formula missed to add the unicast header at all and forgot to remove the fragment header of the second fragment. This made the results highly unreliable and only useful for machines with large differences between the configured MTUs. Reported-by: Russell Senior Reported-by: Marek Lindner Signed-off-by: Sven Eckelmann commit 5c77d8bb8aeb4ec6804b6c32061109ba2ea6988d Author: Sven Eckelmann Date: Tue Jan 25 21:59:26 2011 +0000 batman-adv: Create roughly equal sized fragments The routing algorithm must know how large two fragments are to be able to decide that it is safe to merge them or if it should resubmit without waiting for the second part. When these two fragments have a too different size, it is not possible to guess right in every situation. The user could easily configure the MTU of the attached cards so that one fragment is forwarded and the other one is added to the fragments table to wait for the missing part. For even sized packets, it is possible to split it so that the resulting packages are equal sized by ignoring the old non-fragment header at the beginning of the original packet. This still creates different sized fragments for uneven sized packets. Reported-by: Russell Senior Reported-by: Marek Lindner Signed-off-by: Sven Eckelmann commit d12b0e24c56c6fb2398609f26858e5278d688840 Author: Torben Hohn Date: Thu Jan 27 16:00:27 2011 +0100 xtensa: Switch do_timer() to xtime_update() xtime_update() takes the xtime_lock itself. set_linux_timer() does not need to be protected by xtime_lock. [ tglx: This code is broken on SMP anyway. ] Signed-off-by: Torben Hohn Cc: Chris Zankel Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127150027.23248.61798.stgit@localhost> Signed-off-by: Thomas Gleixner commit 4ea1b72551d052a3993ef72ce06ecf5bdd125859 Author: Torben Hohn Date: Thu Jan 27 16:00:22 2011 +0100 sparc: Switch do_timer() to xtime_update() xtime_update() takes the xtime_lock itself. pcic_clear_clock_irq() and clear_clock_irq do not need to be protected by xtime_lock. Signed-off-by: Torben Hohn Acked-by: David S. Miller Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127150022.23248.80369.stgit@localhost> Signed-off-by: Thomas Gleixner commit bb1dfc1cf6c51ca42f7c05029a6f06df9092a0fc Author: Torben Hohn Date: Thu Jan 27 16:00:17 2011 +0100 parisc: Switch do_timer() to xtime_update() xtime_update() takes the xtime_lock itself. Signed-off-by: Torben Hohn Cc: hch@infradead.org Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: Helge Deller Cc: "James E.J. Bottomley" Cc: Kyle McMartin Cc: yong.zhang0@gmail.com LKML-Reference: <20110127150017.23248.22559.stgit@localhost> Signed-off-by: Thomas Gleixner commit e53f276beb655c711a5d1f25f800b61aa976e34f Author: Torben Hohn Date: Thu Jan 27 16:00:06 2011 +0100 m68k: Switch do_timer() to xtime_update() xtime_update() properly takes the xtime_lock Signed-off-by: Torben Hohn Cc: Sam Creasey Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: Roman Zippel Cc: hch@infradead.org Cc: yong.zhang0@gmail.com Cc: Geert Uytterhoeven Cc: Greg Ungerer LKML-Reference: <20110127150006.23248.71790.stgit@localhost> Signed-off-by: Thomas Gleixner commit 7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e Author: Torben Hohn Date: Thu Jan 27 16:00:01 2011 +0100 m32r: Switch from do_timer() to xtime_update() xtime_update() does proper locking. Signed-off-by: Torben Hohn Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: Hirokazu Takata Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127150001.23248.68620.stgit@localhost> Signed-off-by: Thomas Gleixner commit 1aabd67d2e97e6affdf5a7c65f442ac91ace3f85 Author: Torben Hohn Date: Thu Jan 27 15:59:56 2011 +0100 ia64: Switch do_timer() to xtime_update() local_cpu_data->itm_next = new_itm; does not need to be protected by xtime_lock. xtime_update() takes the lock itself. Signed-off-by: Torben Hohn Cc: Fenghua Yu Cc: Tony Luck Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145956.23248.49107.stgit@localhost> Signed-off-by: Thomas Gleixner commit daad8b581e7f5e21a2f79e49d57d4f6a73b26510 Author: Torben Hohn Date: Thu Jan 27 15:59:51 2011 +0100 h8300: Switch do_timer() to xtime_update() xtime_update() takes the xtime_lock itself. Signed-off-by: Torben Hohn Cc: Yoshinori Sato Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145951.23248.92727.stgit@localhost> Signed-off-by: Thomas Gleixner commit 57464bd87f708e75b47312766e3fc8dc3aaf66ad Author: Torben Hohn Date: Thu Jan 27 15:59:46 2011 +0100 frv: Switch do_timer() to xtime_update() __set_LEDS() does not need to be protected by xtime_lock. its used unprotected in other places. [ tglx: Removed stale comment ] Signed-off-by: Torben Hohn Cc: hch@infradead.org Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: David Howells Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145946.23248.57952.stgit@localhost> Signed-off-by: Thomas Gleixner commit 36cb07bb8118cb14211ef25c58026f005877c47d Author: Torben Hohn Date: Thu Jan 27 15:59:41 2011 +0100 cris: arch-v32: Switch do_timer() to xtime_update() xtime_update() takes the xtime_lock itself. Signed-off-by: Torben Hohn Cc: hch@infradead.org Cc: Jesper Nilsson Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: Mikael Starvik Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145941.23248.92547.stgit@localhost> Signed-off-by: Thomas Gleixner commit 17588b99183ece563013622afeefd37eb8e68fd3 Author: Torben Hohn Date: Thu Jan 27 15:59:36 2011 +0100 cris: arch-v10: Switch do_timer() to xtime_update() This code failed to take the xtime_lock, which must be held when calling do_timer(). Use the safe version xtime_update() Signed-off-by: Torben Hohn Cc: hch@infradead.org Cc: Jesper Nilsson Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: Mikael Starvik Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145936.23248.16192.stgit@localhost> Signed-off-by: Thomas Gleixner commit 4196b892d55caaf2c98da05e80472ca482ca19fe Author: Torben Hohn Date: Thu Jan 27 15:59:31 2011 +0100 blackfin: Switch from do_timer() to xtime_update() xtime_update() takes the xtime_lock itself. Signed-off-by: Torben Hohn Cc: Mike Frysinger Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145931.23248.33917.stgit@localhost> Signed-off-by: Thomas Gleixner commit ec2dff2febf19ff2109c2eb3e56d5a969fe399e2 Author: Torben Hohn Date: Thu Jan 27 15:59:26 2011 +0100 arm/mach-clps711x: Switch do_timer() to xtime_update() do_timer() requires holding the xtime_lock, which this code did not do. Use the safe version xtime_update() Signed-off-by: Torben Hohn Cc: Russell King Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145926.23248.56369.stgit@localhost> Signed-off-by: Thomas Gleixner commit 6906e33cc555c390cd091f6f363b783322dfedf6 Author: Torben Hohn Date: Thu Jan 27 15:59:21 2011 +0100 arm: Switch from do_timer() to xtime_update() xtime_update takes the xtime_lock itself. Signed-off-by: Torben Hohn Cc: Russell King Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145920.23248.75541.stgit@localhost> Signed-off-by: Thomas Gleixner commit 1340f3e0b29b745a33f431455c3a37f48197bc81 Author: Torben Hohn Date: Thu Jan 27 15:59:15 2011 +0100 alpha: Change do_timer() to xtime_update() xtime_update() takes the xtime_lock itself. timer_interrupt() is only called on the boot cpu. See do_entInt(). So "state" in timer_interrupt does not require protection by xtime_lock. Signed-off-by: Torben Hohn Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145915.23248.20919.stgit@localhost> Signed-off-by: Thomas Gleixner commit f0af911a9dec9de702645182c8d269449e24d24b Author: Torben Hohn Date: Thu Jan 27 15:59:10 2011 +0100 time: Provide xtime_update() xtime_update() takes xtime_lock write locked and calls do_timer(). Provided to replace the do_timer() calls in the architecture code. Signed-off-by: Torben Hohn Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: yong.zhang0@gmail.com Cc: hch@infradead.org LKML-Reference: <20110127145910.23248.21379.stgit@localhost> Signed-off-by: Thomas Gleixner commit 79ecaf0d15344d78904becf0f25de3fc9b49d430 Author: Thomas Gleixner Date: Mon Jan 31 11:07:54 2011 +0100 time: Remove unused __get_wall_to_monotonic() No users left. Remove it. Signed-off-by: Thomas Gleixner commit 48cf76f7104f655bbd48a75c7759dce82c3e1ab6 Author: Torben Hohn Date: Thu Jan 27 15:59:05 2011 +0100 time: Provide get_xtime_and_monotonic_offset() The hrtimer code accesses timekeeping variables under xtime_lock. Provide a sensible accessor function and use it. [ tglx: Removed the conditionals, unused variable, fixed codingstyle and massaged changelog ] Signed-off-by: Torben Hohn Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: yong.zhang0@gmail.com Cc: hch@infradead.org LKML-Reference: <20110127145905.23248.30458.stgit@localhost> Signed-off-by: Thomas Gleixner commit fbad1ea94159a71bc0f68b00e57ae803606af9fb Author: Torben Hohn Date: Thu Jan 27 15:59:00 2011 +0100 time: Move get_jiffies_64 to kernel/time/jiffies.c Move the jiffies access functions to the jiffies clocksource code. [ tglx: Add missing include ] Signed-off-by: Torben Hohn Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: yong.zhang0@gmail.com Cc: hch@infradead.org LKML-Reference: <20110127145900.23248.73352.stgit@localhost> Signed-off-by: Thomas Gleixner commit 871cf1e5f2a17702f58539a3af8b18fc8666ad4c Author: Torben Hohn Date: Thu Jan 27 15:58:55 2011 +0100 time: Move do_timer() to kernel/time/timekeeping.c do_timer() is primary timekeeping related. calc_global_load() is called from do_timer() as well, but that's more for historical reasons. [ tglx: Fixed up the calc_global_load() reject andmassaged changelog ] Signed-off-by: Torben Hohn Cc: Peter Zijlstra Cc: johnstul@us.ibm.com Cc: yong.zhang0@gmail.com Cc: hch@infradead.org LKML-Reference: <20110127145855.23248.56933.stgit@localhost> Signed-off-by: Thomas Gleixner commit 6501f728c56f831626d52b236023e556bca37f51 Author: Vasily Khoruzhick Date: Fri Jan 7 18:28:17 2011 +0200 power_supply: Add new LED trigger charging-blink-solid-full Add new trigger to power_supply LEDs. It will blink when battery is charging, and stay solid when battery is charged. It's usefull to indicate battery state when there's only one LED available. Signed-off-by: Vasily Khoruzhick Signed-off-by: Anton Vorontsov commit c800587f658d787a1e92385fdde0e3b5e0856f37 Author: H Hartley Sweeten Date: Fri Jan 28 12:00:18 2011 -0700 ASoC: neo1973_wm8753 audio support does not require scoop This driver does not use any of the functionality provided by the scoop hardware. Remove the unneeded header. Signed-off-by: H Hartley Sweeten Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0b9536c957095eb1497828aa51b34ac695f67eae Author: Vasily Khoruzhick Date: Fri Jan 7 16:28:16 2011 +0000 leds: Add ability to blink via simple trigger As blink API is now available, it's possible to add ability to blink via simple trigger. Signed-off-by: Vasily Khoruzhick Signed-off-by: Anton Vorontsov commit 51d07566045787b99219d809639c8724506fc78a Author: Rhyland Klein Date: Tue Jan 25 11:10:06 2011 -0800 bq20z75: Add support for charge properties Adding support for charge properties for gas gauge. Also ensuring that battery mode is correct now for energy as well as charge properties by setting it on the fly. I also added 2 functions to power_supply.h to help identify the units for specific properties more easily by power supplies. Signed-off-by: Rhyland Klein Signed-off-by: Anton Vorontsov commit 713dce4e0b3dfd9d2d159d2fc6ec191916279bc5 Author: Stephen Warren Date: Fri Jan 28 14:26:41 2011 -0700 ASoC: Tegra: I2S: Use dev_err not pr_err Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d64e57cef0436833cfc9620e350ec6f5b041c9a9 Author: Stephen Warren Date: Fri Jan 28 14:26:40 2011 -0700 ASoC: Tegra: utils: Don't use global variables Instead, have the machine driver provide storage for the utility data somehow. For Harmony in particular, store this within struct tegra_harmony, itself referenced by snd_soc_card's drvdata. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c244d477b7a5e0060b05d6ef90b7b29ef72a2188 Author: Stephen Warren Date: Fri Jan 28 14:26:39 2011 -0700 ASoC: Tegra: Harmony: Use dev_err not pr_err Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit bc72fe0c0e90b1ff9c12037321626aa5a4b061c3 Author: Stephen Warren Date: Fri Jan 28 14:26:38 2011 -0700 ASoC: Tegra: Harmony: Fix indentation issue. Indent with TABs not spaces. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6e267645046ecc161791b5a0d2eef6e494681416 Author: Stephen Warren Date: Fri Jan 28 14:26:37 2011 -0700 ASoC: Tegra: Harmony: Support the internal speaker Add DAPM widget definitions for the internal speaker paths. Currently, this path is always enabled while playback is active. Add code to control the speaker amplifier GPIO. The GPIO is requested during _init, since that's the first time it is guaranteed that the WM8903 module is loaded, probed, and hence has exported its GPIO chip. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 72de2b1a9a5b869c1eaea098dd2a75e6bbbf0488 Author: Stephen Warren Date: Fri Jan 28 14:26:36 2011 -0700 ASoC: Tegra: Harmony: Don't use soc-audio platform device Previously, snd-soc-tegra-harmony internally instantiated a platform device object whenever the module was loaded. Instead, switch to a more typical model where arch/arm/mach-tegra defines a platform device, and snd-soc-tegra-harmony acts as a driver for such a platform device. Define a new struct tegra_harmony to store driver data in the future. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 111c6419ffeef0ef225dfdd2c8b7b03cc6bb228e Author: Stephen Warren Date: Fri Jan 28 14:26:35 2011 -0700 ASoC: Move card list initialization to snd_soc_register_card All ASoC cards need snd_soc_initialize_card_lists called. Previously, it was only called for cards backed by a "soc-audio" platform device, via soc_probe(). However, it's also needed for cards backed by other platform devices, and registered directly via snd_soc_register_card(). Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d316553a0cb4569a9b6260e870cab8b9c102eace Author: Harsha Priya Date: Fri Jan 28 22:28:32 2011 +0530 ASoC: mid-x86: Add support for capture in machine driver This configures the capture unused pins Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a7bffdf7d885197857bb04919344dc17ffaf79b9 Author: Harsha Priya Date: Fri Jan 28 22:27:26 2011 +0530 ASoC: sst_platform: add support for capture stream on headset dai Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fd94eeef06ed4abc08f58e42f46341d0bc4f7793 Author: Harsha Priya Date: Fri Jan 28 22:26:53 2011 +0530 ASoC: sn95031: add capture support This patch adds the support for capture path in sn95031 codec. This codec supports upto 6DMICs, 2 AMICs and Linein. The linein and AMICs are connected through a MUX to ADC. The TX paths can be assigned to any of the ADCs or DMICs. Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit edae38a6431276c50d4b51543c36de258722358e Author: Steven Whitehouse Date: Mon Jan 31 09:38:12 2011 +0000 GFS2: Fix glock queue trace point Somehow this tracepoint landed up in the wrong place. This moves it to where it should be. Signed-off-by: Steven Whitehouse commit bf9f6c8fcd390a349be2e57f813c0b54fb0d0578 Merge: 4404117 53cdd30 Author: Sascha Hauer Date: Mon Jan 31 09:23:41 2011 +0100 Merge branch 'imx-board-ifdefs' into imx-for-2.6.39 commit 1fb0ef31f428f345a7c3666f8e7444a563edd537 Author: Thomas Gleixner Date: Mon Jan 31 08:57:41 2011 +0100 genirq: Fix affinity notifier fallout The new code of commit cd7eab44e(genirq: Add IRQ affinity notifiers) references irq_desc.affinity which fails to compile with CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED=y. Use irq_desc.irq_data.affinity instead. Signed-off-by: Thomas Gleixner Cc: Ben Hutchings commit 0c842b551063c5f7382ac9b457992f3b34972801 Author: Rabin Vincent Date: Tue Jan 25 11:18:35 2011 +0100 dma40: cyclic xfer support Support cyclic transfers, which are useful for ALSA drivers. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 86eb5fb61125e4646c9447a1f2ce130817dab34e Author: Rabin Vincent Date: Tue Jan 25 11:18:34 2011 +0100 dma40: stop ongoing transfers in DMA_TERMINATE_ALL The current implementation of DMA_TERMINATE_ALL leaves ongoing transfers running. Fix it. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 7ad74a7cf6f6355fd3f4c15afe63460fc4ec3f57 Author: Rabin Vincent Date: Tue Jan 25 11:18:33 2011 +0100 dma40: fix DMA_SG capability and channels The DMA_SG cap is enabled on the wrong channel, and the pointers are repeatedly set incorrectly. Fix it and combine the ops settings to a common function. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 6045f0bb2818393a44e835454db96709cb5b3d80 Author: Rabin Vincent Date: Tue Jan 25 11:18:32 2011 +0100 dma40: handle failure to allocate first LCLA Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit e65889c75ccb5b64dfb60f32e2d9448446cabcc7 Author: Rabin Vincent Date: Tue Jan 25 11:18:31 2011 +0100 dma40: extract lcla code into separate function Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 7f933bed96e9872131014ea2bdd5b012e43fc316 Author: Rabin Vincent Date: Tue Jan 25 11:18:30 2011 +0100 dma40: use flags to reduce parameter count Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 1f7622ca55b1f5875e32140b4781759f800aded3 Author: Rabin Vincent Date: Tue Jan 25 11:18:29 2011 +0100 dma40: make d40_log_buf_to_lli static Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 822c567639971628ceba2c53531670d595e3164d Author: Rabin Vincent Date: Tue Jan 25 11:18:28 2011 +0100 dma40: unify src/dst addr check Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit cc31b6f7949efd46c5f13d0758cf7b0bcb71fae2 Author: Rabin Vincent Date: Tue Jan 25 11:18:27 2011 +0100 dma40: pass the info pointer all the way to reduce argument count Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 5ed04b8575cb22920b1333aeb55121339449048f Author: Rabin Vincent Date: Tue Jan 25 11:18:26 2011 +0100 dma40: unify d40_log_sg_to_lli funcs for mem and slave Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit e24b36bdf873b4a64545fd66da13877214d235cf Author: Rabin Vincent Date: Tue Jan 25 11:18:25 2011 +0100 dma40: combine duplicated code in log_sg_to_dev Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 1c4b0927feab41346b0be971e0287aaf46eba8e0 Author: Rabin Vincent Date: Tue Jan 25 11:18:24 2011 +0100 dma40: move lli_load to main source file These register writes are better placed in the main source file rather than ll.c. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit cade1d30b2e071a687011c2a38c03ed7187ec501 Author: Rabin Vincent Date: Tue Jan 25 11:18:23 2011 +0100 dma40: combine mem and slave prep_sg functions Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 10a946b3a4e1ad665a81981cbe33c3d3903cd7da Author: Rabin Vincent Date: Tue Jan 25 11:18:22 2011 +0100 dma40: remove export of stedma40_memcpy_sg The dmaengine framework has the API for this now. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 3e3a0763e78b520dac5fde569c42664863336d94 Author: Rabin Vincent Date: Tue Jan 25 11:18:21 2011 +0100 dma40: combine mem and slave sg-to-lli functions Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 00ac0341486ffe212f45ff1fe0780d12a36fffde Author: Rabin Vincent Date: Tue Jan 25 11:18:20 2011 +0100 dma40: remove duplicated dev addr code Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit dbd887880320b6a56811bb38ff4ad888728c3a91 Author: Rabin Vincent Date: Tue Jan 25 11:18:19 2011 +0100 dma40: combine duplicated d40_pool_lli_alloc() calls Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 5f81158f90db4bc8a79e91736aa3afce8e590e46 Author: Rabin Vincent Date: Tue Jan 25 11:18:18 2011 +0100 dma40: combine desc init functions The desc init code can be shared between the mem and slave prep routines. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 95944c6ef5b5214508273992416adb836b63c73f Author: Rabin Vincent Date: Tue Jan 25 11:18:17 2011 +0100 dma40: implement prep_memcpy as a wrapper around memcpy_sg To simplify the code. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit d924abad7fa9a78d70b20552bf27fe4f7a19a2fb Author: Rabin Vincent Date: Tue Jan 25 11:18:16 2011 +0100 dma40: remove unnecessary casts Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit b00f938c8cf5ba8e7a692519548a256aa3ea1203 Author: Rabin Vincent Date: Tue Jan 25 11:18:15 2011 +0100 dma40: fix DMA API usage for LLIs Map and unmap the LLIs and use dma_sync_single_for_device() appropriately instead of mapping and never unmapping them. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 026cbc424a162e495ad29e91d354fb8fc2da2657 Author: Rabin Vincent Date: Tue Jan 25 11:18:14 2011 +0100 dma40: fix DMA API usage for LCLA Map the buffer once and use dma_sync*() appropriately instead of mapping the buffer over and over without unmapping it. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 7fe8be5a74eb058b0b48970caef83e0215f55944 Author: Rabin Vincent Date: Tue Jan 25 11:18:13 2011 +0100 dma40: use sg_dma_address() instead of sg_phys() The address to use for DMA should be taken from sg_dma_address() and not sg_phys(). Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 594ece4dc0e8ac222945ef2048430600ad3c7644 Author: Rabin Vincent Date: Tue Jan 25 11:18:12 2011 +0100 dma40: remove unnecessary ALIGN()s ALIGN(x * y, y) == x * y ALIGN(aligned + x * y, y) == aligned + x * y Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit ac2c0a387194f45c759572b3462d1bf92ec92f00 Author: Rabin Vincent Date: Tue Jan 25 11:18:11 2011 +0100 dma40: allow realtime and priority for event lines DB8500v2's DMA40 (revision 3) allows setting event lines as high priority and real time. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 4d5949009e585b2bcf09dc4de625351f987a1e6d Author: Rabin Vincent Date: Tue Jan 25 11:18:10 2011 +0100 dma40: fix comment to refer to SOCs rather than boards And add DB8500v2 information. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 6db5a8ba11bf23d1618e392518f1684cbf2fe031 Author: Rabin Vincent Date: Tue Jan 25 11:18:09 2011 +0100 dma40: use helpers for error functions Almost every use of dev_err in this driver prints the function name. Abstract out wrappers to help with this and reduce code duplication. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 724a8577d80c6f8e9ac680be1cf419eddbd6f2a1 Author: Rabin Vincent Date: Tue Jan 25 11:18:08 2011 +0100 dma40: use helpers for channel type check The somewhat confusing check d40c->log_num == D40_PHY_CHAN and its variants are used in several places to check if a channel is logical or physical. Use appropriately named helpers to do this to make the code more readable. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 8ca84687b91322b9eafeaf4da43a21684cd0316e Author: Rabin Vincent Date: Tue Jan 25 11:18:07 2011 +0100 dma40: use helper for channel registers base The register offset computation for accessing channel registers is copy/pasted in several places. Create a helper function to do it. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 7d83a854a1a44a8f6a699503441403a36c42f66c Author: Rabin Vincent Date: Tue Jan 25 11:18:06 2011 +0100 dma40: remove "hardware link with previous jobs" code This link in hardware with previous jobs code is: - unused, no clients using or requiring this feature - incomplete, being implemented only for physical channels - broken, only working to perform one link Remove it. This also allows us to get rid of the channel pause in the submit_tx() routine. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 262d2915d4f11e5e78e432ab68f0ee034ef3f75f Author: Rabin Vincent Date: Tue Jan 25 11:18:05 2011 +0100 dma40: ensure event lines get enabled The controller sometimes fails to register the enable of the event line when both src and dst event lines are used on the same logical channel. Implement the recommended software workaround, which is to retry the write until it works. Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit cb9ab2d8e4661c811d5e9a8e687b6f736690c90e Author: Rabin Vincent Date: Tue Jan 25 11:18:04 2011 +0100 dma40: make init function static Acked-by: Per Forlin Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Dan Williams commit 00cfa730db0d8378685148e6365b9cec7384b275 Author: Mark Brown Date: Sun Jan 30 12:31:30 2011 -0800 Input: wm831x - add driver for Wolfson WM831x PMIC touchscreen controllers Some of the WM831x series of PMICs from Wolfson Microelectronics include a resistive touchscreen controller. Implement support for these controllers within the input API. Platform data is supported to allow configuration of system parameters such as selection between four and five wire touchscreens and for specification of optional direct to CPU IRQs for sample availability and for pen down. Use of this feature for at least the data IRQ is strongly recommended. Thanks to Julien Boibessot for extensive testing and detailed feedback. Signed-off-by: Mark Brown Tested-by: Julien Boibessot Signed-off-by: Dmitry Torokhov commit f8a9530939ed87b9a1b1a038b90e355098b679a2 Author: Arnaldo Carvalho de Melo Date: Sun Jan 30 10:46:46 2011 -0200 perf evlist: Move evlist methods to evlist.c They were on evsel.c because they came from refactoring existing evsel methods, so, to make reviewing the changes easier, I kept it there, now its a plain move. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 877108e42b1b9ba64857c4030cf356ecc120fd18 Author: Arnaldo Carvalho de Melo Date: Sat Jan 29 15:44:29 2011 -0200 perf tools: Initial python binding First clarifying that this kind of binding is not a replacement or an equivalent to the 'perf script' way of using python with perf. The 'perf script' way is to process events and look at a given script for some python function that matches the events to pass each event for processing. This is a python module, i.e. everything is driven from the python script, that merely uses "import perf" or "from perf import". perf script is focused on tracepoints, this binding is focused on profiling as an initial target. More work is needed to make available tracepoint specific variables as event variables accessible via this binding. There is one example of such usage model, in tools/perf/python/twatch.py, a tool to watch "cycles" events together with task (fork, exit) and comm perf events. For now, due to me not being able to grok how python distutils cope with building C extensions outside the sources dir the install target just builds it, I'm using it as: [root@emilia linux]# export PYTHONPATH=~acme/git/build/perf/lib.linux-x86_64-2.6/ [root@emilia linux]# tools/perf/python/twatch.py cpu: 4, pid: 30126, tid: 30126 { type: mmap, pid: 30126, tid: 30126, start: 0x4, length: 0x82e9ca03, offset: 0, filename: } cpu: 6, pid: 47, tid: 47 { type: mmap, pid: 47, tid: 47, start: 0x6, length: 0xbef87c36, offset: 0, filename: } cpu: 1, pid: 0, tid: 0 { type: mmap, pid: 0, tid: 0, start: 0x1, length: 0x775d1904, offset: 0, filename: } cpu: 7, pid: 0, tid: 0 { type: mmap, pid: 0, tid: 0, start: 0x7, length: 0xc750aeb6, offset: 0, filename: } cpu: 5, pid: 2255, tid: 2255 { type: mmap, pid: 2255, tid: 2255, start: 0x5, length: 0x76669635, offset: 0, filename: } cpu: 0, pid: 0, tid: 0 { type: mmap, pid: 0, tid: 0, start: 0, length: 0x6422ef6b, offset: 0, filename: } cpu: 2, pid: 2255, tid: 2255 { type: mmap, pid: 2255, tid: 2255, start: 0x2, length: 0xe078757a, offset: 0, filename: } cpu: 1, pid: 5769, tid: 5769 { type: fork, pid: 30127, ppid: 5769, tid: 30127, ptid: 5769, time: 103893991270534} cpu: 6, pid: 30127, tid: 30127 { type: comm, pid: 30127, tid: 30127, comm: ls } cpu: 6, pid: 30127, tid: 30127 { type: exit, pid: 30127, ppid: 30127, tid: 30127, ptid: 30127, time: 103893993273024} The first 8 mmap events in this 8 way machine are a mistery that is still being investigated. More of the tools/perf/util/ APIs will be exposed via this python binding as the need arises. For now the focus is on creating events and processing them, symbol resolution is an obvious next step, with tracepoint variables as a close second step. Cc: Clark Williams Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 4aa5f366431fef0afca0df348ca9782c63ac9911 Author: Jamie Iles Date: Fri Jan 21 14:11:55 2011 +0000 avr32: at32ap700x: specify DMA src and dst masters Now that the dw_dmac DMA driver supports configurable source and destination masters we need to specify which ones to use. This was previously hardcoded to 0 and 1 respectively in the driver. Acked-by: Hans-Christian Egtvedt Signed-off-by: Jamie Iles Signed-off-by: Dan Williams commit 95ea759e9e116dade3e7386be2a3db76c90f4675 Author: Jamie Iles Date: Fri Jan 21 14:11:54 2011 +0000 dmaengine/dw_dmac: provide a mechanism to indicate private devices Some platforms (e.g. Picochip PC3XX) have multiple DMA controllers where some may be used for slave transfers and others for general purpose memcpy type transfers. Add a .is_private boolean to the platform data structure so that controllers can be marked as private so that the DMA_PRIVATE capability will be set for that controller. Signed-off-by: Jamie Iles Signed-off-by: Dan Williams commit f301c062dcdd113bc977ae1ebc8c12232f8531a9 Author: Jamie Iles Date: Fri Jan 21 14:11:53 2011 +0000 dmaengine/dw_dmac: allow src/dst masters to be configured at runtime Some platforms have flexible mastering capabilities and this needs to be selected at runtime. If the platform has specified private data in the form of the dw_dma_slave then fetch the source and destination masters from here. If this isn't present, default to the previous of 0 and 1. v2: cleanup whitespace Acked-by: Hans-Christian Egtvedt Signed-off-by: Jamie Iles Signed-off-by: Dan Williams commit 087809fce28f50098d9c3ef1a6865c722f23afd2 Author: Jamie Iles Date: Fri Jan 21 14:11:52 2011 +0000 dmaengine/dw_dmac: don't scan descriptors if no xfers in progress Some hardware (picoChip picoXCell in particular) sometimes has the block transfer complete bit being set for a channel after the whole transfer has completed. If we don't have any transfers in the active list then don't bother to scan the descriptors. This often happens in normal operation and doesn't require the channel to be reset. v2: cleanup whitespace Signed-off-by: Jamie Iles Signed-off-by: Dan Williams commit 8115d60c323dd9931b95221c0a392aeddc1d6ef3 Author: Arnaldo Carvalho de Melo Date: Sat Jan 29 14:01:45 2011 -0200 perf tools: Kill event_t typedef, use 'union perf_event' instead And move the event_t methods to the perf_event__ too. No code changes, just namespace consistency. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8d50e5b4171a69cf48ca94a1e7c14033d0b4771d Author: Arnaldo Carvalho de Melo Date: Sat Jan 29 13:02:00 2011 -0200 perf tools: Rename 'struct sample_data' to 'struct perf_sample' Making the namespace more uniform. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 93fc64f14472ae24fd640bf3834a178f59142842 Author: Arnaldo Carvalho de Melo Date: Sat Jan 29 12:08:00 2011 -0200 perf top: Switch to non overwrite mode Just like 'perf record'. Warn the user when PERF_RECORD_LOST events happen. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 7bb41152b9be7e31f10d8919bce5034135525d9d Author: Arnaldo Carvalho de Melo Date: Sat Jan 29 09:08:13 2011 -0200 perf evlist: Support non overwrite mode in perf_evlist__read_on_cpu I.e. stash the overwrite mode in struct perf_evlist and act accordingly in perf_evlist__read_on_cpu, not checking for overwrites and touching the tail after consuming one event, like perf record does, for instance. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit ef2bf6d043ac9bd4a6f38d862af407154a4754d9 Author: Arnaldo Carvalho de Melo Date: Sat Jan 29 09:04:40 2011 -0200 perf events: Account PERF_RECORD_LOST events in event__process Right now this function is only used by perf top, that uses PROT_READ only, i.e. overwrite mode, so no PERF_RECORD_LOST events are generated, but don't forget those events. The patch that moved this out of perf top was made so that this routine could be used by 'perf probe' in the uprobes patchset, so perhaps there they need to check for LOST events and warn the user, as will be done in the following patches that will switch 'perf top' to non overwrite mode (mmap with PROT_READ|PROT_WRITE). Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit dc82009aac6ee6e423b48de43a251745c62ab012 Author: Arnaldo Carvalho de Melo Date: Fri Jan 28 14:49:19 2011 -0200 perf record: No need to check for overwrites As we open the mmap with (PROT_READ | PROT_WRITE), signalling the kernel with perf_mmap__write_tail() when consuming data, so the kernel will not overwrite. Suggested-by: Peter Zijlstra Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 36be070ac600d023ada2ec107ee925f5ac5f902b Author: Jamie Iles Date: Sat Jan 29 16:01:02 2011 +1100 crypto: omap-sham - don't treat NULL clk as an error clk_get() returns a struct clk cookie to the driver and some platforms may return NULL if they only support a single clock. clk_get() has only failed if it returns a ERR_PTR() encoded pointer. Signed-off-by: Jamie Iles Reviewed-by: Aaro Koskinen Reviewed-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 3e50191d981082345572f1e80b463eb9c05989a0 Author: Jamie Iles Date: Sat Jan 29 15:57:32 2011 +1100 crypto: omap-aes - don't treat NULL clk as an error clk_get() returns a struct clk cookie to the driver and some platforms may return NULL if they only support a single clock. clk_get() has only failed if it returns a ERR_PTR() encoded pointer. Signed-off-by: Jamie Iles Reviewed-and-tested-by: Tobias Karnat Signed-off-by: Herbert Xu commit 18c0ebd2d8194cce4b3f67e2903fa01bea892cbc Author: Jarod Wilson Date: Sat Jan 29 15:14:35 2011 +1100 crypto: testmgr - mark ghash as fips_allowed A self-test failure in fips mode means a panic. Well, gcm(aes) self-tests currently fail in fips mode, as gcm is dependent on ghash, which semi-recently got self-test vectors added, but wasn't marked as a fips_allowed algorithm. Because of gcm's dependence on what is now seen as a non-fips_allowed algorithm, its self-tests refuse to run. Previously, ghash got a pass in fips mode, due to the lack of any test vectors at all, and thus gcm self-tests were able to run. After this patch, a 'modprobe tcrypt mode=35' no longer panics in fips mode, and successful self-test of gcm(aes) is reported. Signed-off-by: Jarod Wilson Signed-off-by: Herbert Xu commit 2918aa8d1d4e7b4586a5a89dc8406e1d431f5129 Author: Jarod Wilson Date: Sat Jan 29 15:14:01 2011 +1100 crypto: testmgr - mark xts(aes) as fips_allowed We (Red Hat) are intending to include dm-crypt functionality, using xts(aes) for disk encryption, as part of an upcoming FIPS-140-2 certification effort, and xts(aes) *is* on the list of possible mode/cipher combinations that can be certified. To make that possible, we need to mark xts(aes) as fips_allowed in the crypto subsystem. A 'modprobe tcrypt mode=10' in fips mode shows xts(aes) self-tests passing successfully after this change. Signed-off-by: Jarod Wilson Signed-off-by: Herbert Xu commit 33c7c0fb20dbbaca67fcf362f875758ba312f58d Author: Davidlohr Bueso Date: Sat Jan 29 15:09:43 2011 +1100 crypto: skcipher - remove redundant NULL check Signed-off-by: Davidlohr Bueso Acked-by: David S. Miller Signed-off-by: Herbert Xu commit b8dad61cc74b9ec71052e2a0e1c5119c65d166da Author: David S. Miller Date: Fri Jan 28 14:07:16 2011 -0800 ipv4: If fib metrics are default, no need to grab ref to FIB info. The fib metric memory in this case is static in the kernel image, so we don't need to reference count it since it's never going to go away on us. Signed-off-by: David S. Miller commit 725d1e1b457dc2bbebb337677e73efe7c6d14da5 Author: David S. Miller Date: Fri Jan 28 14:05:05 2011 -0800 ipv4: Attach FIB info to dst_default_metrics when possible If there are no explicit metrics attached to a route, hook fi->fib_info up to dst_default_metrics. Signed-off-by: David S. Miller commit 9c150e82ac50a611237bbebd508d17f6347d577c Author: David S. Miller Date: Fri Jan 28 14:01:25 2011 -0800 ipv4: Allocate fib metrics dynamically. This is the initial gateway towards super-sharing metrics if they are all set to zero for a route. Signed-off-by: David S. Miller commit 3e11210d46a4f252f41db6e442b46026aeddbb59 Merge: 3bf63e5 c7c1806 Author: John W. Linville Date: Fri Jan 28 16:23:14 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/ath/ath9k/init.c commit fcd3c7796c62f6bf5300ee52a87b8654084c5ae4 Author: Russell King Date: Fri Jan 28 21:03:43 2011 +0000 VIDEO: cyberpro: select lowest multipler/divisor for PLL The lowest closest multiplier/divisor combination should be used for the PLL, not the largest. Reverse the search order. Signed-off-by: Russell King commit 3bf63e59e577cbecd41334c866f501c4cc5d54c5 Author: Felix Fietkau Date: Fri Jan 28 17:52:49 2011 +0100 ath9k: fix compile error in non-debug ath_debug_stat_tx() stub "ath9k: fix tx queue index confusion in debugfs code" changed the debug function but not the stub. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 9f60e7ee4206507c7f248d06e3b4a8a59ed33308 Author: Stanislaw Gruszka Date: Fri Jan 28 16:47:51 2011 +0100 iwlwifi: introduce iwl_bt_statistics We use priv->cfg->bt_params && priv->cfg->bt_params->bt_statistics conditional in few places, merge it into one function. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 8c9f514b38bb01f0af09f880fe8b3cd5342d2401 Author: Stanislaw Gruszka Date: Fri Jan 28 16:47:48 2011 +0100 iwlwifi: remove unneeded disable_hw_scan check We never set STATUS_SCANNING in softwre scanning mode, disable_hw_scan check is unneeded. Correct debug message while at it. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 88e58fc5d940c3463c7070a2a7a8a0ce65af3fdc Author: Stanislaw Gruszka Date: Fri Jan 28 16:47:47 2011 +0100 iwlwifi: introduce iwl_advanced_bt_coexist() We use priv->cfg->bt_params && priv->cfg->bt_params->advanced_bt_coexist conditional in few places, merge it into one function. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit a839cf6955fb6cb731235c310cb0c72c1a2fecbe Author: Stanislaw Gruszka Date: Fri Jan 28 16:47:46 2011 +0100 iwlwifi: remove unneeded __packed struct iwl_queue is not part of firmware interface, so __packed is not needed. Remove it since is may affect performance. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 5a5289dfa5f79168bd477bba2353da90786c83d6 Author: Stanislaw Gruszka Date: Fri Jan 28 16:47:45 2011 +0100 iwl3945: set STATUS_READY before commit_rxon Similar change as we already do for agn, need to avoid "Error setting Tx power (-5)" message when loading module. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit f844a709a7d8f8be61a571afc31dfaca9e779621 Author: Stanislaw Gruszka Date: Fri Jan 28 16:47:44 2011 +0100 iwlwifi: do not set tx power when channel is changing Mac80211 can request for tx power and channel change in one ->config call. If that happens, *_send_tx_power functions will try to setup tx power for old channel, what can be not correct because we already change the band. I.e error "Failed to get channel info for channel 140 [0]", can be printed frequently when operating in software scanning mode. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit efe1cf0c5743caf4daccb57b399ef63edad41c9d Author: Julia Lawall Date: Fri Jan 28 15:17:11 2011 +0100 net/wireless/nl80211.c: Avoid call to genlmsg_cancel genlmsg_cancel subtracts some constants from its second argument before calling nlmsg_cancel. nlmsg_cancel then calls nlmsg_trim on the same arguments. nlmsg_trim tests for NULL before doing any computation, but a NULL second argument to genlmsg_cancel is no longer NULL due to the initial subtraction. Nothing else happens in this execution, so the call to genlmsg_cancel is simply unnecessary in this case. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression data; @@ if (data == NULL) { ... * genlmsg_cancel(..., data); ... return ...; } // Signed-off-by: Julia Lawall Signed-off-by: John W. Linville commit 76a9f6fd9adc5ce62b4ea36a099bb1458d4cb7a6 Author: Bruno Randolf Date: Fri Jan 28 16:52:11 2011 +0900 ath5k: Fix short and long retry configuration The register definition for retry configuration on AR5212 was wrong, and simply copied over from AR5210. Update the register definitions from the documentation. Let the short and long retries be configured from mac80211 and use the standard values of 7 and 4 by default. Also we need to make sure we don't export more retries than we are configured for to mac80211 (and the rate module) in hw->max_rate_tries. Also clean up the code by removing unused defines and variables and drop the different values for "station retries" - if these need to be different it can be handled tru ah_retry_long/short. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 4914b3bb7fa6badc25e77e22c47fde22b924b53f Author: Ben Greear Date: Thu Jan 27 22:09:34 2011 -0800 mac80211: Add sdata state and flags to debugfs. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit de87f736e3573ccf5e8c5b45966812b7d65c0b85 Author: Rajkumar Manoharan Date: Fri Jan 28 11:35:43 2011 +0530 ath9k: use common API to avoid code duplication Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 6d744bacee8195c915c514409a81d470ce7b1177 Author: Johannes Berg Date: Thu Jan 27 14:13:17 2011 +0100 mac80211: add MCS information to radiotap This adds the MCS information we currently get from the drivers into radiotap. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit ebefce3d13f8b5a871337ff7c3821ee140c1ea8a Author: Vivek Natarajan Date: Thu Jan 27 14:45:11 2011 +0530 ath9k_hw: Update PMU setting to improve ripple issue for AR9485. Change from the systems team to update PMU setting for AR9485 version of chipsets. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit bdd62c067d596e2469b243af9887f46e5d47d971 Author: Vivek Natarajan Date: Thu Jan 27 14:45:10 2011 +0530 ath9k: Fix a locking related issue. Spin_lock has been tried to be acquired twice from ath9k_tasklet to ath_reset which resulted in a machine freeze. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 22983c301f01b297a6f85de4757108c6b0eac792 Author: Vivek Natarajan Date: Thu Jan 27 14:45:09 2011 +0530 ath9k_hw: DDR_PLL and BB_PLL need correct setting. Updates from the analog team for AR9485 chipsets to set DDR_PLL2 and DDR_PLL3. Also program the BB_PLL ki and kd value. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 181fb18daaf88a20175b0da70024563b0b7c0666 Author: Vivek Natarajan Date: Thu Jan 27 14:45:08 2011 +0530 ath9k: Fix a PLL hang issue observed with AR9485. When this PLL hang issue is seen, both Rx and Tx fail to work. The sqsum_dvc needs to be below 2000 for a good chip. During this issue the sqsum_dvc value is beyond 80000 and only a full reset can solve this problem. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit b141581923ab4904052174e3b4eb17cc3ce8632c Author: Vivek Natarajan Date: Thu Jan 27 14:45:07 2011 +0530 ath9k_hw: Add a function to read sqsum_dvc. Add a function to observe the delta VC of BB_PLL. For a good chip, the sqsum_dvc is below 2000. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 74f7635930bb157b2e83d38a68177a2b28138ead Author: Sujith Manoharan Date: Wed Jan 26 23:49:06 2011 +0530 ath9k_hw: Add RX filters The HW has separate filter masks for compressed/uncompressed BlockAcks and BlockAckRequests. Add them. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 0d95521ea74735826cb2e28bebf6a07392c75bfa Author: Felix Fietkau Date: Wed Jan 26 18:23:27 2011 +0100 ath9k: use split rx buffers to get rid of order-1 skb allocations With this change, less CPU time is spent trying to look for consecutive pages for rx skbs. This also reduces the socket memory required for IP/UDP reassembly. Only two buffers per frame are supported. Frames spanning more buffers will be dropped, but the buffer size is enough to handle the required AMSDU size. Signed-off-by: Jouni Malinen Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4d9067405c21e8596087d929f3d858d0aa5002ff Author: Sujith Manoharan Date: Wed Jan 26 21:59:18 2011 +0530 ath9k_hw: Fix INI fixup Commit "ath9k_hw: move AR9280 PCI EEPROM fix to eeprom_def.c" changed the behavior of INI overriding which is needed only for PCI cards. Revert to the original check. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 00e0003e0969517c5a447ac3173442dfbdb0613b Author: Sujith Manoharan Date: Wed Jan 26 21:59:05 2011 +0530 ath9k_hw: Fix opmode initialization Commit "ath9k_hw: Relocate Opmode initialization" moved the opmode initialization before the STA_ID1 register was programmed with defaults. This changed the original behaviour because the re-programming code doesn't take into account the existing value in the register. Both ath9k and ath9k_htc were not affected by this change because the opmode is re-initialized after every reset, when RX is started. Revert to the original behavior, except keep it outside the REGWRITE block. This would help remove extraneous opmode calls in the driver core. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 45cbad6a1299842b5ae9a8a9c09630af063692f8 Author: Juuso Oikarinen Date: Tue Jan 25 12:21:22 2011 +0200 cfg80211: Allow non-zero indexes for device specific pair-wise ciphers Some vendor specific cipher suites require non-zero key indexes for pairwise keys, but as of currently, the cfg80211 does not allow it. As validating they cipher parameters for vendor specific cipher suites is the job of the driver or hardware/firmware, change the cfg80211 to allow also non-zero pairwise key indexes for vendor specific ciphers. Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 53e3b6e29eeda568fbe6c1e32d35cb56eea94415 Author: Bob Copeland Date: Mon Jan 24 23:32:56 2011 -0500 ath5k: remove debug_dump_skb() functions Now that rx and tx dumps go through the tracing infrastructure, we no longer need to keep these routines around. Signed-off-by: Bob Copeland Acked-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 0e4722524d5134dedd514d34991f02f2c1de23b4 Author: Bob Copeland Date: Mon Jan 24 23:32:55 2011 -0500 ath5k: use tracing for packet tx/rx dump This adds a few tracepoints to ath5k driver transmit and receive callbacks in order to record packet traffic. We record the entire packet in the trace buffer so that the data can be extracted with trace-cmd and external plugins. Compared to the previous debugging calls, this approach removes an out-of-line function call from the tx and rx paths in the compiled-in-but-disabled case, while improving the ability to process the logged data. A new option, CONFIG_ATH5K_TRACER, is added so that one may disable the tracepoints completely. Signed-off-by: Bob Copeland Acked-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit b453175d932c8ff42146992a1dac243104783902 Author: Bruno Randolf Date: Tue Jan 25 13:15:43 2011 +0900 ath9k: Remove unused IEEE80211_WEP_NKID IEEE80211_WEP_NKID is not used in ath9k any more since the key handling code has been moved to ath/. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit ead3dcff31111c3dc1205a383190614f045d94aa Author: Bruno Randolf Date: Tue Jan 25 13:15:38 2011 +0900 ath5k: Enable 802.11j 4.9GHz frequencies This enables 4.9GHz frequencies in ath5k if they are allowed as indicated by the regulatory domain code. Currently this is MKK9_MKKC (0xfe). Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 5719efdde1d0ae8670b96eb8748d1a0dc6a37be2 Author: Bruno Randolf Date: Tue Jan 25 13:15:33 2011 +0900 ath: Add function to check if 4.9GHz channels are allowed This adds a helper function to ath/regd.c which can be asked if 4.9GHz channels are allowed for a given regulatory domain code. This keeps the knowledge of regdomains and defines like MKK9_MKKC in one place. I'm passing the regdomain code instead of the ath_regulatory structure because this needs to be called quite early in the driver inititalization where ath_regulatory is not available yet in ath5k. I'm using MKK9_MKKC only because this is the regdomain in the 802.11j enabled sample cards we got from our vendor. I found some hints in HAL code that this is used by Atheros to indicate 4.9GHz channels support and that there might be other domain codes as well, but as I don't have any documentation I'm just putting in what I need right now. It can be extended later. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 20a904904dc69d4b4de26c146af33eb00f05ab92 Author: Bruno Randolf Date: Tue Jan 25 13:15:28 2011 +0900 ath5k: Use local variable for capabilities Shorten some lines and make code more readable. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 5bec3e5ade813ee4bdbab03af1bb6f85859272ea Author: Felix Fietkau Date: Mon Jan 24 21:29:25 2011 +0100 ath9k: fix tx queue index confusion in debugfs code Various places printing tx queue information used various different ways to get a tx queue index for printing statistics. Most of these ways were wrong. ATH_TXQ_AC_* cannot be used as an index for sc->tx.txq, because it is only used internally for queue assignment. One place used WME_AC_* as a queue index for sc->debug.stats.txstats, however this array uses the ath9k_hw queue number as well. Fix all of this by always using the ath9k_hw queue number as an index, and always looking it up by going through sc->tx.txq_map. Signed-off-by: Felix Fietkau Cc: Ben Greear Signed-off-by: John W. Linville commit 9ac58615d93c8a28b1c649a90a5e2ede4dfd368a Author: Felix Fietkau Date: Mon Jan 24 19:23:18 2011 +0100 ath9k: fold struct ath_wiphy into struct ath_softc Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0cdd5c60e4538d02414144e0682941a4eb20ffa8 Author: Felix Fietkau Date: Mon Jan 24 19:23:17 2011 +0100 ath9k: remove the bf->aphy field Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7545daf498c43e548506212310e6c75382d2731d Author: Felix Fietkau Date: Mon Jan 24 19:23:16 2011 +0100 ath9k: remove support for virtual wiphys Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 34302397e5b980ce561366b63504e9d82948e8b8 Author: Felix Fietkau Date: Mon Jan 24 19:23:15 2011 +0100 ath9k: remove the virtual wiphy debugfs interface It does not make much sense to keep the current virtual wiphy implementation any longer - it adds significant complexity, has very few users and is still very experimental. At some point in time, it will be replaced by a proper implementation in mac80211. By making the code easier to read and maintain, removing virtual wiphy support helps with fixing the remaining driver issues and adding further improvements. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 92460412367c00e97f99babdb898d0930ce604fc Author: Felix Fietkau Date: Mon Jan 24 19:23:14 2011 +0100 ath9k: clean up the code that wakes the mac80211 queues Instead of spreading ath_wake_mac80211_queue() calls over multiple places in the tx path that process the tx queue for completion, call it only where the pending frames counter gets decremented, eliminating some redundant checks. To prevent queue draining from waking the queues prematurely (e.g. during a hardware reset), reset the queue stop state when draining all queues, as the caller in main.c will run ieee80211_wake_queues(hw) anyway. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit cbdbc5eb542da242bfa3cfe18e7828d21c670969 Merge: 8d8d3fd e5e2f24 Author: John W. Linville Date: Fri Jan 28 15:33:16 2011 -0500 Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx commit 2ff9870c4cccf97d777bf5551d22303e0176b201 Merge: ecca819 d056fca Author: David Brown Date: Fri Jan 28 12:27:59 2011 -0800 Merge branch 'msm-core' into for-next * msm-core: msm: serial: Add MSM8960 serial support commit d056fca32354dd990ffbd90fd1da10eaec72aa87 Author: Stepan Moskovchenko Date: Thu Jan 27 12:12:07 2011 -0800 msm: serial: Add MSM8960 serial support Add the device definitions and platform data to support the console serial port on MSM8960 Simulator and RUMI3 targets. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit ecca8194c16bdf6cde99a2b29c23a77901cd61a6 Merge: d1f4cec 07a3cc4 Author: David Brown Date: Fri Jan 28 11:31:53 2011 -0800 Merge branch 'msm-core' into for-next * msm-core: msm: Clean up useless ifdefs msm: clock: Add support for more proc_comm clocks msm: clock: Invert debugfs directory layout msm: clock: Move debugfs code from clock.c to clock-debug.c msm: clock: Remove 7x30 and pcom includes from clock.h msm: clock: Remove unused code and definitions msm: Warning fix in trout gpio board file msm: Remove broken register definition from trout commit 07a3cc4814f790354d4c7be2c9dc6143a714a07a Author: Stepan Moskovchenko Date: Thu Jan 27 12:13:22 2011 -0800 msm: Clean up useless ifdefs Remove ifdefs that do nothing, either from having the code between them previously removed, or from having been accidentally added to the wrong file. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit f689ac98777b8ca7278c1099dfc2ebecde397523 Author: Stephen Boyd Date: Wed Jan 26 16:20:56 2011 -0800 msm: clock: Add support for more proc_comm clocks Add support for the ce, codec_ssbi, uart clocks, and i2c clocks. Reviewed-by: Saravana Kannan Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit 6e6d9b5bec5b27164126894c452853e4cac19b15 Author: Stephen Boyd Date: Wed Jan 26 16:20:55 2011 -0800 msm: clock: Invert debugfs directory layout There are currently 3 separate directories for clock debugging in debugfs: clk_enable, clk_rate, and clk_local. Each of these directories contains a list of clocks. This is rather annoying when you are focusing on one clock and want to enable/disable it and then check its rate. You either have to cd to the other directory or cat ../clk_rate/. Invert the layout so that there is one clock directory containing a directory for each clock. Inside each respective clock directory place an enable, rate, and is_local file relating to the clk_enable, clk_disable, and clk_local directories that exist today. Reviewed-by: Saravana Kannan Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit d64560fe3e9bf64b2050ceeb6b6946ba2a4efda0 Author: Matt Wagantall Date: Wed Jan 26 16:20:54 2011 -0800 msm: clock: Move debugfs code from clock.c to clock-debug.c The clock debugfs code is large enough, and easy enough to separate, that it deserves its own file which is compiled only when CONFIG_DEBUG_FS is enabled. Also, cleanup header file #includes that are no longer required. Reviewed-by: Saravana Kannan Signed-off-by: Matt Wagantall Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit ce1c80fbaa3b8e132d4e430cbf7cb4a9cd28b2d5 Author: Stephen Boyd Date: Wed Jan 26 16:20:53 2011 -0800 msm: clock: Remove 7x30 and pcom includes from clock.h clock.h includes clock-pcom.h and clock-7x30.h when it really doesn't need to. Remove the includes and fixup breakages. Reviewed-By: Saravana Kannan Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit 437f629d4ea0a574b6102101fe4a51232a7cc105 Author: Stephen Boyd Date: Wed Jan 26 16:20:52 2011 -0800 msm: clock: Remove unused code and definitions This code is dead or otherwise useless so just remove it. Reviewed-by: Saravana Kannan Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit 5c548add9899a1f8fcd47a58c4925c8ac4fc3027 Author: David Brown Date: Wed Jan 26 16:14:24 2011 -0800 msm: Warning fix in trout gpio board file arch/arm/mach-msm/board-trout-gpio.c: In function 'trout_gpio_to_irq': arch/arm/mach-msm/board-trout-gpio.c:77: error: unused variable 'msm_gpio' Signed-off-by: David Brown commit c8e4e7b12632771ab59f2e27fe120764642d06d2 Author: David Brown Date: Wed Jan 26 16:14:23 2011 -0800 msm: Remove broken register definition from trout Missed a register change with the clock cleanup on the MSM7x01 targets. Signed-off-by: David Brown commit 6a4ddef2a3805d5b0664a94579b7a651bc202266 Author: Thomas Jacob Date: Fri Jan 28 19:33:13 2011 +0100 netfilter: xt_iprange: add IPv6 match debug print code Signed-off-by: Thomas Jacob Signed-off-by: Patrick McHardy commit 4e62445b90ac4ef708bd11c7ae052b1d5ef765b5 Author: Tejun Heo Date: Fri Jan 28 17:22:48 2011 +0100 x86: Fix build failure on X86_UP_APIC Commit 4c321ff8 (x86: Replace cpu_2_logical_apicid[] with early percpu variable) and following changes introduced and used x86_cpu_to_logical_apicid percpu variable. It was declared and defined inside CONFIG_SMP && CONFIG_X86_32 but if CONFIG_X86_UP_APIC is set UP configuration makes use of it and build fails. Fix it by declaring and defining it inside CONFIG_X86_LOCAL_APIC && CONFIG_X86_32. Signed-off-by: Tejun Heo Reported-by: Ingo Molnar Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <20110128162248.GA25746@htj.dyndns.org> Signed-off-by: Ingo Molnar commit 8db78cc4b4048e3add40bca1bc3e55057c319256 Author: Tejun Heo Date: Sun Jan 23 14:37:42 2011 +0100 x86: Unify NUMA initialization between 32 and 64bit Now that everything else is unified, NUMA initialization can be unified too. * numa_init_array() and init_cpu_to_node() are moved from numa_64 to numa. * numa_32::initmem_init() is updated to call numa_init_array() and setup_arch() to call init_cpu_to_node() on 32bit too. * x86_cpu_to_node_map is now initialized to NUMA_NO_NODE on 32bit too. This is safe now as numa_init_array() will initialize it early during boot. This makes NUMA mapping fully initialized before setup_per_cpu_areas() on 32bit too and thus makes the first percpu chunk which contains all the static variables and some of dynamic area allocated with NUMA affinity correctly considered. Signed-off-by: Tejun Heo Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-17-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar Reported-by: Eric Dumazet Reviewed-by: Pekka Enberg commit de2d9445f1627830ed2ebd00ee9d851986c940b5 Author: Tejun Heo Date: Sun Jan 23 14:37:41 2011 +0100 x86: Unify node_to_cpumask_map handling between 32 and 64bit x86_32 has been managing node_to_cpumask_map explicitly from map_cpu_to_node() and friends in a rather ugly way. With previous changes, it's now possible to share the code with 64bit. * When CONFIG_NUMA_EMU is disabled, numa_add/remove_cpu() are implemented in numa.c and shared by 32 and 64bit. CONFIG_NUMA_EMU versions still live in numa_64.c. NUMA_EMU's dependency on 64bit is planned to be removed and the above should go away together. * identify_cpu() now calls numa_add_cpu() for 32bit too. This makes the explicit mask management from map_cpu_to_node() unnecessary. * The whole x86_32 specific map_cpu_to_node() chunk is no longer necessary. Dropped. Signed-off-by: Tejun Heo Reviewed-by: Pekka Enberg Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-16-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar Cc: David Rientjes Cc: Shaohui Zheng commit 645a79195f66eb68ef3ab2b21d9829ac3aa085a9 Author: Tejun Heo Date: Sun Jan 23 14:37:40 2011 +0100 x86: Unify CPU -> NUMA node mapping between 32 and 64bit Unlike 64bit, 32bit has been using its own cpu_to_node_map[] for CPU -> NUMA node mapping. Replace it with early_percpu variable x86_cpu_to_node_map and share the mapping code with 64bit. * USE_PERCPU_NUMA_NODE_ID is now enabled for 32bit too. * x86_cpu_to_node_map and numa_set/clear_node() are moved from numa_64 to numa. For now, on 32bit, x86_cpu_to_node_map is initialized with 0 instead of NUMA_NO_NODE. This is to avoid introducing unexpected behavior change and will be updated once init path is unified. * srat_detect_node() is now enabled for x86_32 too. It calls numa_set_node() and initializes the mapping making explicit cpu_to_node_map[] updates from map/unmap_cpu_to_node() unnecessary. Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-15-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar Cc: David Rientjes commit bbc9e2f452d9c4b166d1f9a78d941d80173312fe Author: Tejun Heo Date: Sun Jan 23 14:37:39 2011 +0100 x86: Unify cpu/apicid <-> NUMA node mapping between 32 and 64bit The mapping between cpu/apicid and node is done via apicid_to_node[] on 64bit and apicid_2_node[] + apic->x86_32_numa_cpu_node() on 32bit. This difference makes it difficult to further unify 32 and 64bit NUMA handling. This patch unifies it by replacing both apicid_to_node[] and apicid_2_node[] with __apicid_to_node[] array, which is accessed by two accessors - set_apicid_to_node() and numa_cpu_node(). On 64bit, numa_cpu_node() always consults __apicid_to_node[] directly while 32bit goes through apic->numa_cpu_node() method to allow apic implementations to override it. srat_detect_node() for amd cpus contains workaround for broken NUMA configuration which assumes relationship between APIC ID, HT node ID and NUMA topology. Leave it to access __apicid_to_node[] directly as mapping through CPU might result in undesirable behavior change. The comment is reformatted and updated to note the ugliness. Signed-off-by: Tejun Heo Reviewed-by: Pekka Enberg Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-14-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar Cc: David Rientjes commit 89e5dc218e084e13a3996db6693b01478912f4ee Author: Tejun Heo Date: Sun Jan 23 14:37:38 2011 +0100 x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() apic->apicid_to_node() is 32bit specific apic operation which determines NUMA node for a CPU. Depending on the APIC implementation, it can be easier to determine NUMA node from either physical or logical apicid. Currently, ->apicid_to_node() takes @logical_apicid and calls hard_smp_processor_id() if the physical apicid is needed. This prevents NUMA mapping from being queried from a different CPU, which in turn makes it impossible to initialize NUMA mapping before SMP bringup. This patch replaces apic->apicid_to_node() with ->x86_32_numa_cpu_node() which takes @cpu, from which both logical and physical apicids can easily be determined. While at it, drop duplicate implementations from bigsmp_32 and summit_32, and use the default one. Signed-off-by: Tejun Heo Reviewed-by: Pekka Enberg Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-13-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit df04cf011b0657ddc782b48d455f7e232b9be41c Author: Tejun Heo Date: Sun Jan 23 14:37:37 2011 +0100 x86: Implement x86_32_early_logical_apicid() for numaq_32 Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-12-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit 3b39d937843e071c59b3aeecbf7de4750f095b12 Author: Tejun Heo Date: Sun Jan 23 14:37:36 2011 +0100 x86: Implement x86_32_early_logical_apicid() for summit_32 Factor out logical apic id calculation from summit_init_apic_ldr() and use it for the x86_32_early_logical_apicid() callback. Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-11-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit 12bf24a47c1a095233cc8a8b863b509a0d8e0f2c Author: Tejun Heo Date: Sun Jan 23 14:37:35 2011 +0100 x86: Implement x86_32_early_logical_apicid() for bigsmp_32 Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-10-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit 3f6f6798889d50ec7ca8eef1d100cda37dc658ea Author: Tejun Heo Date: Sun Jan 23 14:37:34 2011 +0100 x86: Implement the default x86_32_early_logical_apicid() Implement x86_32_early_logical_apicid() for the default apic flat routing. Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-9-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit acb8bc09c6185e4d3d582d0076aaa6a89f19d8c5 Author: Tejun Heo Date: Sun Jan 23 14:37:33 2011 +0100 x86: Add apic->x86_32_early_logical_apicid() On x86_32, the mapping between cpu and logical apic ID differs depending on the specific apic implementation in use. The mapping is initialized while bringing up CPUs; however, this makes early inits ignore memory topology. Add a x86_32 specific apic->x86_32_early_logical_apicid() which is called early during boot to query the mapping. The mapping is later verified against the result of init_apic_ldr(). The method is allowed to return BAD_APICID if it can't be determined early. noop variant which always returns BAD_APICID is implemented and added to all x86_32 apic implementations. Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-8-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit 7632611f534340182c832d2b139cb19676f24e1a Author: Tejun Heo Date: Sun Jan 23 14:37:32 2011 +0100 x86: Kill apic->cpu_to_logical_apicid() After the previous patch, apic->cpu_to_logical_apicid() is no longer used. Kill it. For apic types with custom cpu_to_logical_apicid() which is also used for other purposes, remove the function and modify its users to do the mapping directly. #ifdef's on CONFIG_SMP in es7000_32 and summit_32 are ignored during conversion as they are not used for UP kernels. Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-7-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit 6f802c4bfa2acf1bffa8341fe9084da0205d581d Author: Tejun Heo Date: Sun Jan 23 14:37:31 2011 +0100 x86: Always use x86_cpu_to_logical_apicid for cpu -> logical apic id Currently, cpu -> logical apic id translation is done by apic->cpu_to_logical_apicid() callback which may or may not use x86_cpu_to_logical_apicid. This is unnecessary as it should always equal logical_smp_processor_id() which is known early during CPU bring up. Initialize x86_cpu_to_logical_apicid after apic->init_apic_ldr() in setup_local_APIC() and always use x86_cpu_to_logical_apicid for cpu -> logical apic id mapping. Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-6-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit 4c321ff8a01a95badf5d5403d80ca4e0ab07fce7 Author: Tejun Heo Date: Sun Jan 23 14:37:30 2011 +0100 x86: Replace cpu_2_logical_apicid[] with early percpu variable Unlike x86_64, on x86_32, the mapping from cpu to logical apicid may vary depending on apic in use. cpu_2_logical_apicid[] array is used for this mapping. Replace it with early percpu variable x86_cpu_to_logical_apicid to make it better aligned with other mappings. Signed-off-by: Tejun Heo Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-5-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit 1245e1668c6e52bee76a423f8fab3bfcdd6226ae Author: Tejun Heo Date: Sun Jan 23 14:37:29 2011 +0100 x86: Make default_send_IPI_mask_sequence/allbutself_logical() 32bit only Both functions are used only in 32bit. Put them inside CONFIG_X86_32. This is to prepare for logical apicid handling update. - Cyrill Gorcunov spotted that I forgot to move declarations in ipi.h under CONFIG_X86_32. Fixed. Signed-off-by: Tejun Heo Reviewed-by: Pekka Enberg Reviewed-by: Cyrill Gorcunov Acked-by: Yinghai Lu Cc: eric.dumazet@gmail.com Cc: brgerst@gmail.com Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-4-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit b78aa66b1fe4179d28e3f6502dc179773519a1bb Author: Tejun Heo Date: Sun Jan 23 14:37:28 2011 +0100 x86: Drop x86_32 MAX_APICID Commit 56d91f13 (x86, acpi: Add MAX_LOCAL_APIC for 32bit) added MAX_LOCAL_APIC for x86_32 but didn't replace MAX_APICID users with it. Convert MAX_APICID users to MAX_LOCAL_APIC and drop MAX_APICID. Signed-off-by: Tejun Heo Reviewed-by: Pekka Enberg Acked-by: Yinghai Lu Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-3-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit bd22a2f1982fa3e90ce7d5d011c37d88aa67e73c Author: Tejun Heo Date: Sun Jan 23 14:37:27 2011 +0100 x86: Kill unused static boot_cpu_logical_apicid in smpboot.c Signed-off-by: Tejun Heo Reviewed-by: Pekka Enberg Acked-by: Yinghai Lu Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-2-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar commit 1166f985d3b6b4ef8a48a13f56520870d86085c3 Merge: dddf3e4 e9cf704 Author: Mark Brown Date: Fri Jan 28 13:22:14 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit dddf3e4c257879bc35cda3f542507c43f2648a2a Author: Mark Brown Date: Fri Jan 28 13:11:47 2011 +0000 ASoC: Add card driver data Provide driver data for cards within the card structure. To simplify the implementation of the PM operations we don't use the struct device driver data as this is used by the core to retrieve the card in callbacks from the device model and PM core. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 70d29331ac551c11e6e3934f43a548ae8154351e Author: Jarkko Nikula Date: Thu Jan 27 16:24:22 2011 +0200 ASoC: soc-core: Increment codec and platform driver refcounts before probing Commit f6c2ed5 "ASoC: Fix the device references to codec and platform drivers" moved codec and platform driver refcount increments from soc_bind_dai_link to more appropriate places. Adjust a little them so that refcounts are incremented before executing the driver probe functions. Signed-off-by: Jarkko Nikula Cc: Vinod Koul Cc: Harsha Priya Signed-off-by: Mark Brown commit 4404117d745f2251c5d3c739c50f617e755dbe12 Author: Fabio Estevam Date: Thu Jan 27 15:00:19 2011 -0200 ARM: mach-mx3/mach-mx31_3ds: Remove unnecessary function for IO mapping Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit e2f973d58e80ba00bcfaa171169c42c710e7e826 Author: Chris Wilson Date: Thu Jan 27 19:15:11 2011 +0000 drm/i915: Record all error ringbuffers Signed-off-by: Chris Wilson commit 54489c189b1a0c10eaf21c6d2c5916b50442c871 Author: Han Pingtian Date: Tue Jan 25 07:39:00 2011 +0800 perf test: Fix return values checking Fixing some cut'n'paste mistakes. LKML-Reference: <20110124233900.GA3443@epc900.nay.redhat.com> Signed-off-by: Han Pingtian [ committer note: I had already removed the CPU_ALLOC calls ] Signed-off-by: Arnaldo Carvalho de Melo commit 3c42258c9a4db70133fa6946a275b62a16792bb5 Author: Masami Hiramatsu Date: Thu Jan 20 23:15:45 2011 +0900 perf probe: Add filters support for available functions Add filters support for available function list. Default filter is "!_*" for filtering out local-purpose symbols. e.g.: # perf probe --filter="add*" -F add_disk add_disk_randomness add_input_randomness add_interrupt_randomness add_memory add_page_to_unevictable_list add_page_wait_queue ... Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Chase Douglas Cc: Franck Bui-Huu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110120141545.25915.85930.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit bd09d7b5efeb13965b6725b4a3e9944908bca9d2 Author: Masami Hiramatsu Date: Thu Jan 20 23:15:39 2011 +0900 perf probe: Add variable filter support Add filters support for available variable list. Default filter is "!__k???tab_*&!__crc_*" for filtering out automatically generated symbols. The format of filter rule is "[!]GLOBPATTERN", so you can use wild cards. If the filter rule starts with '!', matched variables are filter out. e.g.: # perf probe -V schedule --externs --filter=cpu* Available variables at schedule @ cpumask_var_t cpu_callout_mask cpumask_var_t cpu_core_map cpumask_var_t cpu_isolated_map cpumask_var_t cpu_sibling_map int cpu_number long unsigned int* cpu_bit_bitmap ... Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Chase Douglas Cc: Franck Bui-Huu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110120141539.25915.43401.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu [ committer note: Removed the elf.h include as it was fixed up in e80711c] Signed-off-by: Arnaldo Carvalho de Melo commit 68baa431ec2f14ba7510d4e79bceb6ceaf0d3b74 Author: Masami Hiramatsu Date: Thu Jan 20 23:15:30 2011 +0900 perf tools: Add strfilter for general purpose string filter Add strfilter for general purpose string filter. Every filter rules are descrived by glob matching pattern and '!' prefix which means Logical NOT. A strfilter consists of those filter rules connected with '&' and '|'. A set of rules can be folded by using '(' and ')'. It also accepts spaces around rules and those operators. Format: ::= | "!" | | "(" ")" ::= "&" | "|" e.g.: "(add* | del*) & *timer" filter rules pass strings which start with add or del and end with timer. This will be used by perf probe --filter. Changes in V2: - Fix to check result of strdup() and strfilter__alloc(). - Encapsulate and simplify interfaces as like regex(3). Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Franck Bui-Huu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110120141530.25915.12673.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit 44b4ca32fe09ae3844e9e2d12fb7371b3edeee14 Author: Sascha Hauer Date: Thu Jan 27 12:38:01 2011 +0100 ARM i.MX28: remove reserved register defines Signed-off-by: Sascha Hauer Acked-by: Shawn Guo Acked-by: Wolfram Sang commit d69934bc7bf677a51a13cdbcaa5eae45ea9e2fda Author: Sascha Hauer Date: Mon Jan 24 09:04:27 2011 +0100 ARM i.MX23: remove reserved register defines Signed-off-by: Sascha Hauer Acked-by: Shawn Guo Acked-by: Wolfram Sang commit 0e8b462de06e0559fc7c5a73d1d913782397987d Author: Sascha Hauer Date: Mon Jan 24 13:09:41 2011 +0100 ARM i.MX23/28: do not use complicated macros if not necessary Get rid of ## preprocessor construct where it only makes the code harder to read. Signed-off-by: Sascha Hauer Acked-by: Shawn Guo Acked-by: Wolfram Sang commit ef19660b0aac537928a13a4087908cc23fa4c002 Author: Sascha Hauer Date: Mon Jan 24 12:57:46 2011 +0100 ARM i.MX23/28: deobfuscate gpio initialization Signed-off-by: Sascha Hauer Acked-by: Shawn Guo Acked-by: Wolfram Sang commit cd7bb53ff88a5acef942a87c1d04e6211b6470dc Author: Paul Mundt Date: Fri Jan 28 15:14:08 2011 +0900 sh: Fix up async PCIe probing on SMP. For the SMP case we run in to a lockup without a full synchronization prior to continuing with the boot. Signed-off-by: Paul Mundt commit a4daad6b0923030fbd3b00a01f570e4c3eef446b Author: David S. Miller Date: Thu Jan 27 22:01:53 2011 -0800 net: Pre-COW metrics for TCP. TCP is going to record metrics for the connection, so pre-COW the route metrics at route cache entry creation time. This avoids several atomic operations that have to occur if we COW the metrics after the entry reaches global visibility. Signed-off-by: David S. Miller commit 8161239a8bcce9ad6b537c04a1fa3b5c68bae693 Author: Lai Jiangshan Date: Fri Jan 14 17:09:41 2011 +0800 rtmutex: Simplify PI algorithm and make highest prio task get lock In current rtmutex, the pending owner may be boosted by the tasks in the rtmutex's waitlist when the pending owner is deboosted or a task in the waitlist is boosted. This boosting is unrelated, because the pending owner does not really take the rtmutex. It is not reasonable. Example. time1: A(high prio) onwers the rtmutex. B(mid prio) and C (low prio) in the waitlist. time2 A release the lock, B becomes the pending owner A(or other high prio task) continues to run. B's prio is lower than A, so B is just queued at the runqueue. time3 A or other high prio task sleeps, but we have passed some time The B and C's prio are changed in the period (time2 ~ time3) due to boosting or deboosting. Now C has the priority higher than B. ***Is it reasonable that C has to boost B and help B to get the rtmutex? NO!! I think, it is unrelated/unneed boosting before B really owns the rtmutex. We should give C a chance to beat B and win the rtmutex. This is the motivation of this patch. This patch *ensures* only the top waiter or higher priority task can take the lock. How? 1) we don't dequeue the top waiter when unlock, if the top waiter is changed, the old top waiter will fail and go to sleep again. 2) when requiring lock, it will get the lock when the lock is not taken and: there is no waiter OR higher priority than waiters OR it is top waiter. 3) In any time, the top waiter is changed, the top waiter will be woken up. The algorithm is much simpler than before, no pending owner, no boosting for pending owner. Other advantage of this patch: 1) The states of a rtmutex are reduced a half, easier to read the code. 2) the codes become shorter. 3) top waiter is not dequeued until it really take the lock: they will retain FIFO when it is stolen. Not advantage nor disadvantage 1) Even we may wakeup multiple waiters(any time when top waiter changed), we hardly cause "thundering herd", the number of wokenup task is likely 1 or very little. 2) two APIs are changed. rt_mutex_owner() will not return pending owner, it will return NULL when the top waiter is going to take the lock. rt_mutex_next_owner() always return the top waiter. will not return NULL if we have waiters because the top waiter is not dequeued. I have fixed the code that use these APIs. need updated after this patch is accepted 1) Document/* 2) the testcase scripts/rt-tester/t4-l2-pi-deboost.tst Signed-off-by: Lai Jiangshan LKML-Reference: <4D3012D5.4060709@cn.fujitsu.com> Reviewed-by: Steven Rostedt Signed-off-by: Steven Rostedt commit 232bc6514fbf67abdaec1899a6d818c1dc70cbd6 Author: Aaro Koskinen Date: Thu Jan 27 16:39:45 2011 -0800 arm: mach-omap1: board-voiceblue: add missing include Eliminates the following sparse warnings: arch/arm/mach-omap1/board-voiceblue.c:253:6: warning: symbol 'voiceblue_wdt_enable' was not declared. Should it be static? arch/arm/mach-omap1/board-voiceblue.c:261:6: warning: symbol 'voiceblue_wdt_disable' was not declared. Should it be static? arch/arm/mach-omap1/board-voiceblue.c:269:6: warning: symbol 'voiceblue_wdt_ping' was not declared. Should it be static? arch/arm/mach-omap1/board-voiceblue.c:278:6: warning: symbol 'voiceblue_reset' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit ee54dba9c360944b34e06478c05c6f283bf64eda Author: Russell King - ARM Linux Date: Thu Jan 27 16:39:45 2011 -0800 ARM: OMAP: Allow platforms to hook reset cleanly This adds a clean method to allow platforms to hook into the reset code if they require to. Signed-off-by: Russell King Signed-off-by: Tony Lindgren commit 277a28567fe928bd94e9953a187002f5041c34a4 Author: Aaro Koskinen Date: Thu Jan 27 16:39:44 2011 -0800 arm: mach-omap1: board-h3: make nand_platdata static Eliminates the following sparse warning: arch/arm/mach-omap1/board-h3.c:207:27: warning: symbol 'nand_platdata' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 140089da7e5e55012afe1e550c93e155c3a4e716 Author: Aaro Koskinen Date: Thu Jan 27 16:39:44 2011 -0800 arm: mach-omap1: board-htcherald: make htcpld_chips and htcpld_pfdata static Eliminates the following sparse warnings: arch/arm/mach-omap1/board-htcherald.c:334:34: warning: symbol 'htcpld_chips' was not declared. Should it be static? arch/arm/mach-omap1/board-htcherald.c:369:34: warning: symbol 'htcpld_pfdata' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 04023542f81b80295aac454b76f6a40b207ddc21 Author: Aaro Koskinen Date: Thu Jan 27 16:39:44 2011 -0800 arm: mach-omap1: board-innovator: make innovator_mmc_init() static Eliminates the following sparse warning: arch/arm/mach-omap1/board-innovator.c:368:13: warning: symbol 'innovator_mmc_init' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 5db98f75f91006eaa37db3e13e320155225990e2 Author: Aaro Koskinen Date: Thu Jan 27 16:39:43 2011 -0800 arm: mach-omap1: board-h2: make h2_nand_platdata static Eliminates the following sparse warning: arch/arm/mach-omap1/board-h2.c:205:27: warning: symbol 'h2_nand_platdata' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit c77675827206661943237fdc237abb7a79797d6b Author: Aaro Koskinen Date: Thu Jan 27 16:39:43 2011 -0800 arm: plat-omap: dma: make omap_dma_in_1510_mode() static Eliminates the following sparse warning: arch/arm/plat-omap/dma.c:137:5: warning: symbol 'omap_dma_in_1510_mode' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit ee23b93dff539b82fd9e225e5235ee6d2fb01346 Author: Felipe Balbi Date: Thu Jan 27 16:39:43 2011 -0800 arm: omap2: irq: fix compile warning: Fix the following compile warning: arch/arm/mach-omap2/irq.c:64:31: warning: 'intc_context' defined but not used Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit bdc58fb950a3a1b0bc3cbd8e23d21ecdde2ac9a2 Author: Felipe Balbi Date: Thu Jan 27 16:39:42 2011 -0800 arm: omap1: fix a bunch of section mismatches Fix the following section mismatches: WARNING: arch/arm/mach-omap1/built-in.o(.data+0x491c): Section mismatch in reference from the variable fsample_config to the (unknown reference) .init.data:(unknown) The variable fsample_config references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: arch/arm/mach-omap1/built-in.o(.data+0x8f0c): Section mismatch in reference from the variable ams_delta_config to the (unknown reference) .init.data:(unknown) The variable ams_delta_config references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: arch/arm/mach-omap1/built-in.o(.data+0x93ac): Section mismatch in reference from the variable ams_delta_camera_device to the (unknown reference) .init.data:(unknown) The variable ams_delta_camera_device references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: vmlinux.o(.data+0x5e94): Section mismatch in reference from the variable fsample_config to the (unknown reference) .init.data:(unknown) The variable fsample_config references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: vmlinux.o(.data+0xa484): Section mismatch in reference from the variable ams_delta_config to the (unknown reference) .init.data:(unknown) The variable ams_delta_config references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: vmlinux.o(.data+0xa924): Section mismatch in reference from the variable ams_delta_camera_device to the (unknown reference) .init.data:(unknown) The variable ams_delta_camera_device references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 58dfaba789dbba34b86ed7dbe1aa648294d63f0b Author: Felipe Balbi Date: Thu Jan 27 16:39:41 2011 -0800 arm: omap1: fix compile warnings Fix the following compile warnings: arch/arm/mach-omap1/board-innovator.c:165:3: warning: initialization makes integer from pointer without a cast arch/arm/mach-omap1/board-perseus2.c:305:3: warning: initialization makes integer from pointer without a cast arch/arm/mach-omap1/board-fsample.c:338:3: warning: initialization makes integer from pointer without a cast Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit ae3126edfc7bcef7cc064acc1bf33c3ac148c5df Author: Felipe Balbi Date: Thu Jan 27 16:39:41 2011 -0800 arm: omap1: fix compile warning Fix the following compile warning: arch/arm/mach-omap1/board-palmte.c:233:13: warning: 'palmte_headphones_detect' defined but not used Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 790a26f65bac8ddb7dc4a4685aebe46430a1c9b6 Author: Felipe Balbi Date: Thu Jan 27 16:39:41 2011 -0800 arm: omap: i2c: fix compile warning Fix the following compile warning: arch/arm/plat-omap/i2c.c:120:13: warning: 'omap_pm_set_max_mpu_wakeup_lat_compat' defined but not used arch/arm/plat-omap/i2c.c:125:38: warning: 'omap_i2c_latency' defined but not used Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 59b479e0985f0b795d68331d6443a7f89c47768d Author: Tony Lindgren Date: Thu Jan 27 16:39:40 2011 -0800 omap: Start using CONFIG_SOC_OMAP We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest are nowadays just subcategories of these. Search and replace the following: ARCH_OMAP2420 SOC_OMAP2420 ARCH_OMAP2430 SOC_OMAP2430 ARCH_OMAP3430 SOC_OMAP3430 No functional changes. Signed-off-by: Tony Lindgren Signed-off-by: Thomas Weber Acked-by: Sourav Poddar commit 8571a19c4ac140f1a507f3e7eb716892afa27109 Merge: aae7c47 8d8d3fd Author: David S. Miller Date: Thu Jan 27 16:00:37 2011 -0800 Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit aae7c47311659e5150b740d61c4be418198239fa Author: Denis Kirjanov Date: Thu Jan 27 09:54:12 2011 +0000 sungem: Use net_device's internal stats Use net_device_stats instance from the struct net_device. Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit 13707f9e5e46342b7b16c58be91ad93a476c3ffd Author: Eric Dumazet Date: Wed Jan 26 19:28:23 2011 +0000 drivers/net: remove some rcu sparse warnings Add missing __rcu annotations and helpers. minor : Fix some rcu_dereference() calls in macvtap Signed-off-by: Eric Dumazet Acked-by: Arnd Bergmann Acked-by: Michael Chan Signed-off-by: David S. Miller commit ccf434380d1a67df2dcb9113206b77d0cb0a1cef Author: Eric Dumazet Date: Wed Jan 26 18:08:02 2011 +0000 net: fix dev_seq_next() Commit c6d14c84566d (net: Introduce for_each_netdev_rcu() iterator) added a race in dev_seq_next(). The rcu_dereference() call should be done _before_ testing the end of list, or we might return a wrong net_device if a concurrent thread changes net_device list under us. Note : discovered thanks to a sparse warning : net/core/dev.c:3919:9: error: incompatible types in comparison expression (different address spaces) Signed-off-by: Eric Dumazet CC: Paul E. McKenney Signed-off-by: David S. Miller commit 065825402c058f4a123ddc53dbbe864cc5caaf64 Author: David S. Miller Date: Thu Jan 27 14:58:42 2011 -0800 net: Store ipv4/ipv6 COW'd metrics in inetpeer cache. Please note that the IPSEC dst entry metrics keep using the generic metrics COW'ing mechanism using kmalloc/kfree. This gives the IPSEC routes an opportunity to use metrics which are unique to their encapsulated paths. Signed-off-by: David S. Miller commit 1397e171f143878dd16ad5f8c99f7b9440cc8911 Merge: 144001b 8f2771f Author: David S. Miller Date: Thu Jan 27 14:59:08 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 144001bddcb4db62c2261f1d703d835851031577 Author: David S. Miller Date: Thu Jan 27 13:52:16 2011 -0800 inetpeer: Mark metrics as "new" in fresh inetpeer entries. Set the RTAX_LOCKED metric to INETPEER_METRICS_NEW (basically, all ones) on fresh inetpeer entries. This way code can determine if default metrics have been loaded in from a routing table entry already. Signed-off-by: David S. Miller commit 606598237c856b0c6584c2263288657658140da9 Author: David S. Miller Date: Wed Jan 26 20:55:53 2011 -0800 inetpeer: Add metrics storage to inetpeer entries. Signed-off-by: David S. Miller commit 27e8b237944af967e0a808580278d432cb028455 Author: Konrad Rzeszutek Wilk Date: Thu Dec 2 10:24:13 2010 -0500 ttm: Expand (*populate) to support an array of DMA addresses. We pass in the array of ttm pages to be populated in the GART/MM of the card (or AGP). Patch titled: "ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set." uses the DMA API to make those pages have a proper DMA addresses (in the situation where page_to_phys or virt_to_phys do not give use the DMA (bus) address). Since we are using the DMA API on those pages, we should pass in the DMA address to this function so it can save it in its proper fields (later patches use it). [v2: Added reviewed-by tag] Reviewed-by: Thomas Hellstrom Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Ian Campbell commit 8d8d3fdc0d42be0ba75be227465773a54bb48a0b Author: Felix Fietkau Date: Mon Jan 24 19:11:54 2011 +0100 ath9k: fix misplaced debug code The commit 'ath9k: Add more information to debugfs xmit file.' added more debug counters to ath9k and also added some lines of code to ath9k_hw. Since ath9k_hw is also used by ath9k_htc, its code must not depend on ath9k data structures. In this case it was not fatal, but it's still wrong, so the code needs to be moved back to ath9k. Signed-off-by: Felix Fietkau Cc: Ben Greear Signed-off-by: John W. Linville commit aa32452dcff1f95976fb28b5a28ecc93f47d0472 Author: Christian Lamparter Date: Sun Jan 23 00:18:28 2011 +0100 carl9170: utilize fw seq counter for mgmt/non-QoS data frames "mac80211 will properly assign sequence numbers to QoS-data frames but cannot do so correctly for non-QoS-data and management frames because beacons need them from that counter as well and mac80211 cannot guarantee proper sequencing." Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit c42d6cf25d648d95387d8a881aa0cab657470726 Author: Christian Lamparter Date: Sun Jan 23 00:10:01 2011 +0100 carl9170: enable wake-on-lan feature testing Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 9e09b5c96caf3f201f1dcb31539d6a6b2c36d0f9 Author: Christian Lamparter Date: Sat Jan 22 22:46:49 2011 +0100 carl9170: update fw/hw headers This patch syncs up the header files with the project's main firmware carl9170fw.git. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 69a07f0b117a40fcc1a479358d8e1f41793617f2 Author: Konrad Rzeszutek Wilk Date: Mon Nov 29 14:03:30 2010 -0500 ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set. For pages that have the TTM_PAGE_FLAG_DMA32 flag set we use the DMA API. We save the bus address in our array which we use to program the GART (see "radeon/ttm/PCIe: Use dma_addr if TTM has set it." and "nouveau/ttm/PCIe: Use dma_addr if TTM has set it."). The reason behind using the DMA API is that under Xen we would end up programming the GART with the bounce buffer (SWIOTLB) DMA address instead of the physical DMA address of the TTM page. The reason being that alloc_page with GFP_DMA32 does not allocate pages under the the 4GB mark when running under Xen hypervisor. Under baremetal this means we do the DMA API call earlier instead of when we program the GART. For details please refer to: https://lkml.org/lkml/2011/1/7/251 [v2: Fixed indentation, revised desc, added Reviewed-by] Reviewed-by: Thomas Hellstrom Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Ian Campbell commit f9820a46dd7888b05a36e81166fb1abcc47dcc3f Author: Konrad Rzeszutek Wilk Date: Mon Nov 29 13:52:18 2010 -0500 ttm: Introduce a placeholder for DMA (bus) addresses. This is right now limited to only non-pool constructs. [v2: Fixed indentation issues, add review-by tag] Reviewed-by: Thomas Hellstrom Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Ian Campbell commit 48529b3b7ca76e688146e13d1a1666fe69703f0c Author: Jarkko Nikula Date: Thu Jan 27 16:47:11 2011 +0200 ASoC: omap: rx51: Add stereo output support to audio jack Audio jack in Nokia RX-51/N900 is driven by TPA6130 headphone amplifier. This patch adds support for it and stereo output can be active when "Jack Function" == "TV-OUT" || "Headphone". As the TPA6130 can output very high volume levels the output is limited with snd_soc_limit_volume. Limiting value is found from Maemo kernel sources. Signed-off-by: Jarkko Nikula Cc: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit d380eaaea70d775c0520dcb5702ea5d2a56b7be9 Merge: dda9911 ef1d1af Author: Ingo Molnar Date: Thu Jan 27 19:23:20 2011 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit dda99116969142cc41e945a1047a419b937536af Author: Yinghai Lu Date: Fri Jan 21 15:30:01 2011 -0800 x86, perf: Change two init functions to static init_hw_perf_events() is called via early_initcall now. x86_pmu_event_init is x86_pmu member function. So we can change them to static. Signed-off-by: Yinghai Lu Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <4D3A16F9.109@kernel.org> Signed-off-by: Ingo Molnar commit 5d046af0eb94bdf67f048ba4056e85fa080b4b07 Author: Hartley Sweeten Date: Thu Jan 27 17:29:29 2011 +0100 ARM: 6641/1: ep93xx: implement gpiolib set_debounce for built-in GPIOs GPIO Ports A, B, and F on the ep93xx provide interrupt capability. It is possible to debounce the input signal on these ports when interrupts are enabled. Support for this debounce capability was provided with an ep93xx internal function. Now that gpiolib knows about gpio debounce, use the gpiolib method and do not export the internal function. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit 8c9daae2cfe3b17f946ff998a692bddc9cd3e3b6 Merge: f85a9e0 c73e0c8 Author: Mark Brown Date: Thu Jan 27 15:16:52 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 53cdd3068b7b8e3a1a0e540ec42d9037296243b7 Author: Sascha Hauer Date: Fri Jan 14 11:34:33 2011 +0100 ARM i.MX51 efikamx: remove unnecessary CONFIG_SERIAL_IMX ifdefs Signed-off-by: Sascha Hauer commit 7f16f817e20b187e3130ce16f510971cf8ff5d07 Author: Sascha Hauer Date: Fri Jan 14 11:34:11 2011 +0100 ARM i.MX51 cpuimx51: remove unnecessary CONFIG_SERIAL_8250 ifdefs Signed-off-by: Sascha Hauer commit 818956e0b68f35ef56e9361d0fdea5d935e3827a Author: Sascha Hauer Date: Fri Jan 14 11:31:35 2011 +0100 ARM i.MX51 mx51-3ds: remove unnecessary CONFIG_KEYBOARD_IMX ifdefs Signed-off-by: Sascha Hauer commit 27d2d62b8b03c9dd2de9a367c19812e089da71c5 Author: Sascha Hauer Date: Fri Jan 14 11:30:33 2011 +0100 ARM i.MX51 mx51 babbage: remove unnecessary CONFIG_SERIAL_IMX ifdefs Signed-off-by: Sascha Hauer commit 0c1c8511a39ac980921e1c06b3f5809c7a42b522 Author: Sascha Hauer Date: Fri Jan 14 11:30:18 2011 +0100 ARM i.MX51 mx51 3ds: remove unnecessary CONFIG_SERIAL_IMX ifdefs Signed-off-by: Sascha Hauer commit ea18e137baf3e3e9212bfd7b071555fc712159b5 Author: Jaroslav Kysela Date: Wed Jan 26 11:04:08 2011 +0100 ALSA: Release v1.0.24 Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit 730a5865152be843eea5fe87e2b309623c730435 Author: Jaroslav Kysela Date: Thu Jan 27 13:03:15 2011 +0100 ALSA: hdspm - remove unused arrays, reduce stack usage in hwdep_ioctl Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit f85a9e0d260905f98d4ca6b66f0e64f63a729dba Author: Mark Brown Date: Wed Jan 26 21:41:28 2011 +0000 ASoC: Add subsequence information to seq_notify callbacks Allows drivers to distinguish which subsequence is being notified when they get called back. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit aaee8ef146111566e1c607bdf368d73fb966be2e Author: Mark Brown Date: Wed Jan 26 20:53:50 2011 +0000 ASoC: Make cache status available via debugfs Could just as well live in sysfs but sysfs doesn't have the simple value export helpers debugfs does. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 6f8ab4ac292f81b9246ddf363bf1c6a2fc7a0629 Author: Mark Brown Date: Wed Jan 26 14:59:27 2011 +0000 ASoC: Export card PM callbacks for use in direct registered cards Allow hookup of cards registered directly with the core to the PM operations by exporting the device power management operations to modules, also exporting the default PM operations since it is expected that most cards will end up using exactly the same setup. Note that the callbacks require that the driver data for the card be the snd_soc_card. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e7361ec4996c170c63c4ac379085896db85ff34d Author: Mark Brown Date: Wed Jan 26 14:17:20 2011 +0000 ASoC: Replace pdev with card in machine driver probe and remove In order to support cards instantiated without using soc-audio remove the use of the platform device in the card probe() and remove() ops. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 70b2ac126a60c87145ae8a8eb1b4dccaa0bf5468 Author: Mark Brown Date: Wed Jan 26 14:05:25 2011 +0000 ASoC: Use card rather than soc-audio device to card PM functions The platform device for the card is tied closely to the soc-audio implementation which we're currently trying to remove in favour of allowing cards to have their own devices. Begin removing it by replacing it with the card in the suspend and resume callbacks we give to cards, also taking the opportunity to remove the legacy suspend types which are currently hard coded anyway. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit b49a2a69e561b7bf22f4c081d7c44aa992e51509 Author: Sascha Hauer Date: Fri Jan 14 11:26:25 2011 +0100 ARM i.MX31 pcm037 eet: remove unnecessary CONFIG_SPI_IMX ifdefs Signed-off-by: Sascha Hauer commit 285faa1b5631968aa27e9816f082448bcd2ba044 Author: Sascha Hauer Date: Fri Jan 14 11:25:40 2011 +0100 ARM i.MX27 eukrea mbimx27: remove unnecessary CONFIG_SPI_IMX ifdefs Signed-off-by: Sascha Hauer commit 5ec561afbc44dc8dfe789deafa5bf47da463938a Author: Sascha Hauer Date: Fri Jan 14 11:23:44 2011 +0100 ARM i.MX27 pca100: remove unnecessary CONFIG_SPI_IMX ifdefs Signed-off-by: Sascha Hauer commit 9f43e44be8787ddc01652dfc4331b34ae1475426 Author: Sascha Hauer Date: Fri Jan 14 11:22:31 2011 +0100 ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_8250 ifdefs Signed-off-by: Sascha Hauer commit 889faeaad0333f692f8acd870faeaa01bf1fc21d Author: Sascha Hauer Date: Fri Jan 14 11:21:59 2011 +0100 ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_IMX ifdefs Signed-off-by: Sascha Hauer commit afc11e6ef7547243f1429cce8de616049439a172 Author: Sascha Hauer Date: Fri Jan 14 11:21:26 2011 +0100 ARM i.MX31 mx31ads: remove unnecessary CONFIG_I2C ifdefs Signed-off-by: Sascha Hauer commit 070ed7335961825f6c1a137b929c67627c31c907 Author: Sascha Hauer Date: Fri Jan 14 11:19:35 2011 +0100 ARM i.MX35 pcm043: put usbh1 outside CONFIG_USB_ULPI The usbh1 port of the pcm043 does not use ulpi, so put it outside the corresponding ifdefs. Signed-off-by: Sascha Hauer commit 0fbfd987ffd5e0b0d137a5684d4865bb1efac6a3 Author: Sascha Hauer Date: Fri Jan 14 11:18:02 2011 +0100 ARM i.MX35 pcm043: remove unnecessary CONFIG_I2C ifdefs Signed-off-by: Sascha Hauer commit 5756e9dd0de6d5c307773f8f734c0684b3098fdd Author: Dave Martin Date: Wed Jan 26 18:34:26 2011 +0100 ARM: 6640/1: Thumb-2: Symbol manipulation macros for function body copying In low-level board support code, there is sometimes a need to copy a function body to another location at run-time. A straightforward call to memcpy doesn't work in Thumb-2, because bit 0 of external Thumb function symbols is set to 1, indicating that the function is Thumb. Without corrective measures, this will cause an off-by-one copy, and the copy may be called using the wrong instruction set. This patch adds an fncpy() macro to help with such copies. Particular care is needed, because C doesn't guarantee any defined behaviour when casting a function pointer to any other type. This has been observed to lead to strange optimisation side-effects when doing the arithmetic which is required in order to copy/move function bodies correctly in Thumb-2. Thanks to Russell King and Nicolas Pitre for their input on this patch. Signed-off-by: Dave Martin Tested-by: Jean Pihet Tested-by: Tony Lindgren Tested-by: Kevin Hilman Signed-off-by: Russell King commit 6ea72f12069306b235151c5b05ac0cca7e1dedfa Author: Peter Zijlstra Date: Wed Jan 26 13:36:03 2011 +0100 sched: Avoid expensive initial update_cfs_load(), on UP too Fix the build on UP. Signed-off-by: Peter Zijlstra Cc: Paul Turner LKML-Reference: <20110122044852.102126037@google.com> Signed-off-by: Ingo Molnar commit d123375425d7df4b6081a631fc1203fceafa59b2 Author: Thomas Gleixner Date: Wed Jan 26 21:32:01 2011 +0100 rwsem: Remove redundant asmregparm annotation Peter Zijlstra pointed out, that the only user of asmregparm (x86) is compiling the kernel already with -mregparm=3. So the annotation of the rwsem functions is redundant. Remove it. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: David Howells Cc: Benjamin Herrenschmidt Cc: Matt Turner Cc: Tony Luck Cc: Heiko Carstens Cc: Paul Mundt Cc: David Miller Cc: Chris Zankel LKML-Reference: Signed-off-by: Thomas Gleixner commit aac72277fda6ef788bb8d5deaa502ce9b9b6e472 Author: Thomas Gleixner Date: Wed Jan 26 20:06:06 2011 +0000 rwsem: Move duplicate function prototypes to linux/rwsem.h All architecture specific rwsem headers carry the same function prototypes. Just x86 adds asmregparm, which is an empty define on all other architectures. S390 has a stale rwsem_downgrade_write() prototype. Remove the duplicates and add the prototypes to linux/rwsem.h Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: David Howells Cc: Benjamin Herrenschmidt Cc: Richard Henderson Acked-by: Tony Luck Acked-by: Heiko Carstens Cc: Paul Mundt Acked-by: David Miller Cc: Chris Zankel LKML-Reference: <20110126195833.970840140@linutronix.de> Signed-off-by: Thomas Gleixner commit 41e5887fa39ab272d9266a09cbefdef270e28b93 Author: Thomas Gleixner Date: Wed Jan 26 20:06:03 2011 +0000 rwsem: Unify the duplicate rwsem_is_locked() inlines Instead of having the same implementation in each architecture, move it to linux/rwsem.h and remove the duplicates. It's unlikely that an arch will ever implement something different, but we can deal with that when it happens. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: David Howells Cc: Benjamin Herrenschmidt Cc: Matt Turner Acked-by: Tony Luck Acked-by: Heiko Carstens Cc: Paul Mundt Acked-by: David Miller Cc: Chris Zankel LKML-Reference: <20110126195833.876773757@linutronix.de> Signed-off-by: Thomas Gleixner commit 12249b34414dba7f386aadcf6be7ca36c6878300 Author: Thomas Gleixner Date: Wed Jan 26 20:06:00 2011 +0000 rwsem: Move duplicate init macros and functions to linux/rwsem.h The rwsem initializers and related macros and functions are mostly the same. Some of them lack the lockdep initializer, but having it in place does not matter for architectures which do not support lockdep. powerpc, sparc, x86: No functional change sh, s390: Removes the duplicate init_rwsem (inline and #define) alpha, ia64, xtensa: Use the lockdep capable init function in lib/rwsem.c which is just uninlining the init function for the LOCKDEP=n case Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: David Howells Cc: Benjamin Herrenschmidt Cc: Matt Turner Acked-by: Tony Luck Acked-by: Heiko Carstens Cc: Paul Mundt Acked-by: David Miller Cc: Chris Zankel LKML-Reference: <20110126195833.771812729@linutronix.de> commit 1c8ed640d918290ddc1de5ada02ef6686a733c9f Author: Thomas Gleixner Date: Wed Jan 26 20:05:56 2011 +0000 rwsem: Move duplicate struct rwsem declaration to linux/rwsem.h The difference between these declarations is the data type of the count member and the lack of lockdep in some architectures/ long is equivivalent to signed long and the #ifdef guarded dep_map member does not hurt anyone. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: David Howells Cc: Benjamin Herrenschmidt Cc: Matt Turner Acked-by: Tony Luck Acked-by: Heiko Carstens Cc: Paul Mundt Acked-by: David Miller Cc: Chris Zankel LKML-Reference: <20110126195833.679641914@linutronix.de> Signed-off-by: Thomas Gleixner commit bde11efbc21ea84c3351464a422b467eaefabb9a Author: Thomas Gleixner Date: Wed Jan 26 20:05:53 2011 +0000 x86: Cleanup rwsem_count_t typedef Remove the typedef which has no real reason to be there. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: David Howells Cc: Benjamin Herrenschmidt Cc: Matt Turner Cc: Tony Luck Cc: Heiko Carstens Cc: Paul Mundt Cc: David Miller Cc: Chris Zankel LKML-Reference: <20110126195833.580335506@linutronix.de> commit c16a87ce063f79e0ec7d25ce2950e1bc6db03c72 Author: Thomas Gleixner Date: Wed Jan 26 20:05:50 2011 +0000 rwsem: Cleanup includes All rwsem implementations include the same headers. Include them from include/linux/rwsem.h Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: David Howells Cc: Benjamin Herrenschmidt Cc: Matt Turner Acked-by: Tony Luck Acked-by: Heiko Carstens Cc: Paul Mundt Acked-by: David Miller Cc: Chris Zankel LKML-Reference: <20110126195833.483520950@linutronix.de> commit d04fa5a3ba06c3b7a1c4a6860d0fa4825507a755 Author: Thomas Gleixner Date: Sun Jan 23 15:30:09 2011 +0100 locking: Remove deprecated lock initializers Last users are gone. Remove the left overs. Signed-off-by: Thomas Gleixner commit 10389a15e25fd4784d42de7e0e3fc8c242f2011d Author: Thomas Gleixner Date: Sun Jan 23 15:25:56 2011 +0100 cred: Replace deprecated spinlock initialization SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant instead. Signed-off-by: Thomas Gleixner commit 92578c0b8078f6919f9b47e7e16a1cf770bd127b Author: Thomas Gleixner Date: Sun Jan 23 15:24:55 2011 +0100 kthread: Replace deprecated spinlock initialization SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant instead. Signed-off-by: Thomas Gleixner commit 235454c99851ba21038061b9acf38d1a636068c5 Author: Thomas Gleixner Date: Sun Jan 23 15:23:14 2011 +0100 xtensa: Replace deprecated spinlock initialization SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant instead. Signed-off-by: Thomas Gleixner Cc: Chris Zankel commit 22e650045899011b028e40625bc73df9f3260bac Author: Thomas Gleixner Date: Sun Jan 23 15:21:25 2011 +0100 um: Replace deprecated spinlock initialization SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant instead. Signed-off-by: Thomas Gleixner Cc: Jeff Dike commit 24774fbdeab8f6ac05a19e81bd645b0f7e5d2bb7 Author: Thomas Gleixner Date: Sun Jan 23 15:19:12 2011 +0100 sparc: Replace deprecated spinlock initialization SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant instead. Signed-off-by: Thomas Gleixner Acked-by: David S. Miller commit 7424cdf77b1b2975d82619084f20f0055f715166 Author: Thomas Gleixner Date: Sun Jan 23 15:16:35 2011 +0100 mips: Replace deprecated spinlock initialization SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant instead. Signed-off-by: Thomas Gleixner Cc: Ralf Baechle commit e41c8ab174f47ed5ed10a365482d0d7b0e352beb Author: Thomas Gleixner Date: Sun Jan 23 15:14:15 2011 +0100 cris: Replace deprecated spinlock initialization SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant instead. Signed-off-by: Thomas Gleixner Cc: Jesper Nilsson commit 61bb46082775acd18c712607615a8b7dbeff7873 Author: Thomas Gleixner Date: Sun Jan 23 15:10:51 2011 +0100 alpha: Replace deprecated spinlock initialization SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant instead. Signed-off-by: Thomas Gleixner Cc: Matt Turner commit f97b12cce6dea51880a6a89d4607c29c70a6a841 Merge: ccaa8d6 1bae4ce Author: Thomas Gleixner Date: Thu Jan 27 12:29:13 2011 +0100 Merge commit 'v2.6.38-rc2' into core/locking Reason: Update to mainline before adding the locking cleanup Signed-off-by: Thomas Gleixner commit 55a57606b26665870f2993dc53a43daad157dbcd Author: Adrian Knoth Date: Thu Jan 27 11:23:15 2011 +0100 ALSA: [hdspm] Move static mapping arrays to .c As requested by Takashi and Jaroslav, these arrays should not be in the header file. Signed-off-by: Adrian Knoth Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit fbcdf3343bc8a1272092cf6d164516b76505708b Author: Adrian Knoth Date: Wed Jan 26 19:32:15 2011 +0100 ALSA: hdspm - Add RayDAT and AIO strings to Kconfig Inform users about the newly added support for RayDAT and AIO. Signed-off-by: Adrian Knoth Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit 0dca1793063c28dde8f6c49c9c72203fe5cb6efc Author: Adrian Knoth Date: Wed Jan 26 19:32:14 2011 +0100 ALSA: hdspm - Add support for RME RayDAT and AIO Incorporate changes by Florian Faber into hdspm.c. Code taken from http://wiki.linuxproaudio.org/index.php/Driver:hdspe Heavily reworked to mostly comply with the coding standard (whitespace fixes, line width, C++ style comments) The code was tested and confirmed to be working on RME RayDAT. Signed-off-by: Adrian Knoth Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit 21dd373486956d7789ffd878347c36efad16923d Author: Chris Wilson Date: Wed Jan 26 15:55:56 2011 +0000 drm/i915: Defer reporting EIO until we try to use the GPU Instead of reporting EIO upfront in the entrance of an ioctl that may or may not attempt to use the GPU, defer the actual detection of an invalid ioctl to when we issue a GPU instruction. This allows us to continue to use bo in video memory (via pread/pwrite and mmap) after the GPU has hung. Signed-off-by: Chris Wilson commit e110e8d672c9e6e395a5c8bfa3444899b85181ed Author: Chris Wilson Date: Wed Jan 26 15:39:14 2011 +0000 drm/i915: Check wedged status before throttling Signed-off-by: Chris Wilson commit 705ca147176090203afd7503392e6e770637499b Author: Thomas Jacob Date: Thu Jan 27 10:56:32 2011 +0100 netfilter: xt_iprange: typo in IPv4 match debug print code Signed-off-by: Thomas Jacob Signed-off-by: Patrick McHardy commit 62fa8a846d7de4b299232e330c74b7783539df76 Author: David S. Miller Date: Wed Jan 26 20:51:05 2011 -0800 net: Implement read-only protection and COW'ing of metrics. Routing metrics are now copy-on-write. Initially a route entry points it's metrics at a read-only location. If a routing table entry exists, it will point there. Else it will point at the all zero metric place-holder called 'dst_default_metrics'. The writeability state of the metrics is stored in the low bits of the metrics pointer, we have two bits left to spare if we want to store more states. For the initial implementation, COW is implemented simply via kmalloc. However future enhancements will change this to place the writable metrics somewhere else, in order to increase sharing. Very likely this "somewhere else" will be the inetpeer cache. Note also that this means that metrics updates may transiently fail if we cannot COW the metrics successfully. But even by itself, this patch should decrease memory usage and increase cache locality especially for routing workloads. In those cases the read-only metric copies stay in place and never get written to. TCP workloads where metrics get updated, and those rare cases where PMTU triggers occur, will take a very slight performance hit. But that hit will be alleviated when the long-term writable metrics move to a more sharable location. Since the metrics storage went from a u32 array of RTAX_MAX entries to what is essentially a pointer, some retooling of the dst_entry layout was necessary. Most importantly, we need to preserve the alignment of the reference count so that it doesn't share cache lines with the read-mostly state, as per Eric Dumazet's alignment assertion checks. The only non-trivial bit here is the move of the 'flags' member into the writeable cacheline. This is OK since we are always accessing the flags around the same moment when we made a modification to the reference count. Signed-off-by: David S. Miller commit 335d7c58fcc1b71387a2c38b610b08bb9d3a6fcc Author: Guenter Roeck Date: Wed Jan 26 11:45:49 2011 -0800 i2c/busses: Add support for Diolan U2C-12 USB-I2C adapter This patch adds support for the Diolan U2C-12 USB-I2C adapter. It also updates MAINTAINERS to list the author as maintainer. Signed-off-by: Guenter Roeck Signed-off-by: Ben Dooks commit b4e69ac670d71b5748dc81e536b2cb103489badd Merge: 144ce87 7cc2edb Author: David S. Miller Date: Wed Jan 26 13:49:30 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 851492c6585ac10367df7880fb0001f529fa8d5c Merge: ba5499e 50ede4e Author: David Brown Date: Wed Jan 26 13:29:22 2011 -0800 Merge branch 'msm-8960' into msm-core * msm-8960: msm: Support for the MSM8960 RUMI3 target msm: Support for the MSM8960 Simulator target msm: Makefile cleanup msm: timer: Timer support for MSM8960 msm: Add MSM 8960 cpu_is check msm: irqs-8960: Interrupt map for MSM8960 msm: Physical offset for MSM8960 msm: io: I/O register definitions for MSM8960 msm: Generalize QGIC registers msm: Generalize timer register mappings msm: Add CPU queries commit 436d0d985383a2ede326f8ec5117d185690dc3f3 Author: Mohammed Shafi Shajakhan Date: Fri Jan 21 14:03:24 2011 +0530 ath9k: clean up enums and unused macros Remove unused macros and cleanup buffer_type enumeration Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit ba99d93b3d7bb3a6406bc86f41ab863895968a0f Author: Johannes Berg Date: Wed Jan 26 09:22:15 2011 +0100 mac80211: use DECLARE_EVENT_CLASS For events that include only the local struct as their parameter, we can use DECLARE_EVENT_CLASS and save quite some binary size across segments as well lines of code. text data bss dec hex filename 375745 19296 916 395957 60ab5 mac80211.ko.before 367473 17888 916 386277 5e4e5 mac80211.ko.after -8272 -1408 0 -9680 -25d0 delta Some more tracepoints with identical arguments could be combined like this but for now this is the one that benefits most. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 144ce879b057c760194d808c90826cd96308f423 Author: Eric Dumazet Date: Wed Jan 26 07:21:57 2011 +0000 net_sched: sch_mqprio: dont leak kernel memory mqprio_dump() should make sure all fields of struct tc_mqprio_qopt are initialized. Signed-off-by: Eric Dumazet CC: John Fastabend Signed-off-by: David S. Miller commit 62362dee83c2a50465cc64ba701ebd741996ec80 Merge: 97d9c3a f35c0c5 Author: John W. Linville Date: Wed Jan 26 16:12:47 2011 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 5d350cba486de34eff99d0394d8fb436af54522e Author: Russell King Date: Thu Jan 13 22:25:10 2011 +0000 ALSA: AACI: make fifo variables more explanitory Improve commenting and change fifo variable names to reflect their meanings. Signed-off-by: Russell King commit ea51d0b164040ad594c1f9c4c6faf23c19c977b9 Author: Russell King Date: Thu Jan 13 08:47:35 2011 +0000 ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period There is no need to call snd_pcm_period_elapsed() each time a period elapses - we can call it after we're done once loading/unloading the FIFO with data. ALSA works out how many periods have elapsed by reading the current pointers. Signed-off-by: Russell King commit c0dea82c3c141c33ca22ca85f80e592028840864 Author: Russell King Date: Thu Jan 13 00:34:08 2011 +0000 ALSA: AACI: use snd_pcm_lib_period_bytes() Use the helper rather than open-coding this. Signed-off-by: Russell King commit f006d8fc53c461aa66a9265597494f83ddf4f53d Author: Russell King Date: Wed Jan 12 23:46:03 2011 +0000 ALSA: AACI: clean up AACI announcement printk Make the AACI announcement printk say which primecell part number has been found. Display the revision as an unsigned decimal, and display only the first 8 hex digits of the base address unless it's larger. Signed-off-by: Russell King commit 58e8a4741b519910cdabdd55c23f258e40cf6a3a Author: Russell King Date: Wed Jan 26 16:59:39 2011 +0000 ALSA: AACI: fix channel mask selection When double-rate mode was selected, we weren't setting the additional two channel mask bits to allow double-rate to work. Rearrange the hw_params code to allow the correct channel mask to be selected. Signed-off-by: Russell King commit 16af7d60aa27d3fc39e46fd456b8e33d34d60437 Author: Mark Brown Date: Wed Jan 26 11:35:28 2011 +0000 ASoC: Staticise non-exported symbols in cs4271 Signed-off-by: Mark Brown Acked-by: Alexander Sverdlin Acked-by: Liam Girdwood commit d37adaa1596246929f7ab49843fd124595506175 Author: Tejun Heo Date: Wed Jan 26 17:42:27 2011 +0100 fs/aio: aio_wq isn't used in memory reclaim path aio_wq isn't used during memory reclaim. Convert to alloc_workqueue() without WQ_MEM_RECLAIM. It's possible to use system_wq but given that the number of work items is determined from userland and the work item may block, enforcing strict concurrency limit would be a good idea. Also, move fput_work to system_wq so that aio_wq is used soley to throttle the max concurrency of aio work items and fput_work doesn't interact with other work items. Signed-off-by: Tejun Heo Acked-by: Jeff Moyer Cc: Benjamin LaHaise Cc: linux-aio@kvack.org commit 2e0348c449683a837644bb0027dbe5940b150c25 Merge: 9f4e1cc ad86e1f Author: Patrick McHardy Date: Wed Jan 26 16:28:45 2011 +0100 Merge branch 'connlimit' of git://dev.medozas.de/linux commit ccaa8d657117bb1876d471bd91579d774106778d Author: Arnd Bergmann Date: Tue Jan 25 23:17:32 2011 +0100 rtmutex-tester: Remove BKL tests The BKL is going away, no need to test it any more. I left the definitions of the test case numbers in, so that the other tests do not get renumbered. Signed-off-by: Arnd Bergmann Cc: Arjan van de Ven Cc: Ingo Molnar Cc: Andrew Morton LKML-Reference: <1295993854-4971-19-git-send-email-arnd@arndb.de> Signed-off-by: Thomas Gleixner commit ad86e1f27a9a97a9e50810b10bca678407b1d6fd Author: Jan Engelhardt Date: Wed Jan 26 11:50:03 2011 +0100 netfilter: xt_connlimit: pick right dstaddr in NAT scenario xt_connlimit normally records the "original" tuples in a hashlist (such as "1.2.3.4 -> 5.6.7.8"), and looks in this list for iph->daddr when counting. When the user however uses DNAT in PREROUTING, looking for iph->daddr -- which is now 192.168.9.10 -- will not match. Thus in daddr mode, we need to record the reverse direction tuple ("192.168.9.10 -> 1.2.3.4") instead. In the reverse tuple, the dst addr is on the src side, which is convenient, as count_them still uses &conn->tuple.src.u3. Signed-off-by: Jan Engelhardt commit da7a735e51f9622eb3e1672594d4a41da01d7e4f Author: Peter Zijlstra Date: Mon Jan 17 17:03:27 2011 +0100 sched: Fix switch_from_fair() When a task is taken out of the fair class we must ensure the vruntime is properly normalized because when we put it back in it will assume to be normalized. The case that goes wrong is when changing away from the fair class while sleeping. Sleeping tasks have non-normalized vruntime in order to make sleeper-fairness work. So treat the switch away from fair as a wakeup and preserve the relative vruntime. Also update sysrq-n to call the ->switch_{to,from} methods. Reported-by: Onkalo Samu Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit a8941d7ec81678fb69aea7183338175f112f3e0d Author: Peter Zijlstra Date: Tue Jan 25 16:30:03 2011 +0100 sched: Simplify the idle scheduling class Since commit 48c5ccae88dcd (sched: Simplify cpu-hot-unplug task migration) this should no longer happen, so remove the code. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 414bee9ba613adb3804965e2d84db32d0599f9c6 Author: Venkatesh Pallipadi Date: Tue Dec 21 17:09:04 2010 -0800 softirqs: Account ksoftirqd time as cpustat softirq softirq time in ksoftirqd context is not accounted in ns granularity per cpu softirq stats, as we want that to be a part of ksoftirqd exec_runtime. Accounting them as softirq on /proc/stat separately. Tested-by: Shaun Ruffell Signed-off-by: Venkatesh Pallipadi Signed-off-by: Peter Zijlstra LKML-Reference: <1292980144-28796-6-git-send-email-venki@google.com> Signed-off-by: Ingo Molnar commit abb74cefa9c682fb38ba86c17ca3c86fed6cc464 Author: Venkatesh Pallipadi Date: Tue Dec 21 17:09:03 2010 -0800 sched: Export ns irqtimes through /proc/stat CONFIG_IRQ_TIME_ACCOUNTING adds ns granularity irq time on each CPU. This info is already used in scheduler to do proper task chargeback (earlier patches). This patch retro-fits this ns granularity hardirq and softirq information to /proc/stat irq and softirq fields. The update is still done on timer tick, where we look at accumulated ns hardirq/softirq time and account the tick to user/system/irq/hardirq/guest accordingly. No new interface added. Earlier versions looked at adding this as new fields in some /proc files. This one seems to be the best in terms of impact to existing apps, even though it has somewhat more kernel code than earlier versions. Tested-by: Shaun Ruffell Signed-off-by: Venkatesh Pallipadi Signed-off-by: Peter Zijlstra LKML-Reference: <1292980144-28796-5-git-send-email-venki@google.com> Signed-off-by: Ingo Molnar commit 70a89a6620f658d47a1488515bada4b8ee6291d8 Author: Venkatesh Pallipadi Date: Tue Dec 21 17:09:02 2010 -0800 sched: Refactor account_system_time separating id-update Refactor account_system_time, to separate out the logic of identifying the update needed and code that does actual update. This is used by following patch for IRQ_TIME_ACCOUNTING, which has different identification logic and same update logic. Tested-by: Shaun Ruffell Signed-off-by: Venkatesh Pallipadi Signed-off-by: Peter Zijlstra LKML-Reference: <1292980144-28796-4-git-send-email-venki@google.com> Signed-off-by: Ingo Molnar commit a1dabb6bfffccb897eff3e1d102dacf2a4bedf3b Author: Venkatesh Pallipadi Date: Tue Dec 21 17:09:01 2010 -0800 time: Add nsecs_to_cputime64 interface for asm-generic Add nsecs_to_cputime64 interface. This is used in following patches that updates cpu irq stat based on ns granularity info in IRQ_TIME_ACCOUNTING. Tested-by: Shaun Ruffell Signed-off-by: Venkatesh Pallipadi Signed-off-by: Peter Zijlstra LKML-Reference: <1292980144-28796-3-git-send-email-venki@google.com> Signed-off-by: Ingo Molnar commit 4dd53d891ca46dcc1fde0376a33540d3fd83cb9a Author: Venkatesh Pallipadi Date: Tue Dec 21 17:09:00 2010 -0800 softirqs: Free up pf flag PF_KSOFTIRQD Cleanup patch, freeing up PF_KSOFTIRQD and use per_cpu ksoftirqd pointer instead, as suggested by Eric Dumazet. Tested-by: Shaun Ruffell Signed-off-by: Venkatesh Pallipadi Signed-off-by: Peter Zijlstra LKML-Reference: <1292980144-28796-2-git-send-email-venki@google.com> Signed-off-by: Ingo Molnar commit f07333bf6ee66d9b49286cec4371cf375e745b7a Author: Paul Turner Date: Fri Jan 21 20:45:03 2011 -0800 sched: Avoid expensive initial update_cfs_load() Since cfs->{load_stamp,load_last} are zero-initalized the initial load update will consider the delta to be 'since the beginning of time'. This results in a lot of pointless divisions to bring this large period to be within the sysctl_sched_shares_window. Fix this by initializing load_stamp to be 1 at cfs_rq initialization, this allows for an initial load_stamp > load_last which then lets standard idle truncation proceed. We avoid spinning (and slightly improve consistency) by fixing delta to be [period - 1] in this path resulting in a slightly more predictable shares ramp. (Previously the amount of idle time preserved by the overflow would range between [period/2,period-1].) Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20110122044852.102126037@google.com> Signed-off-by: Ingo Molnar commit 6d5ab2932a21ea54406ab95c43ecff90a3eddfda Author: Paul Turner Date: Fri Jan 21 20:45:01 2011 -0800 sched: Simplify update_cfs_shares parameters Re-visiting this: Since update_cfs_shares will now only ever re-weight an entity that is a relative parent of the current entity in enqueue_entity; we can safely issue the account_entity_enqueue relative to that cfs_rq and avoid the requirement for special handling of the enqueue case in update_cfs_shares. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20110122044851.915214637@google.com> Signed-off-by: Ingo Molnar commit f17c13ca52d5c5a6a164536244a6debb8cd17983 Author: Kuninori Morimoto Date: Mon Jan 24 10:43:19 2011 +0900 ASoC: sh: fsi: modify selection method of I2S/PCM/SPDIF format Current format selection of FSI-codecs depended on platform information for FSI, and chip default settings for codecs. It is not understandable/formal method. This patch modify FSI and FSI-codecs to use snd_soc_dai_set_fmt. But FSI can use I2S/PCM and SPDIF format today. It can be selected to I2S/PCM by snd_soc_dai_set_fmt, but can not select SPDIF. So, this patch change FSI platform information to have DAI/SPDIF mode. If platform selects DAI mode (default), FSI-codecs can select I2S/PCM by snd_soc_dai_set_fmt, and if it is SPDIF mode, FSI become SPDIF format. Signed-off-by: Kuninori Morimoto Acked-by: Paul Mundt Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d7c5762bc72ea4184c413166c063899dffae7385 Author: Kuninori Morimoto Date: Mon Jan 24 10:42:33 2011 +0900 ASoC: sh: fsi: free from NULL pointer of struct sh_fsi_platform_info Current FSI driver assumed master->info is not NULL. This patch allow NULL in master->info Signed-off-by: Kuninori Morimoto Acked-by: Paul Mundt Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 160afa7f05ef4922b136335cd1793b607ffb0d7c Author: Kuninori Morimoto Date: Mon Jan 24 10:42:08 2011 +0900 ASoC: sh: fsi: move chan_num from fsi_stream to fsi_priv Signed-off-by: Kuninori Morimoto Acked-by: Paul Mundt Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1c1e8646963e319132b4cf551fbfd10b364d0aed Author: Tejun Heo Date: Wed Jan 26 12:12:50 2011 +0100 input/tps6507x-ts: use system_wq instead of dedicated workqueue With cmwq, there's no reason to use a separate workqueue. Drop tps6507x_ts->wq and use system_wq instead. Signed-off-by: Tejun Heo Acked-by: Todd Fischer Acked-by: Dmitry Torokhov Cc: linux-input@vger.kernel.org Cc: Dan Carpenter commit 57df5573a56322e6895451f759c19e875252817d Author: Tejun Heo Date: Wed Jan 26 12:12:50 2011 +0100 cpufreq: use system_wq instead of dedicated workqueues With cmwq, there's no reason for cpufreq drivers to use separate workqueues. Remove the dedicated workqueues from cpufreq_conservative and cpufreq_ondemand and use system_wq instead. The work items are already sync canceled on stop, so it's already guaranteed that no work is running on module exit. Signed-off-by: Tejun Heo Acked-by: Dave Jones Cc: cpufreq@vger.kernel.org commit bcb6d9161d1720cf68c7f4de0630e91cb95ee60c Author: Tejun Heo Date: Wed Jan 26 12:12:50 2011 +0100 wireless/ipw2x00: use system_wq instead of dedicated workqueues With cmwq, there's no reason to use separate workqueues in ipw2x00 drivers. Drop them and use system_wq instead. All used work items are sync canceled on driver detach. Signed-off-by: Tejun Heo Acked-by: "John W. Linville" Cc: linux-wireless@vger.kernel.org commit c48730056f69db30c075236f4ee2bc9d3f4f9985 Author: Tejun Heo Date: Wed Jan 26 12:12:50 2011 +0100 arm/omap: use system_wq in mailbox With cmwq, there's no reason to use a separate workqueue for mailbox. Use the system_wq instead. mbox->rxq->work is sync flushed in omap_mbox_fini() to make sure it's not running on any cpu, which makes sure that no mbox work is running when omap_mbox_exit() is entered. Signed-off-by: Tejun Heo Acked-by: Hari Kanigeri Cc: Tony Lindgren Cc: linux-omap@vger.kernel.org commit 1a3665c81df32b23c38d4ba8a74761551d5673b1 Author: Chris Wilson Date: Tue Jan 25 13:59:37 2011 +0000 drm/i915/sdvo: Add BUILD_BUG_ON to warn if the structs are ever miscompiled Signed-off-by: Chris Wilson commit bc65212c36421193e368565c20410c1c4a909720 Author: Chris Wilson Date: Tue Jan 25 13:28:29 2011 +0000 drm/i915/sdvo: Use a compact test for determining a multi-function device Signed-off-by: Chris Wilson commit e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd Merge: 8f5585e 1da09c4 6b62047 Author: Paul Mundt Date: Wed Jan 26 18:24:18 2011 +0900 Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest commit 6b620478e58677bb3f4ec884abb29ef9d68c7821 Merge: 906b17d 6fb1b30 Author: Paul Mundt Date: Wed Jan 26 18:23:27 2011 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework commit 2fff570e7c8f97e411cd852d64b77b92d9ab8da9 Author: Artem Bityutskiy Date: Fri Dec 3 15:32:21 2010 +0200 UBI: add a commentary about allocating VID header buffer on stack Signed-off-by: Artem Bityutskiy commit e8cfe009436f9ab6f4234e1f7c406c231747925c Author: John Ogness Date: Fri Jan 21 15:39:02 2011 +0100 UBI: cleanup LEB start calculations Wrong macro was used in calculating the data offset: UBI_EC_HDR_SIZE instead of UBI_VID_HDR_SIZE. The data offset should be VID header offset + VID header size (aligned to the minimum I/O unit). This was not a bug only because currently UBI_EC_HDR_SIZE and UBI_VID_HDR_SIZE have the same value of 64 bytes. Commit message was amended by Artem. Signed-off-by: John Ogness Signed-off-by: Artem Bityutskiy commit d4c6381303163e774a72db8c172cdc5c23f01588 Author: Holger Brunck Date: Tue Jan 25 13:04:11 2011 +0200 UBI: fix NOR erase preparation quirk In 'nor_erase_prepare()' we want to make sure the UBI headers are corrupted. But it is possible that one of the headers just contains all 0xFFs, which is also OK, because UBI will erase it in case of a power cut. Signed-off-by: Holger Brunck Signed-off-by: Artem Bityutskiy commit 792363d2beceb1c7d865e517fa9939c8b8c1442a Author: Yinghai Lu Date: Fri Jan 21 15:29:54 2011 -0800 x86: Don't copy per_cpu cpuinfo for BSP two times smp_store_cpu_info(0) will do that. Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: Tejun Heo Cc: Borislav Petkov LKML-Reference: <4D3A16F2.5090902@kernel.org> Signed-off-by: Ingo Molnar commit b3d7336db553d318e7ec042eb50a70d307013339 Author: Yinghai Lu Date: Fri Jan 21 15:29:44 2011 -0800 x86: Move llc_shared_map out of cpu_info cpu_info is already with per_cpu, We can take llc_shared_map out of cpu_info, and declare it as per_cpu variable directly. So later referencing could be simple and directly instead of diving to find cpu_info at first. Also could make smp_store_cpu_info() much simple to avoid to do save and restore trick. Signed-off-by: Yinghai Lu Cc: Hans Rosenfeld Cc: Alok N Kataria Cc: Stephen Hemminger Cc: Hans J. Koch Cc: Tejun Heo Cc: Borislav Petkov Cc: Andreas Herrmann Cc: Robert Richter Cc: Suresh Siddha LKML-Reference: <4D3A16E8.5020608@kernel.org> Signed-off-by: Ingo Molnar commit 376e9c5848abef8c72c09bd89f2f7ee128caa104 Author: Shawn Guo Date: Mon Jan 24 17:05:25 2011 +0800 ARM: mxs: add initial pm support This is a very initial pm support and basically does nothing. With this pm support entry, drivers can start testing their own pm functions. Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 41b2610c3443e6c4760e61fc10eef73f96f9f6a5 Author: Hans Rosenfeld Date: Mon Jan 24 16:05:42 2011 +0100 x86, amd: Extend AMD northbridge caching code to support "Link Control" devices "Link Control" devices (NB function 4) will be used by L3 cache partitioning on family 0x15. Signed-off-by: Hans Rosenfeld Cc: LKML-Reference: <1295881543-572552-4-git-send-email-hans.rosenfeld@amd.com> Signed-off-by: Ingo Molnar commit b453de02b786c63b8928ec822401468131db0a9b Author: Hans Rosenfeld Date: Mon Jan 24 16:05:41 2011 +0100 x86, amd: Enable L3 cache index disable on family 0x15 AMD family 0x15 CPUs support L3 cache index disable, so enable it on them. Signed-off-by: Hans Rosenfeld Cc: LKML-Reference: <1295881543-572552-3-git-send-email-hans.rosenfeld@amd.com> Signed-off-by: Ingo Molnar commit d518573de63fb119e5e9a3137386544671387681 Author: Andreas Herrmann Date: Mon Jan 24 16:05:40 2011 +0100 x86, amd: Normalize compute unit IDs on multi-node processors On multi-node CPUs we don't need the socket wide compute unit ID but the node-wide compute unit ID. Thus we need to normalize the value. This is similar to what we do with cpu_core_id. A compute unit is then identified by physical_package_id, node_id, and compute_unit_id. Signed-off-by: Andreas Herrmann LKML-Reference: <1295881543-572552-2-git-send-email-hans.rosenfeld@amd.com> Signed-off-by: Ingo Molnar commit af109f2e323e9dc6aeb49962e3bc0237ce653cb9 Author: Sutharsan Ramamoorthy Date: Tue Jan 25 21:11:50 2011 -0800 Staging: Westbridge: fix EXPORT_SYMBOL errors reported by checkpatch.pl This patch fixes errors reported by checkpatch.pl in westbridge device controller driver in the staging tree. File containing EXPORT_SYMBOL() macros for all the APIs exported by the westbridge software has been removed. EXPORT_SYMBOL() macros are added after the corresponding function definitions. Signed-off-by: Sutharsan Ramamoorthy Signed-off-by: Greg Kroah-Hartman commit 682a1694115ec1c8fcd794c35b80354166978207 Author: Thomas Chou Date: Tue Jan 25 19:22:05 2011 +0000 smc91x: add devicetree support Signed-off-by: Thomas Chou Reviewed-by: Grant Likely Signed-off-by: David S. Miller commit b86fb2cfe82fc4a555f0841f5f8ca4db303ed092 Author: Matt Carlson Date: Tue Jan 25 15:58:57 2011 +0000 tg3: Update copyrights and update version to 3.117 This patch updates copyrights and updates the tg3 version to 3.117. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit d7f2ab20432441c7d4e41cd1745aafc17d712672 Author: Matt Carlson Date: Tue Jan 25 15:58:56 2011 +0000 tg3: Fix eee preprocessor naming This patch fixes a preprocessor naming bug for one of the EEE registers. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 21a00ab270f95d32e502d92f166dd75c518d3c5f Author: Matt Carlson Date: Tue Jan 25 15:58:55 2011 +0000 tg3: Fix EEE interoperability issue This patch fixes a problem where EEE will fail to work in certain environments. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit ab78904608bd6e421b81420e4d2f7d5bae9d4660 Author: Matt Carlson Date: Tue Jan 25 15:58:54 2011 +0000 tg3: Disable EEE during loopback tests EEE interferes with the hardware's ability to loop a packet back to the host. This patch disables the feature for the duration of the test. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit aba49f2421d5287692aee961ab4ce2981fdf4939 Author: Matt Carlson Date: Tue Jan 25 15:58:53 2011 +0000 tg3: Disable MAC loopback test for CPMU devices On CPMU devices, the MAC loopback test does not test any important paths the phy loopback test doesn't also test. The phy loopback test is the more comprehensive test. This patch disables the MAC loopback test for these devices. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 49692ca1e686970bac5726c3fd925427bb3ae89d Author: Matt Carlson Date: Tue Jan 25 15:58:52 2011 +0000 tg3: Fix loopback tests The half-duplex bit in the MAC MODE register will be set during the loopback test if the external link is in half-duplex mode. This will cause the loopback test to fail on newer devices. This patch turns the half-duplex bit off for the test. Also, newer devices fail the internal phy loopback test because the phy link takes a little while to come up. This patch adds code to wait for the link before proceeding with the test. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit f746a3136a61ae535c5d0b49a9418fa21edc61b5 Author: Matt Carlson Date: Tue Jan 25 15:58:51 2011 +0000 tg3: Restrict phy ioctl access If management firmware is present and the device is down, the firmware will assume control of the phy. If a phy access were allowed from the host, it will collide with firmware phy accesses, resulting in unpredictable behavior. This patch fixes the problem by disallowing phy accesses during the problematic condition. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 0583d52114b19ea06d03dd2cf762a7737c265400 Author: Matt Carlson Date: Tue Jan 25 15:58:50 2011 +0000 tg3: Disable multivec mode for 1 MSIX vector For single vector MSI-X allocations, we do not want to enable multivector modes. This patch makes the necessary corrections. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit bf933c802763b2beb1a1d4977f00af1a78c4fb70 Author: Matt Carlson Date: Tue Jan 25 15:58:49 2011 +0000 tg3: Use new VLAN code This patch pivots the tg3 driver to the new VLAN infrastructure. All references to vlgrp have been removed. The driver still attempts to disable VLAN tag stripping if CONFIG_VLAN_8021Q or CONFIG_VLAN_8021Q_MODULE is not defined. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 4d163b75e979833979cc401ae433cb1d7743d57e Author: Matt Carlson Date: Tue Jan 25 15:58:48 2011 +0000 tg3: Fix 5719 A0 tx completion bug The 5719 A0 has a bug that manifests itself as if the chipset were reordering memory writes. The best known way to solve this problem is to turn off LSO and jumbo frames. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit b4495ed88b782febddfa5bb99c87d75724520ecf Author: Matt Carlson Date: Tue Jan 25 15:58:47 2011 +0000 tg3: Revise 5719 internal FIFO overflow solution Commit cf79003d598b1f82a4caa0564107283b4f560e14, entitled "tg3: Fix 5719 internal FIFO overflow problem", proposed a way to solve an internal FIFO overflow problem. We have since discovered a slightly better way to solve the problem. This patch changes the code so that the problem is contained closer to the problem source. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 9599ec0471deae24044241e2173090d2cbc0e899 Author: Fenghua Yu Date: Mon Jan 17 17:39:15 2011 -0800 x86-64, mem: Convert memmove() to assembly file and fix return value bug memmove_64.c only implements memmove() function which is completely written in inline assembly code. Therefore it doesn't make sense to keep the assembly code in .c file. Currently memmove() doesn't store return value to rax. This may cause issue if caller uses the return value. The patch fixes this issue. Signed-off-by: Fenghua Yu LKML-Reference: <1295314755-6625-1-git-send-email-fenghua.yu@intel.com> Signed-off-by: H. Peter Anvin commit d1f4cec78ee3141a78b2b35969f5bebf7ea9b208 Merge: 14847fd 48b63b6 Author: David Brown Date: Tue Jan 25 15:21:49 2011 -0800 Merge branch 'msm-fb' into for-next * msm-fb: video/msm_fb: use system_wq instead of dedicated workqueues commit 48b63b6908a10add9ee383c7db24c37f99e5d324 Author: Tejun Heo Date: Mon Jan 3 13:49:43 2011 +0000 video/msm_fb: use system_wq instead of dedicated workqueues With cmwq, there's no reason to use separate workqueues. Drop msmfb_info->resume_workqueue and use system_wq instead. Signed-off-by: Tejun Heo Cc: Stanislaw Gruszka Cc: linux-usb@vger.kernel.org Signed-off-by: David Brown commit 97d9c3a354f9eb6b8bfe4bf672bdbe9ff76956e6 Author: Bruno Randolf Date: Wed Jan 19 18:20:52 2011 +0900 ath5k: ath5k_setup_channels cleanup and whitespace Remove useless test_bit - it's not going to happen because of the way this function is called only when that bit is set. And fix some whitespace. Signed-off-by: Bruno Randolf Acked-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 0a8d7cb0c8182df7a28ad719780071178c386f0f Author: Senthil Balasubramanian Date: Wed Dec 22 19:17:18 2010 +0530 ath9k_hw: read and backup AR_WA register value even before chip reset on. We need to read and backup AR_WA register value permanently and reading this after the chip is awakened results in this register being zeroed out. This seems to fix the ASPM with L1 enabled issue that we have observed. The laptop becomes very slow and hangs mostly with ASPM L1 enabled without this fix. Cc: Stable Kernel Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit ac45c12dfb3f727a5a7a3332ed9c11b4a5ab287e Author: Senthil Balasubramanian Date: Wed Dec 22 21:14:20 2010 +0530 ath9k_hw: Fix incorrect macversion and macrev checks There are few places where we are checking for macversion and revsions before RTC is powered ON. However we are reading the macversion and revisions only after RTC is powered ON and so both macversion and revisions are actully zero and this leads to incorrect srev checks Incorrect srev checks can cause registers to be configured wrongly and can cause unexpected behavior. Fixing this seems to address the ASPM issue that we have observed. The laptop becomes very slow and hangs mostly with ASPM L1 enabled without this fix. fix this by reading the macversion and revisisons even before we start using them. There is no reason why should we delay reading this info until RTC is powered on as this is just a register information. Cc: Stable Kernel Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 26ad787962ef84677a48c56039d3c9769b84f847 Author: Eric Dumazet Date: Tue Jan 25 13:26:05 2011 -0800 pktgen: speedup fragmented skbs We spend lot of time clearing pages in pktgen. (Or not clearing them on ipv6 and leaking kernel memory) Since we dont modify them, we can use one zeroed page, and get references on it. This page can use NUMA affinity as well. Define pktgen_finalize_skb() helper, used both in ipv4 and ipv6 Results using skbs with one frag : Before patch : Result: OK: 608980458(c608978520+d1938) nsec, 1000000000 (100byte,1frags) 1642088pps 1313Mb/sec (1313670400bps) errors: 0 After patch : Result: OK: 345285014(c345283891+d1123) nsec, 1000000000 (100byte,1frags) 2896158pps 2316Mb/sec (2316926400bps) errors: 0 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit e831d80b453a3586f1e1664a705c153a4ced39b8 Author: Russell King Date: Thu Jan 13 10:13:17 2011 +0000 ALSA: AACI: fix number of channels for record AC'97 codecs only support two channels for recording, so we shouldn't advertize that there are up to six channels available. Limit the selection of 4 and 6 channel audio to playback only. As this adds additional SNDRV_PCM_STREAM_PLAYBACK conditionals, we can combine some resulting in the elimination of __aaci_pcm_open() entirely, and making the code easier to read. Signed-off-by: Russell King commit b60fb519d7977e606621af85585c3677fc290ef8 Author: Russell King Date: Tue Jan 25 15:52:33 2011 +0000 ALSA: AACI: fix multiple IRQ claiming Claiming the IRQ each time a playback or capture interface is opened is wasteful; the second copy of the registered handler is identical to the first and just wastes resources. Track the number of opens and only register the handler when necessary. Signed-off-by: Russell King commit 672bda337060fa2ff99866a6ebfa3ae036f8b23b Author: Jiri Pirko Date: Tue Jan 25 11:03:25 2011 +0000 bonding: fix return value of couple of store functions count is incorrectly returned even in case of fail. Return ret instead. Signed-off-by: Jiri Pirko Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 58cc357f86a342924b0ed5c590823035690a0b19 Merge: 16f9e06 f221a9b Author: Mark Brown Date: Tue Jan 25 20:27:56 2011 +0000 Merge branch 'tegra-arch' into for-2.6.39 commit f221a9be2e511502b43b009fd83e748017ea117d Author: Stephen Warren Date: Wed Jan 19 13:50:03 2011 -0700 ARM: tegra: Add Harmony sound platform data type Signed-off-by: Stephen Warren Acked-by: Colin Cross Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 95c34f831f0e06cda6dc0a26b4f693ed105c394d Author: Nick Bowler Date: Fri Jan 21 15:51:06 2011 +0100 ARM: 6633/1: vexpress: register platform PATA device. The compactflash device on this platform is not usable simply because it is never registered with the kernel. Fix that up. Signed-off-by: Nick Bowler Signed-off-by: Russell King commit 16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff Merge: 0d42e6e a3adfa0 Author: Mark Brown Date: Tue Jan 25 15:19:29 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 0d42e6e77f8b872483833a7146286edaaaeb2f39 Author: Alexander Sverdlin Date: Fri Jan 21 22:22:07 2011 +0300 ASoC: cs4271.c: improve error handling CS4271 CODEC driver adapted to recently introduced error handling in snd_soc_update_bits(). Added snd_soc_cache_sync() error handling. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3f25c9ccb7409e6f61c11e7828c0ddb54ab1cb7b Author: Kuninori Morimoto Date: Mon Jan 24 10:09:02 2011 +0900 ASoC: sh: fsi-hdmi: Add FSI port and HDMI selection This patch add platform_device_id which can control PortA/PortB for FSI2-HDMI from platform data. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3d23c73fa0a47e8aecd2a4d8f280f45f6f7611a1 Author: Mark Brown Date: Mon Jan 24 21:51:25 2011 +0000 ASoC: Remove controls from sequenced PGA arguments We have zero users for PGA controls and the core support for them was removed a while ago so no point in cut'n'pasting them into new macros, even if it's too much hassle to update the existing ones. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 21f47fbc5b18da4a3db680959aee887612ec9a72 Author: Alexey Charkov Date: Thu Dec 23 13:11:21 2010 +0100 ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's This adds support for the family of Systems-on-Chip produced initially by VIA and now its subsidiary WonderMedia that have recently become widespread in lower-end Chinese ARM-based tablets and netbooks. Support is included for both VT8500 and WM8505, selectable by a configuration switch at kernel build time. Included are basic machine initialization files, register and interrupt definitions, support for the on-chip interrupt controller, high-precision OS timer, GPIO lines, necessary macros for early debug, pulse-width-modulated outputs control, as well as platform device configurations for the specific drivers implemented elsewhere. Signed-off-by: Alexey Charkov Signed-off-by: Russell King commit f45b1149911cc4c3ab50e56c8844ad4ec04a4575 Author: Simon Horman Date: Tue Jan 11 04:01:08 2011 +0100 ARM: 6617/1: mmc, Add zboot from MMC support for SuperH Mobile ARM This allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block. This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it. Cc: Magnus Damm Russell, please consider merging this for 2.6.38. This patch depends on: * "mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h" which will be merged though Paul Mundt's rmobile sh-2.6. The absence of this patch will break the build if the (new) CONFIG_ZBOOT_ROM_MMCIF option is set. There are no subtle side-effects. v2: Addressed comments by Magnus Damm * Fix copyright in vrl4.c * Fix use of #define CONFIG_ZBOOT_ROM_MMCIF in mmcif-sh7372.c * Initialise LED GPIO lines in head-ap4evb.txt instead of mmcif-sh7372.c as this is considered board-specific. v3: Addressed comments made in person by Magnus Damm * Move mmcif_loader to be earlier in the image and reduce the number of blocks of boot program loaded by the MaskRom from 40 to 8 accordingly. * Move LED GPIO initialisation into mmcif_progress_init - This leaves the partner jet script unbloated Other * inline mmcif_update_progress so it is a static inline in a header file v4: * Use htole16() and htole32() in v4rl.c to ensure that the output is little endian v5: Addressed comments by Russell King * Simplify assembly code * Jump to code rather than an address <- bug fix * Use (void __iomem *) as appropriate Roll in mackerel support * This was previously a separate patch, only because of the order in which this code was developed Signed-off-by: Simon Horman Signed-off-by: Russell King commit 181e055e6bed80afbf8ba2bb5e3ce84fbd3f633c Author: Mark Brown Date: Mon Jan 24 14:05:25 2011 +0000 ASoC: Fix type for snd_soc_volatile_register() We generally refer to registers as unsigned ints (including in the underlying CODEC driver operation). Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ada609ee2ac2e03bd8abb07f9b3e92cd2e650f19 Author: Tejun Heo Date: Tue Jan 25 14:35:54 2011 +0100 workqueue: use WQ_MEM_RECLAIM instead of WQ_RESCUER WQ_RESCUER is now an internal flag and should only be used in the workqueue implementation proper. Use WQ_MEM_RECLAIM instead. This doesn't introduce any functional difference. Signed-off-by: Tejun Heo Cc: dm-devel@redhat.com Cc: Neil Brown commit 0f06c063628689de5eab5dfb3ce9c797a09db900 Author: Tejun Heo Date: Tue Jan 25 14:27:38 2011 +0100 alpha: use L1_CACHE_BYTES for cacheline size in the linker script Currently the linker script uses 64 for cacheline size which isn't optimal for all cases. Include asm/cache.h and use L1_CACHE_BYTES instead as suggested by Sam Ravnborg. Signed-off-by: Tejun Heo Cc: Sam Ravnborg commit 19df0c2fef010e94e90df514aaf4e73f6b80145c Author: Tejun Heo Date: Tue Jan 25 14:26:50 2011 +0100 percpu: align percpu readmostly subsection to cacheline Currently percpu readmostly subsection may share cachelines with other percpu subsections which may result in unnecessary cacheline bounce and performance degradation. This patch adds @cacheline parameter to PERCPU() and PERCPU_VADDR() linker macros, makes each arch linker scripts specify its cacheline size and use it to align percpu subsections. This is based on Shaohua's x86 only patch. Signed-off-by: Tejun Heo Cc: Shaohua Li commit 9f4e1ccd80530609bbceec68ae3831697b5c6a68 Author: Changli Gao Date: Tue Jan 25 12:40:18 2011 +0800 netfilter: ipvs: fix compiler warnings Fix compiler warnings when IP_VS_DBG() isn't defined. Signed-off-by: Changli Gao Acked-by: Hans Schillstrom Signed-off-by: Simon Horman commit ae1b1539622fb46e51b4d13b3f9e5f4c713f86ae Author: Tejun Heo Date: Tue Jan 25 12:43:54 2011 +0100 block: reimplement FLUSH/FUA to support merge The current FLUSH/FUA support has evolved from the implementation which had to perform queue draining. As such, sequencing is done queue-wide one flush request after another. However, with the draining requirement gone, there's no reason to keep the queue-wide sequential approach. This patch reimplements FLUSH/FUA support such that each FLUSH/FUA request is sequenced individually. The actual FLUSH execution is double buffered and whenever a request wants to execute one for either PRE or POSTFLUSH, it queues on the pending queue. Once certain conditions are met, a flush request is issued and on its completion all pending requests proceed to the next sequence. This allows arbitrary merging of different type of flushes. How they are merged can be primarily controlled and tuned by adjusting the above said 'conditions' used to determine when to issue the next flush. This is inspired by Darrick's patches to merge multiple zero-data flushes which helps workloads with highly concurrent fsync requests. * As flush requests are never put on the IO scheduler, request fields used for flush share space with rq->rb_node. rq->completion_data is moved out of the union. This increases the request size by one pointer. As rq->elevator_private* are used only by the iosched too, it is possible to reduce the request size further. However, to do that, we need to modify request allocation path such that iosched data is not allocated for flush requests. * FLUSH/FUA processing happens on insertion now instead of dispatch. - Comments updated as per Vivek and Mike. Signed-off-by: Tejun Heo Cc: "Darrick J. Wong" Cc: Shaohua Li Cc: Christoph Hellwig Cc: Vivek Goyal Cc: Mike Snitzer Signed-off-by: Jens Axboe commit 143a87f4c9c629067afea5b6703d66ea88c82f8e Author: Tejun Heo Date: Tue Jan 25 12:43:52 2011 +0100 block: improve flush bio completion bio's for flush are completed twice - once during the data phase and one more time after the whole sequence is complete. The first completion shouldn't notify completion to the issuer. This was achieved by skipping all bio completion steps in req_bio_endio() for the first completion; however, this has two drawbacks. * Error is not recorded in bio and must be tracked somewhere else. * Partial completion is not supported. Both don't cause problems for the current users; however, they make further improvements difficult. Change req_bio_endio() such that it only skips the actual notification part for the first completion. bio completion is implemented with partial completions on mind anyway so this is as simple as moving the REQ_FLUSH_SEQ conditional such that only calling of bio_endio() is skipped. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 414b4ff5eecff0097d09c4a7da12e435fd503692 Author: Tejun Heo Date: Tue Jan 25 12:43:49 2011 +0100 block: add REQ_FLUSH_SEQ rq == &q->flush_rq was used to determine whether a rq is part of a flush sequence, which worked because all requests in a flush sequence were sequenced using the single dedicated request. This is about to change, so introduce REQ_FLUSH_SEQ flag to distinguish flush sequence requests. This patch doesn't cause any behavior change. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 5d6135012e9a7aa8a9128145ed9315eb916feea2 Author: Jesse Barnes Date: Mon Jan 24 17:10:54 2011 -0800 drm/i915: use VDD AUX override to make panel power sequencing look better Rather than power cycling the panel when there are no bits to display, use the VDD AUX bit to power the panel up just enough for DP AUX transactions to work. This prevents a bit of unnecessary ugliness as mode sets occur on the panel. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 987a709e1589cf10e250e04ce9df910b735d4f60 Author: Jesse Barnes Date: Mon Jan 24 17:10:53 2011 -0800 drm/i915: remove now unnecessary delays in eDP panel power sequencing Now that we're doing the right thing elsewhere, these are no longer necessary. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31114 Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit d210246ab1106d77df91a4185b9d3b75a63be81f Author: Chris Wilson Date: Mon Jan 24 17:43:27 2011 +0000 drm/i915: Refactor self-refresh watermark calculations Move the plane->mode config to the point of use rather than repeatedly querying the same information. Signed-off-by: Chris Wilson commit f5c28f2538f1b23db493be262468a9a2e8bb97b2 Author: Greg Kroah-Hartman Date: Tue Jan 25 19:07:55 2011 +0800 Revert "staging: brcm80211: assure common sources are truly common" This reverts commit ead1256410cb5a79fd3615ba70ba56779c5d21e2 as it broke the build when building with multiple threads at the same time. Cc: Brett Rudley Cc: Henry Ptasinski Cc: Roland Vossen Cc: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 9a756de1296e02d1d9ccccbe5dc9d89df43b2654 Author: Jesper Juhl Date: Mon Jan 24 22:12:39 2011 +0100 X86, Acer, WMI: Do not double include linux/dmi.h in acer-wmi.c Including linux/dmi.h once in drivers/platform/x86/acer-wmi.c is enough. Signed-off-by: Jesper Juhl Reviewed-by: Lee, Chun-Yi Signed-off-by: Jiri Kosina commit ead1256410cb5a79fd3615ba70ba56779c5d21e2 Author: Arend van Spriel Date: Sun Jan 23 08:30:38 2011 +0100 staging: brcm80211: assure common sources are truly common Common code for brcm80211 drivers was resulting in different compiled object files for the drivers due to compilation flags. This has been aligned so that they are resulting in same object files. Kconfig now allows both drivers to be build simultaneously. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 29ee399131395d8b607803874a206b9daf714025 Author: Chris Wilson Date: Mon Jan 24 16:35:42 2011 +0000 drm/i915: Silence a few -Wunused-but-set-variable Signed-off-by: Chris Wilson commit 7d7854b4da52a1e40a41d26048f7940e4eb7193b Author: Nitin Gupta Date: Sat Jan 22 07:36:15 2011 -0500 Staging: zram: simplify zram_make_request zram_read() and zram_write() always return zero, so make them return void to simplify the code. Signed-off-by: Nitin Gupta Signed-off-by: Jerome Marchand Acked-by: Jeff Moyer Signed-off-by: Greg Kroah-Hartman commit dc7b202a4ee6cb686e2bbef80c84443f43ec91bd Author: Wolfram Sang Date: Mon Jan 24 11:44:29 2011 +0100 staging/ste_rmi4: Remove obsolete cleanup for clientdata A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit or error. This is obsolete meanwhile, the core will do it. Signed-off-by: Wolfram Sang Cc: Naveen Kumar Gaddipati Cc: Linus Walleij Signed-off-by: Greg Kroah-Hartman commit 5673db40e28732431b1d3c6433638408f913142e Author: L. Alberto Giménez Date: Sun Jan 23 01:07:18 2011 +0100 Staging: rt2860: rt_linux.c: Fix space after unary '*' operator. Fix checkpatch error raised by the use of spaces between the '*' operator and the corresponding variable name. Signed-off-by: L. Alberto Giménez Signed-off-by: Greg Kroah-Hartman commit f5041dac6ba543a98bf550ae94923fc8e9d4fc13 Author: L. Alberto Giménez Date: Sun Jan 23 01:07:19 2011 +0100 Staging: rt2860: rt_linux.h: Fix space after unary '*' operator. Fix checkpatch error raised by the use of spaces between the '*' operator and the corresponding variable name. Signed-off-by: L. Alberto Giménez Signed-off-by: Greg Kroah-Hartman commit 6e4e2d9b7428c4e9f26d7c2779ead8172b01ebf0 Author: L. Alberto Giménez Date: Sun Jan 23 01:07:20 2011 +0100 Staging: rt2860: wpa.h: Fix space after unary '*' operator. Fix checkpatch error raised by the use of spaces between the '*' operator and the corresponding variable name. Signed-off-by: L. Alberto Giménez Signed-off-by: Greg Kroah-Hartman commit 944fdef52ca9fc0fe077578f51201ef397e30abe Author: Artem Bityutskiy Date: Sun Jan 16 19:22:02 2011 +0200 UBIFS: do not start the commit if there is nothing to commit This patch fixes suboptimal UBIFS 'sync_fs()' implementation which causes flash I/O even if the file-system is synchronized. E.g., a 'printk()' in the MTD erasure function (e.g., 'nand_erase_nand()') can show that for every 'sync' shell command UBIFS erases at least one eraseblock. So '$ while true; do sync; done' will cause huge amount of flash I/O. The reason for this is that UBIFS commits in 'sync_fs()', and starts the commit even if there is nothing to commit, e.g., it anyway changes the log. This patch adds a check in the 'do_commit()' UBIFS functions which prevents the commit if there is nothing to commit. Reported-by: Hans J. Koch Tested-by: John Ogness Signed-off-by: Artem Bityutskiy commit cf3567aaad0304410e465a55313c8f0d25ef306d Author: Sascha Hauer Date: Tue Jan 11 15:56:40 2011 +0100 ARM MXS: Add auart platform support for i.MX28 Signed-off-by: Sascha Hauer commit 47d37d6f94ccf32d302492f969209930b2411f9e Author: Sascha Hauer Date: Tue Jan 11 15:54:54 2011 +0100 serial: Add auart driver for i.MX23/28 Signed-off-by: Sascha Hauer commit 9c2c35848cf77cf8831442492a2f7a6d7723fe0a Author: Fabio Estevam Date: Mon Jan 24 16:55:02 2011 -0200 ARM: imx: Add initial support for IMX27IPCAM board Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit a512b92b3af4b03fc6834617a042dc85fbd4e34e Author: Vlad Dogaru Date: Mon Jan 24 03:37:29 2011 +0000 net: add sysfs entry for device group The group of a network device can be queried or changed from userspace using sysfs. For example, considering sysfs mounted in /sys, one can change the group that interface lo belongs to: echo 1 > /sys/class/net/lo/group Signed-off-by: Vlad Dogaru Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 84c49d8c3e4abefb0a41a77b25aa37ebe8d6b743 Author: Jiri Pirko Date: Mon Jan 24 05:45:46 2011 +0000 veth: remove unneeded ifname code from veth_newlink() The code is not needed because tb[IFLA_IFNAME] is already processed in rtnl_newlink(). Remove this redundancy. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 07924709f68b3f4f701d4efd6acd18ca4ee14de3 Author: Hans Schillstrom Date: Mon Jan 24 15:14:41 2011 +0100 IPVS netns BUG, register sysctl for root ns The newly created table was not used when register sysctl for a new namespace. I.e. sysctl doesn't work for other than root namespace (init_net) Signed-off-by: Hans Schillstrom Signed-off-by: Simon Horman commit bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2 Merge: a37f2f8 8e934db Author: Chris Wilson Date: Sun Jan 23 17:24:26 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Merge important suspend and resume regression fixes and resolve the small conflict. Conflicts: drivers/gpu/drm/i915/i915_dma.c commit acd1130e8793fb150fb522da8ec51675839eb4b1 Author: MichaÅ‚ MirosÅ‚aw Date: Mon Jan 24 15:45:15 2011 -0800 net: reduce and unify printk level in netdev_fix_features() Reduce printk() levels to KERN_INFO in netdev_fix_features() as this will be used by ethtool and might spam dmesg unnecessarily. This converts the function to use netdev_info() instead of plain printk(). As a side effect, bonding and bridge devices will now log dropped features on every slave device change. Signed-off-by: MichaÅ‚ MirosÅ‚aw Signed-off-by: David S. Miller commit 14847fdf3598109384e590a4154010f2ece6bb96 Merge: 75b0d32 8b4d95f Author: David Brown Date: Mon Jan 24 15:42:46 2011 -0800 Merge branch 'msm-sdcc' into for-next * msm-sdcc: msm: 8x50: Add initial support for SDCC mmc: msm_sdcc: Add gpio handling function to driver drivers: mmc: msm: remove clock disable in probe mmc: msm: fix dma usage not to use internal APIs commit 68e4ccaab251656290241c1f2653093cd3a1b225 Author: Tomas Winkler Date: Mon Jan 24 17:08:22 2011 +0200 staging/easycap: make ALSA ops function static in sound.c 1. make also ops function static 2. move around code so to avid forward declarations Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 1945f939b6b3d2ea7a0ac143f85fd288a50e0516 Author: Tomas Winkler Date: Mon Jan 24 17:08:21 2011 +0200 staging/easycap: make oss ops function static in sound_oss.c 1. make oss ops function static 2. move around code so to avid forward declarations 3. move OSS ioclts from ioctl.c to sound_oss.c Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 0edbc24c5dc7fba0dce193f7d4b7faf2ad211ba4 Author: Tomas Winkler Date: Mon Jan 24 17:08:20 2011 +0200 staging/easycap: make OSS compilation optional instead of ALSA OSS is deprecated yet currently it is reported to be more stable therefore we keep it but make it optional Revert the conditional compilation: add CONFIG_EASYCAP_OSS and kill EASYCAP_NEEDS_ALSA move oss-only code from easycap_sound.c to easycap_sound_oss.c Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 04ed3e741d0f133e02bed7fa5c98edba128f90e7 Author: MichaÅ‚ MirosÅ‚aw Date: Mon Jan 24 15:32:47 2011 -0800 net: change netdev->features to u32 Quoting Ben Hutchings: we presumably won't be defining features that can only be enabled on 64-bit architectures. Occurences found by `grep -r` on net/, drivers/net, include/ [ Move features and vlan_features next to each other in struct netdev, as per Eric Dumazet's suggestion -DaveM ] Signed-off-by: MichaÅ‚ MirosÅ‚aw Signed-off-by: David S. Miller commit 5c0c6c395ea8ad2f831c0717f67f957ba84550ad Author: Tomas Winkler Date: Mon Jan 24 13:27:02 2011 +0200 staging/easycap: implement strerror function Replace long switch statements that just print out errno with strerror function. It reduces around 700 lines from the code. The function should be probably dropped at all but leave for now to not break currently expected debug output. Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 482cd2d8d85517b6444d646ae7874e0bb935746b Author: Tomas Winkler Date: Mon Jan 24 13:27:01 2011 +0200 staging/easycap: easycap.h ident correctly signed_div_result indent level 1 by tabs Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 57422dc530115e427dff464cc0a32bcd0efb5008 Author: MichaÅ‚ MirosÅ‚aw Date: Sat Jan 22 12:14:12 2011 +0000 net: Move check of checksum features to netdev_fix_features() Signed-off-by: MichaÅ‚ MirosÅ‚aw Signed-off-by: David S. Miller commit e86ba1162f1f6d292d4901c8716a233632c3a783 Author: Tomas Winkler Date: Mon Jan 24 13:27:00 2011 +0200 staging/easycap: fix missing backslash in ifdef statement the backslash was removed by mistake in the patch 'staging:easycap: drop redundant backslashes from the code' this breaks compilation only when EASYCAP_NEEDS_ALSA is not set Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 2505c5483137aa630806df9cd08a82d1cac72cc9 Author: David S. Miller Date: Mon Jan 24 15:11:02 2011 -0800 typhoon: Kill references to UTS_RELEASE This makes the driver get rebuilt every single time you type 'make' which is beyond rediculious. I hereby declare this driver to have version "1.0" Signed-off-by: David S. Miller commit fa6d5d4f2b0df1e9b613b7b5926805b8a4306d44 Author: Sakari Ailus Date: Fri Jan 21 10:59:31 2011 +0000 tlan: add suspend/resume support Add suspend/resume support to tlan driver. This allows not unloading the driver over suspend/resume. Also, start (or now, wake) the queue after resetting the adapter --- not the other way around. Signed-off-by: Sakari Ailus Signed-off-by: David S. Miller commit c659c38b2796578638548b77ef626d93609ec8ac Author: Sakari Ailus Date: Fri Jan 21 10:59:30 2011 +0000 tlan: Code cleanup: checkpatch.pl is relatively happy now. - Remove CamelCase. - Convert hexadecimals to lower case. - Remove useless comments. Tlan driver contained a name of the function at the end of it in a comment. Remove those comments. - Remove local typedefs. Use real types instead of typedefs in code. - Resolve space issues and reindent. - One warning remain, it's a case where printing a single line involves a number of printk()s. Signed-off-by: Sakari Ailus Signed-off-by: David S. Miller commit c445477d74ab3779d1386ab797fbb9b628eb9f64 Author: Ben Hutchings Date: Wed Jan 19 11:03:53 2011 +0000 net: RPS: Enable hardware acceleration of RFS Allow drivers for multiqueue hardware with flow filter tables to accelerate RFS. The driver must: 1. Set net_device::rx_cpu_rmap to a cpu_rmap of the RX completion IRQs (in queue order). This will provide a mapping from CPUs to the queues for which completions are handled nearest to them. 2. Implement net_device_ops::ndo_rx_flow_steer. This operation adds or replaces a filter steering the given flow to the given RX queue, if possible. 3. Periodically remove filters for which rps_may_expire_flow() returns true. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit c39649c331c70952700f99832b03f87e9d7f5b4b Author: Ben Hutchings Date: Wed Jan 19 11:03:25 2011 +0000 lib: cpu_rmap: CPU affinity reverse-mapping When initiating I/O on a multiqueue and multi-IRQ device, we may want to select a queue for which the response will be handled on the same or a nearby CPU. This requires a reverse-map of IRQ affinity. Add library functions to support a generic reverse-mapping from CPUs to objects with affinity and the specific case where the objects are IRQs. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 03389996e086fe61216692f0a2bb445051082902 Author: Tomas Winkler Date: Sun Jan 23 01:13:58 2011 +0200 staging: easycap: easycap.h use indentation for first level replace struct { int a; } with more readable struct { int a; } Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit d090bf57492bde9cb6281246c92963476c40b512 Author: Tomas Winkler Date: Sun Jan 23 01:13:57 2011 +0200 staging: easycap: make functions local to easycap_main.c static 1. remove declarations from the header file 2. rearange code in main.c to reduce number of forward declarations Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 02149cf7c7fd1ece5ada28f5a95914f4348df44f Author: Tomas Winkler Date: Sun Jan 23 01:13:56 2011 +0200 staging: easycap: group module parameters handling 1. For readability group module parameters handling on one place 2. Introduce kernel config option EASY_DEBUG Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 3dbab7331209d5d85c448675053d3e9e7a4bcd41 Author: Tomas Winkler Date: Sun Jan 23 01:13:55 2011 +0200 staging: easycap: use #ifndef __EASYCAP_H_ for header inclusion protection use common #ifndef __EASYCAP_H_ instead of if (!defined(EASYCAP_H)) for protecting header from double inclusion Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit b4f63e9a0f1ca7c6df1f77fdabd4905f4639e8c6 Author: Tomas Winkler Date: Sun Jan 23 01:13:54 2011 +0200 staging: easycap: remove redunant headers place all globals to easycap.h, which is included by all c-files easycap_standard: fix declaration vs. definiton conflict Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit d9e2d5962b083646cc9c218bfd358d07ae3b5925 Author: Tomas Winkler Date: Sun Jan 23 01:13:53 2011 +0200 staging: easycap: fix sparse warnings :conversion of int to enum easycap_settings.c:587:58: warning: conversion of easycap_settings.c:587:58: unsigned int to easycap_settings.c:587:58: int enum v4l2_field easycap_settings.c:593:63: warning: conversion of easycap_settings.c:593:63: unsigned int to easycap_settings.c:593:63: int enum v4l2_colorspace Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit dbf4805ee6a850e941110b0df1e96049287ecf75 Author: Tomas Winkler Date: Sun Jan 23 01:13:52 2011 +0200 staging: easycap: fix sparse warnings 'Should it be static' easycap_main.c:41:23: warning: symbol 'easycapdc60_dongle' was not declared. Should it be static? easycap_main.c:49:22: warning: symbol 'easycap_usb_device_id_table' was not declared. Should it be static? easycap_main.c:69:30: warning: symbol 'easycap_fops' was not declared. Should it be static? easycap_main.c:82:29: warning: symbol 'easycap_vm_ops' was not declared. Should it be static? easycap_main.c:87:25: warning: symbol 'easycap_class' was not declared. Should it be static? easycap_main.c:95:35: warning: symbol 'v4l2_fops' was not declared. Should it be static? easycap_main.c:5071:1: warning: symbol 'easycap_module_init' was not declared. Should it be static? easycap_main.c:5101:1: warning: symbol 'easycap_module_exit' was not declared. Should it be static? easycap_low.c:45:50: warning: symbol 'stk1160configPAL' was not declared. Should it be static? easycap_low.c:87:28: warning: symbol 'stk1160configNTSC' was not declared. Should it be static? easycap_low.c:129:50: warning: symbol 'saa7113configPAL' was not declared. Should it be static? easycap_low.c:187:28: warning: symbol 'saa7113configNTSC' was not declared. Should it be static? easycap_ioctl.c:915:5: warning: symbol 'adjust_mute' was not declared. Should it be static? easycap_settings.c:42:31: warning: symbol 'easycap_standard' was not declared. Should it be static? easycap_settings.c:312:23: warning: symbol 'easycap_format' was not declared. Should it be static? easycap_settings.c:607:23: warning: symbol 'easycap_control' was not declared. Should it be static? Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 8cbe7ae6c1fd33419cba0c210a5f2c6b586b8d35 Author: Mike McCormack Date: Mon Jan 24 23:22:21 2011 +0900 staging: rtl8192e: Remove unused members from struct Stats Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 941f0d5db47394a1eee3e90465027ed328454918 Author: Mike McCormack Date: Mon Jan 24 23:21:42 2011 +0900 staging: rtl8192e: Remove unused types and defines Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 3059f2decfa2994834874c153552df418e98b960 Author: Mike McCormack Date: Mon Jan 24 23:21:17 2011 +0900 staging: rtl8192e: Delete unused and write-only struct members Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 08dcd4166ed86608f76d25a2da038ede8d31f25d Author: Mike McCormack Date: Mon Jan 24 23:20:40 2011 +0900 staging: rtl8192e: Delete dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit a2c900bd8aedb9e0f68b6c71e63a9f8c4044c3f4 Author: Mike McCormack Date: Mon Jan 24 23:20:13 2011 +0900 staging: rtl8192e: Delete dead code from header Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 0157a2b93298d20f3caf3046a030d52756e335d1 Author: Mike McCormack Date: Mon Jan 24 23:19:48 2011 +0900 staging: rtl8192e: Remove member that's always false Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 395aa640a19a2381daa21c6c0e882c1075c629de Author: Mike McCormack Date: Mon Jan 24 23:19:25 2011 +0900 staging: rtl8192e: Remove more unused struct members Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 1538ec93d5e0b53f5452abd17650e7fedb1c4698 Author: Mike McCormack Date: Mon Jan 24 23:18:57 2011 +0900 staging: rtl8192e: Remove dead code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 79694ebbe04b08262ef307da73b5c6736938eb8c Author: Mike McCormack Date: Mon Jan 24 23:18:22 2011 +0900 staging: rtl8192e: Remove unused members from r8192_priv Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 73dbd9f3a4d3c47f514fda5997322f2cbb8219e3 Author: Mike McCormack Date: Mon Jan 24 23:16:30 2011 +0900 staging: rtl8192e: Remove unused code to detect struct tx rings Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit ea9dc54ed9efc32f0cf2c6eb18898cfd8a1bb96e Author: Mike McCormack Date: Mon Jan 24 23:16:10 2011 +0900 staging: rtl8192e: Remove unused struct members Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 85c876e412c18d95cd430598255f829e64ae9141 Author: Mike McCormack Date: Mon Jan 24 23:15:40 2011 +0900 staging: rtl8192e: Delete dead code in ieee80211 lib Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit c8881632daf373f5544a3f64d70cd9b3da47aa89 Author: Mike McCormack Date: Mon Jan 24 23:15:03 2011 +0900 staging: rtl8192e: Tidy up function header comments Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit bf2c9de43e9288bc4091c29745d8d09d23d3aa12 Author: Mike McCormack Date: Mon Jan 24 23:14:16 2011 +0900 staging: rtl8192e: Convert cck_txbbgain_ch14_table to a table Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit da1f21ff794a1d607939d19cd7136803d897bfa4 Author: Mike McCormack Date: Mon Jan 24 23:13:47 2011 +0900 staging: rtl8192e: Convert cck_txbbgain_table to a table Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 09ca1dfdccd72d156422169bd970d77a8b88e94c Author: Mike McCormack Date: Mon Jan 24 23:13:23 2011 +0900 staging: rtl8192e: Convert txbbgain_table to a table Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 318f591f086ec091bd1d4cdeed3b130625ff2242 Author: Mike McCormack Date: Mon Jan 24 23:12:48 2011 +0900 staging: rtl8192e: Delete commented out code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit dc04b462dd87574f7c7da0bb98f444f32e6c5e44 Author: Mike McCormack Date: Mon Jan 24 23:12:26 2011 +0900 staging: rtl8192e: Remove unused DMESGE/W macros Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit c2df88cbb43c25db27fbbf94e92318bdad018f3e Merge: 5bdc22a cd7eab4 Author: David S. Miller Date: Mon Jan 24 14:30:13 2011 -0800 Merge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip commit 5bdc22a56549e7983c6b443298672641952ea035 Merge: b6f4098 e92427b Author: David S. Miller Date: Mon Jan 24 14:09:35 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/sched/sch_hfsc.c net/sched/sch_htb.c net/sched/sch_tbf.c commit e5e2f24b3eec67a7a35d43654a997f98ca21aff2 Author: Eliad Peller Date: Mon Jan 24 19:19:03 2011 +0100 wl12xx: disable auto-arp The auto-arp feature sometimes has unexpected side effects (e.g. firmware crashes, no ARP replies, etc.) disable it until it will be solved. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit ea45b2cbf56a4e93e9c5a68b85794e6d79f69fce Author: Juuso Oikarinen Date: Mon Jan 24 07:01:54 2011 +0100 wl12xx: Increase scan channel dwell time for passive scans The passive scan channel dwell time currently used is 30-60TU. A typical beacon interval for AP's is 100TU. This leads to a ~30% worst-case probability of finding an AP via passive scanning. For 5GHz bands for DFS frequencies passive scanning is the only scanning option. Hence for these, the probability of finding an AP is very low. To fix this, increase the passive channel scan dwell times (also the early leave value, as 5GHz channels are still typically very silent.) Use a value of 100TU, because that covers most typical AP configurations. Based on testing the probability of finding an AP (100TU beacon interval) on a single scan round are as follows (based on 100 iterations): dwell min/max (TU) | probability ---------------------+------------ 30/60 | 35% 60/60 | 56% 80/80 | 77% 100/100 | 100% Total scan times now and after the change: Region | Before (s) | After (s) -------+------------+---------- 00 | 0.77 | 1.48 FI | 0.95 | 2.01 US | 0.91 | 1.76 Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 8e2de74e781e696636e8b4cd08084d2b310d44d9 Author: Eliad Peller Date: Sun Jan 23 11:25:27 2011 +0100 wl12xx: wrong values are returned in gpio_power_write() Return values were assigned to incorrect var / weren't assigned. fix it, and defer mutex_lock after the sanity checks. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit b6f4098897f30b7ea90a1c1edf35e9b20a9d828a Merge: 2362493 6493d24 Author: David S. Miller Date: Mon Jan 24 13:00:48 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit bbba3e6832ad3e974fb593a98abe03f8b60fc7f3 Author: Levi, Shahar Date: Sun Jan 23 07:27:23 2011 +0100 wl12xx: BA receiver support Add new ampdu_action ops to support receiver BA. The BA initiator session management in FW independently. Signed-off-by: Shahar Levi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 4b7fac77b4c1badac84df3dcbdf07199d94cb1c3 Author: Levi, Shahar Date: Sun Jan 23 07:27:22 2011 +0100 wl12xx: BA initiator support Add 80211n BA initiator session support wl1271 driver. Include BA supported FW version auto detection mechanism. BA initiator session management included in FW independently. Signed-off-by: Shahar Levi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 6c89b7b2f856a2b67f53313ddfa3af4ab52bae28 Author: Arik Nemtsov Date: Tue Jan 18 20:39:52 2011 +0100 wl12xx: Add channel 14 to list of supported 2ghz channels Channel 14 is only supported in Japan (JP country code in regdb). The FW limits tranmissions to CCK only on this channel. Tested in both STA and AP modes to work correctly. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit d75387ca62b92d837c2a1e626d0d3705a9011228 Author: Arik Nemtsov Date: Mon Jan 17 10:16:00 2011 +0100 wl12xx: add missing MODULE_FIRMWARE statment for AP-mode FW In wl12xx cards AP-mode requires a separate FW file. Add this file to the module info. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 4ae3fa87854862d1724bf8f2f1e1b9b088fa53d7 Author: Juuso Oikarinen Date: Fri Jan 14 12:48:46 2011 +0100 wl12xx: Cleanup PLT mode when module is removed PLT mode start/stop is controlled from userspace. When removing module, the PLT mode state is however not checked, and not cleared. There is the possibility of some unwanted state to left linger and there is even the possiblity of a kernel crash if for instance IRQ work is running when the module is removed. Fix this by stopping PLT mode on module removal, if still running. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 1d4801f2689dc2618fdb5e83d4cb7743747491ed Author: Eliad Peller Date: Sun Jan 16 10:07:10 2011 +0100 wl12xx: fix some endianess bugs pointed out by sparse warnings: CHECK drivers/net/wireless/wl12xx/cmd.c drivers/net/wireless/wl12xx/cmd.c:987:20: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/cmd.c:987:20: expected restricted __le16 [usertype] aging_period drivers/net/wireless/wl12xx/cmd.c:987:20: got int CHECK drivers/net/wireless/wl12xx/tx.c drivers/net/wireless/wl12xx/tx.c:197:2: warning: cast from restricted __le16 drivers/net/wireless/wl12xx/tx.c:197:2: warning: cast from restricted __le16 drivers/net/wireless/wl12xx/tx.c:197:2: warning: cast from restricted __le16 CHECK drivers/net/wireless/wl12xx/acx.c drivers/net/wireless/wl12xx/acx.c:816:23: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/acx.c:816:23: expected restricted __le32 [usertype] rate_policy_idx drivers/net/wireless/wl12xx/acx.c:816:23: got unsigned char [unsigned] [usertype] idx Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 4c9cfa780643dc3f609366b85fec2444a67cad64 Author: Luciano Coelho Date: Wed Jan 12 14:27:03 2011 +0100 wl12xx: add hw configuration for max supported AMDPU size The wl12xx chips do the AMDPU aggregation work in the firmware, but it supports a maximum of 8 frames per block. Configure the mac80211 hw structure accordingly. Signed-off-by: Luciano Coelho Tested-by: Juuso Oikarinen commit 491bbd6bdddafb49d0d6a9258d53441aee4bb622 Author: Guy Eilam Date: Wed Jan 12 10:33:29 2011 +0100 wl12xx: change debug_level module param sysfs permissions changed the visibility of the debug_level module parameter in the filesystem to be readable and writable to the root user. It is now accessible under /sys/module/wl12xx/parameters removed the debug_level debugfs file that was created under /sys/kernel/debug/... Signed-off-by: Guy Eilam Signed-off-by: Luciano Coelho commit 2d6e4e76d1e73886cb087142e70e2beaabb94b79 Author: Luciano Coelho Date: Tue Jan 11 19:07:21 2011 +0100 wl12xx: lock the RCU when accessing sta via ieee80211_find_sta() We were calling ieee80211_find_sta() and the sta returned by it without locking the RCU, which is required by mac80211. Fix this and reorganize slightly the area of the code where the sta is used. Reported-by: Jonathan DE CESCO Signed-off-by: Luciano Coelho commit a8aaaf53d5f22f7f60ca5af26fc85c2940575c37 Author: Luciano Coelho Date: Tue Jan 11 18:25:18 2011 +0100 wl12xx: don't modify the global supported band structures When 11a is not supported, we were modifying the global structure that contains the bands supported by the driver. This causes problems when having more one wl12xx device in the same system because they all use the same global. This also causes problems when the wl12xx_sdio module is removed and the wl12xx module remains. Fix this problem by copying the band structure into the wl12xx instance. Reported-by: Arik Nemtsov Reported-by: Johannes Berg Signed-off-by: Luciano Coelho commit fa287b8f291d79f080182eb353d1c1f4f374ae87 Author: Eliad Peller Date: Sun Dec 26 09:27:50 2010 +0100 wl12xx: don't join upon disassociation wl12xx "rejoins" upon every BSS_CHANGED_BSSID notification. However, there is no need to rejoin after disassociation, so just filter out the case when the new bssid is 00:00:00:00:00:00. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 2354b9fdda6491c8476498b246ff7c48d324a07f Author: Luciano Coelho Date: Mon Jan 10 17:59:44 2011 +0200 MAINTAINERS: update information for the wl12xx driver Update maintainer's email address, webpage and align with renaming of files. Signed-off-by: Luciano Coelho commit 038d925bcfed8df4d16bab57c2b5a4de6ede7847 Author: Arik Nemtsov Date: Sat Oct 16 21:53:24 2010 +0200 wl12xx: Enable AP-mode Indicate support for the NL80211_IFTYPE_AP interface mode to enable AP mode operation. Disable 11a when operating in AP-mode (unsupported for now). Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 31d26ec6992cc05cfd5e50a59b00b0d64c7bb4aa Author: Arik Nemtsov Date: Sat Oct 16 21:49:52 2010 +0200 wl12xx: Read MAC address from NVS file on HW startup Try to read the MAC address from the on-disk NVS file. A non-zero MAC address is required to add an AP interface. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 166d504ebaed391f1a411c69a5659632249ba711 Author: Arik Nemtsov Date: Sat Oct 16 21:44:57 2010 +0200 wl12xx: AP mode - fetch appropriate firmware for AP AP and STA modes use different firmwares. Differentiate the firmware files by name and fetch the appropriate one when add_interface is called by mac80211. The STA firmware is chosen for PLT mode. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 7f179b468963564aa3faa5729fb3153c08b3d7c1 Author: Arik Nemtsov Date: Sat Oct 16 21:39:06 2010 +0200 wl12xx: AP mode - encryption support Encryption key configuration is different for AP/STA modes. AP encryption keys are recorded when the BSS is not started. On BSS start they are propagated to the AP (in wl1271_ap_init_hwenc). Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 488fc540472dee7b8c9fc592e4f024aafe8b605f Author: Arik Nemtsov Date: Sat Oct 16 20:33:45 2010 +0200 wl12xx: AP mode - record TX configuration settings Record TX configuration settings in the "conf" member of our global structure (struct wl1271) if conf_tx is called when the firmware is not loaded. Later on when the firmware is loaded, we apply the tx conf as part of the init sequence. Important for AP mode since conf_tx is called before add_interface (where the firmware is initialized). Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit c6c8a65de6d3aa8daa93beeac390f49a21d0be36 Author: Arik Nemtsov Date: Sat Oct 16 20:27:53 2010 +0200 wl12xx: AP mode - changes in TX path When in AP mode set appropriate HLID and rate policy for each skb. Respond to supported-rates related changes in op_tx only when acting as STA. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit f84f7d78bbfbbb17faa64bcca5799865074e1e7b Author: Arik Nemtsov Date: Sat Oct 16 20:21:23 2010 +0200 wl12xx: AP mode - add STA add/remove ops Allocate and free host link IDs (HLIDs) for each link. A per-STA data structure keeps the HLID of each STA. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 7d0578693107887d52d50b89723be7fa0a41cd36 Author: Arik Nemtsov Date: Sat Oct 16 19:25:35 2010 +0200 wl12xx: AP mode - change filter config Do not configure a group address table in AP mode Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit bee0ffec7766eae8c574cc1b07b739b05ba295c3 Author: Arik Nemtsov Date: Sat Oct 16 19:17:02 2010 +0200 wl12xx: AP mode config in ieee80211_ops.config Separate configuration according to mode. AP has different rate set configuration and no handling of idle-state. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit e78a287ab7eb73d7003b1c54bec4ca94655f62e9 Author: Arik Nemtsov Date: Sat Oct 16 19:07:21 2010 +0200 wl12xx: Configure AP on BSS info change Configure AP-specific beacon and probe response templates. Start the AP when beaconing is enabled. The wl1271_bss_info_changed() function has been split into AP/STA specific handlers. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit beb6c880720073c233633c45792a4bb5d5fedbd5 Author: Arik Nemtsov Date: Sat Oct 16 18:53:48 2010 +0200 wl12xx: Add AP related definitions to HOST-FW interface Change structures in a non-destructive manner. This means no changes in size or location of existing members used by STA. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit ae113b57826b40f1962a6e2417efd757b638e6a9 Author: Arik Nemtsov Date: Sat Oct 16 18:45:07 2010 +0200 wl12xx: AP specific RX filter configuration Set filters according to the mode of operation. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit e0fe371b74326a85029fe8720506e021fe73905a Author: Arik Nemtsov Date: Sat Oct 16 18:19:53 2010 +0200 wl12xx: AP mode - init sequence Split HW init sequence into AP/STA specific parts The AP specific init sequence includes configuration of templates, rate classes, power mode, etc. Also unmask AP specific events in the event mbox. Separate the differences between AP and STA init into mode specific functions called from wl1271_hw_init. The first is called after radio configuration and the second after memory configuration. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 05285cf9b581af05813cfaa60e23227b009b7754 Author: Arik Nemtsov Date: Fri Nov 12 17:15:03 2010 +0200 wl12xx: AP mode - workaround for FW bug on station remove Sometimes an event indicating station removal is not sent up by firmware. We work around this by always indicating success in when a wait for the event timeouts. Temporary workaround until a FW fix is introduced. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 98bdaabbbced007c7eb89cd373f9cb1640635b46 Author: Arik Nemtsov Date: Sat Oct 16 18:08:58 2010 +0200 wl12xx: AP-mode high level commands Add commands to start/stop BSS, add/remove STA and configure encryption keys. Split the encryption commands "set key" and "set default key" into AP and STA specific versions. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 203c903cbfbdf23bbb3020b9344dd1ffabcfcb53 Author: Arik Nemtsov Date: Mon Oct 25 11:17:44 2010 +0200 wl12xx: AP mode - add AP specific event Add STA-remove completion event. Unmask it during boot if operating in AP-mode. Ignore unrelated events in AP-mode. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 79b223f4c7ce35fba145c504de12be030cc0007e Author: Arik Nemtsov Date: Sat Oct 16 17:52:59 2010 +0200 wl12xx: AP mode - AP specific CMD_CONFIGURE sub-commands Add AP max retries and rate policy configuration. Rename STA rate policy configuration function. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 1e05a81888318752e9a6d2158a95ddd6442ae117 Author: Arik Nemtsov Date: Sat Oct 16 17:44:51 2010 +0200 wl12xx: Add AP related configuration to conf_drv_settings Rate class configuration has been split up for AP and STA modes. Template related configuration likewise separated. Signed-off-by: Arik Nemtsov Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 6177eaea277527e48753d050723cd138494c98a8 Author: Eliad Peller Date: Wed Dec 22 12:38:52 2010 +0100 wl12xx: fix some sparse warnings Note that wl1271_write32() calls cpu_to_le32() by itself, so calling wl1271_write32(addr, cpu_to_le32(val)) is in fact a bug on BE systems. Fix the following sparse warnings: drivers/net/wireless/wl12xx/cmd.c:662:16: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/cmd.c:662:16: expected unsigned short [unsigned] [addressable] [usertype] llc_type drivers/net/wireless/wl12xx/cmd.c:662:16: got restricted __be16 [usertype] drivers/net/wireless/wl12xx/cmd.c:674:17: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/cmd.c:674:17: expected unsigned int [unsigned] [addressable] [usertype] sender_ip drivers/net/wireless/wl12xx/cmd.c:674:17: got restricted __be32 [usertype] ip_addr drivers/net/wireless/wl12xx/rx.c:202:4: warning: incorrect type in argument 3 (different base types) drivers/net/wireless/wl12xx/rx.c:202:4: expected unsigned int [unsigned] [usertype] val drivers/net/wireless/wl12xx/rx.c:202:4: got restricted __le32 [usertype] drivers/net/wireless/wl12xx/acx.c:1247:23: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/acx.c:1247:23: expected restricted __le32 [usertype] ht_capabilites drivers/net/wireless/wl12xx/acx.c:1247:23: got unsigned long drivers/net/wireless/wl12xx/acx.c:1250:24: warning: invalid assignment: |= drivers/net/wireless/wl12xx/acx.c:1250:24: left side has type restricted __le32 drivers/net/wireless/wl12xx/acx.c:1250:24: right side has type unsigned long drivers/net/wireless/wl12xx/acx.c:1253:24: warning: invalid assignment: |= drivers/net/wireless/wl12xx/acx.c:1253:24: left side has type restricted __le32 drivers/net/wireless/wl12xx/acx.c:1253:24: right side has type unsigned long drivers/net/wireless/wl12xx/acx.c:1256:24: warning: invalid assignment: |= drivers/net/wireless/wl12xx/acx.c:1256:24: left side has type restricted __le32 drivers/net/wireless/wl12xx/acx.c:1256:24: right side has type unsigned long Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 0dd386676497fb3097e6fbb3de6090c948c0df30 Author: Dan Carpenter Date: Tue Dec 21 07:00:13 2010 +0300 wl12xx: use after free in debug code If debugging is turned on, then wl1271_dump() dereferences a freed variable. Signed-off-by: Dan Carpenter Signed-off-by: Luciano Coelho commit 3c2c04a15f5fe5d169fe343c9eb7c1856d3033d3 Author: Eliad Peller Date: Wed Dec 15 11:47:54 2010 +0200 wl12xx: remove redundant debugfs_remove_recursive() call Upon rmmod, the /ieee80211/phyX dir is being removed. later, we try to remove /ieee80211/phyX/wl12xx, which might result in NULL dereference. Remove the excessive debugfs_remove_recursive() call. (consequently, there is no more need to save wl->rootdir) Reported-by: Arik Nemtsov Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 75b0d32d5c0acd9b28f447aeddde5e94e5d64e5d Merge: c243e52 50ede4e Author: David Brown Date: Mon Jan 24 11:16:51 2011 -0800 Merge branch 'msm-8960' into for-next * msm-8960: msm: Support for the MSM8960 RUMI3 target msm: Support for the MSM8960 Simulator target msm: Makefile cleanup msm: timer: Timer support for MSM8960 msm: Add MSM 8960 cpu_is check msm: irqs-8960: Interrupt map for MSM8960 msm: Physical offset for MSM8960 msm: io: I/O register definitions for MSM8960 msm: Generalize QGIC registers msm: Generalize timer register mappings msm: Add CPU queries commit c243e5284371eb90af2c6771af60fa54c57513a4 Merge: ba5499e ec8f29e Author: David Brown Date: Mon Jan 24 11:16:43 2011 -0800 Merge branch 'msm-uart' into for-next * msm-uart: serial: msm: Add support for UARTDM cores msm: Add name field to UART resources commit 82e6923e1862428b755ec306b3dbccf926849314 Author: Russell King Date: Fri Jan 21 11:04:45 2011 +0000 ARM: lh7a40x: remove unmaintained platform support lh7a40x has only been receiving updates for updates to generic code. The last involvement from the maintainer according to the git logs was in 2006. As such, it is a maintainence burden with no benefit. This gets rid of two defconfigs. Signed-off-by: Russell King commit ba5499ebfb7bc7859039d782099c75d92c394016 Author: Dima Zavin Date: Mon Jan 10 11:00:30 2011 -0800 ARM: msm: 7x30: don't force a gpiomux table for the whole arch This is completely board specific and therefore must be provided on a per-board basis. Signed-off-by: Dima Zavin Signed-off-by: David Brown commit 75c65a5edaa8b815c1428314eaf696788f1ebbdb Author: Douglas Gilbert Date: Thu Dec 23 21:40:37 2010 -0500 [SCSI] scsi_mid_low_api.txt recommend resid usage As discussed in a thread on this list titled: "RFC: short reads on block devices" this patch adds recommendations for LLDs to set resid when there might be uncertainty about how much data has been returned by a device. This patch inline and attached] is against scsi-misc-2.6.git Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 4977c82504f58d7579acabd21688183eaa8768fb Author: Boaz Harrosh Date: Sun Jan 23 17:53:24 2011 +0200 [SCSI] libosd: osd_req_read_sg, optimize the single entry case Since sg-read is a bidi operation, it is a gain to convert a single sg entry into a regular read. Better do this in the generic layer then force each caller to do so. Signed-off-by: Boaz Harrosh Signed-off-by: James Bottomley commit 1e34c8387380269b9d7707d625aeb9e9e92233f0 Author: James Bottomley Date: Sun Jan 23 08:34:25 2011 -0600 [SCSI] libsas: remove spurious sata control register read/write Originally, libata required the illusion that it could access the sata control register. Now, however, it can run perfectly well without them, so remove the dummy routines from libsas which tried to emulate them (but only ended up causing confusion). Signed-off-by: James Bottomley commit 96db6fa992570bfa46da8428fa466ee6b18e39d6 Author: James Bottomley Date: Sun Jan 23 08:19:00 2011 -0600 [SCSI] libsas: convert to standard kernel debugging Instead of using a config option for debugging, just dump the messages with KERN_DEBUG. Signed-off-by: James Bottomley commit 75c0b3867b3d3ed17142888cd4f334fbee20e3f7 Author: James Bottomley Date: Sun Jan 23 08:16:24 2011 -0600 [SCSI] libsas: fix ATAPI check condition termination ATAPI check condition needs to be treated the same as a success or protocol return. The register returns from the PACKET command are all correctly positioned in the device to host register FIS and so we should collect them properly. Right at the moment this doesn't matter because libata sends a request sense always for ATAPI errors, but if it ever checked the registers, we should have the correct contents just in case. Signed-off-by: James Bottomley commit 940d7faa4818f386fcdf1b7266ec7b62bf07a7d0 Author: Peter Jones Date: Thu Jan 6 15:38:24 2011 -0500 [SCSI] scsi_dh: Use scsi_devinfo functions to do matching of device_handler tables. Previously we were using strncmp in order to avoid having to include whitespace in the devlist, but this means "HSV1000" matches a device list entry that says "HSV100", which is wrong. This patch changes scsi_dh.c to use scsi_devinfo's matching functions instead, since they handle these cases correctly. Signed-off-by: James Bottomley commit 38a039be2e7bda32517642ecfce54c9317292a9c Author: Peter Jones Date: Thu Jan 6 15:31:29 2011 -0500 [SCSI] Add scsi_dev_info_list_del_keyed() For scsi_dh.c to use devinfo lists, we have to be able to remove entries before rmmod. Signed-off-by: James Bottomley commit c6d43ba816d1cf1d125bfbfc938f2a28a87facf9 Author: Torsten Schenk Date: Mon Jan 24 18:45:30 2011 +0100 ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB What is working: Everything except SPDIF - Hardware Master volume - PCM 44-192kHz@24 bits, 6 channels out, 4 channels in (analog) - MIDI in/out - firmware loading after cold start - phono/line switching Signed-off-by: Torsten Schenk Signed-off-by: Takashi Iwai commit 716163ff908be72f6b74752ad0796cc7c00b047a Author: kxie@chelsio.com Date: Mon Jan 10 16:45:07 2011 -0800 [SCSI] cxgb3i: fixed connection problem with iscsi private ip fixed the connection problem when the private iscsi ipv4 address is provisioned on the interface. Signed-off-by: Karen Xie Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit d38e19d00fe8c3591591e140d80dea785af5f1fe Author: Christof Schmitt Date: Mon Jan 10 11:12:40 2011 +0100 [SCSI] MAINTAINERS: Update zfcp entry Steffen will take over the zfcp maintainer work. Update the MAINTAINERS entry accordingly. Acked-by: Steffen Maier Acked-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit efee0bd9b272b0dae1c7fb1bb0be75606c8fa6f8 Author: Jesper Juhl Date: Sun Dec 26 22:14:01 2010 +0100 [SCSI] mptfusion: Fix memory leak in mptctl_getiocinfo() A 'kfree(karg)' is missing in a failure path in mptctl.c::mptctl_getiocinfo() which can cause a memory leak. Signed-off-by: Jesper Juhl Acked-by: "Desai, Kashyap" Signed-off-by: James Bottomley commit 49c6ad430d74fb7995990be0f66165e4b94a6bc5 Merge: 233d84c 1bae4ce Author: Takashi Iwai Date: Mon Jan 24 18:41:10 2011 +0100 Merge commit 'v2.6.38-rc2' into topic/misc commit 70e14722718ea3fc66400924f7a99c7d8c62b8ff Author: Eddie Wai Date: Sat Jan 8 18:00:24 2011 -0800 [SCSI] bnx2i: Added reconnect fix connecting against Lefthand targets The nopout's reserved field was not being initialized to zero before being reused. Stale CDB values from previous SCSI cmds of the same BHS offset was the cause of the disconnection initiated by the Lefthand target. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit b8ce8b59b8d64ee0d864706b9d3cca2a9b314bf5 Author: kxie@chelsio.com Date: Fri Jan 7 14:45:39 2011 -0800 [SCSI] cxgbi: get rid of gl_skb in cxgbi_ddp_info Remove gl_skb from cxgbi_ddp_info as it is only used by cxgb3i. Signed-off-by: Karen Xie Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit c343a01cca2a4182b89d976e203a54ec0ea5446b Author: kxie@chelsio.com Date: Fri Jan 7 14:45:39 2011 -0800 [SCSI] cxgbi: set ulpmode only if digest is on There is no need to set ulpmode on the tx skbs if no digest is enabled. Signed-off-by: Karen Xie Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 938abd8449c27fc67203e1a7c350199cea1158da Author: Vasiliy Kulikov Date: Fri Jan 7 10:55:53 2011 -0600 [SCSI] hpsa: avoid leaking stack contents to userland memset arg64 to zero in the passthrough ioctls to avoid leaking contents of kernel stack memory to userland via uninitialized padding fields inserted by the compiler for alignment reasons. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 1d5e2ed0805bf426226b7daa54b3e60af78baa10 Author: Stephen M. Cameron Date: Fri Jan 7 10:55:48 2011 -0600 [SCSI] hpsa: Fix problem that CMD_UNABORTABLE command status was treated as unknown Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit c4f8a299d04bd083643ba93e982ab910219dd1f0 Author: Stephen M. Cameron Date: Fri Jan 7 10:55:43 2011 -0600 [SCSI] hpsa: fix use of uninitialized variable in hpsa_add_msa2xxx_enclosure_device() Thanks to Scott Teel for noticing this. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 94a136495a3fbe59b960c46fba3574b1159e8489 Author: Stephen M. Cameron Date: Thu Jan 6 14:48:39 2011 -0600 [SCSI] hpsa: Add a per controller commands_outstanding entry in /sys Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 60d3f5b068e65d424f3cf5d108fb0747dd156d00 Author: Stephen M. Cameron Date: Thu Jan 6 14:48:34 2011 -0600 [SCSI] hpsa: use usleep_range not msleep for small sleeps Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 02ec19c82e87e3748d326ca5e15e7ddb18c73476 Author: Stephen M. Cameron Date: Thu Jan 6 14:48:29 2011 -0600 [SCSI] hpsa: allow driver to put controller in either simple or performant mode Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 6eaf46fdc719991a3ccda1e14b274e9adb515978 Author: Stephen M. Cameron Date: Thu Jan 6 14:48:24 2011 -0600 [SCSI] hpsa: take the adapter lock in hpsa_wait_for_mode_change_ack Need to take the lock while accessing the register to check to see if config table changes have taken effect. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 25c1e56a04e60af2414f8d81eda0fd10b8e7b961 Author: Stephen M. Cameron Date: Thu Jan 6 14:48:18 2011 -0600 [SCSI] hpsa: do not reset unknown boards on reset_devices This is to prevent hpsa from resetting older boards which the cciss driver may be controlling. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 72ceeaecb748dff3d35b10d7518bed651b895f3e Author: Stephen M. Cameron Date: Thu Jan 6 14:48:13 2011 -0600 [SCSI] hpsa: limit commands allocated on reset_devices This is to conserve memory in a memory-limited kdump scenario Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 270d05de2b8d82df4ed19955f6c0c7400f6ffbf5 Author: Stephen M. Cameron Date: Thu Jan 6 14:48:08 2011 -0600 [SCSI] hpsa: Use kernel provided PCI state save and restore functions and use the doorbell reset method if available (which doesn't lock up the controller if you properly save and restore all the PCI registers that you're supposed to.) Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit fe5389c87f13c16cd77d976801c93422d0c05a49 Author: Stephen M. Cameron Date: Thu Jan 6 14:48:03 2011 -0600 [SCSI] hpsa: fix board status waiting code After a reset, we should first wait for the board to become "not ready", and then wait for it to become "ready", instead of immediately waiting for it to become "ready", and do this waiting *after* restoring PCI config space registers. Also, only wait 10 secs for board to become "not ready" after a reset (it should quickly become not ready.) Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 922a9e4da34270d81e216728f929c6e11e169794 Author: Stephen M. Cameron Date: Thu Jan 6 14:47:58 2011 -0600 [SCSI] hpsa: Remove duplicate defines of DIRECT_LOOKUP_ constants They are defined in hpsa_cmd.h Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit d896f3f3d129f1e2fbb4e3824242bc0dc2fb1a07 Author: Stephen M. Cameron Date: Thu Jan 6 14:47:53 2011 -0600 [SCSI] hpsa: fixup DMA address before freeing. Some low bits might have been set by the driver, causing a message like this to come out: [ 13.288062] ------------[ cut here ]------------ [ 13.293211] WARNING: at lib/dma-debug.c:803 check_unmap+0x1a1/0x654() [ 13.300387] Hardware name: ProLiant DL180 G6 [ 13.305335] hpsa 0000:06:00.0: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x000000007f81e001] [size=640 bytes] Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit b03a7771c81a0d5f026250c8cd4091d9ee767fdc Author: Stephen M. Cameron Date: Thu Jan 6 14:47:48 2011 -0600 [SCSI] hpsa: defend against zero sized buffers in passthru ioctls Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit f512626f5baf09c1d40d098462a986417f4e9790 Author: Hans Ulli Kroll Date: Sun Dec 26 11:02:29 2010 +0100 ARM: 6604/1: Gemini: add platform support for Gemini RTC adds rtc support for all Gemini SoC boards nas4220b, rut1xx, wbd111, wbd222 Signed-off-by: Hans Ulli Kroll Signed-off-by: Russell King commit 5fd1062fdfde39bbc0092ce91e7eedee1007eb96 Author: Mike Snitzer Date: Wed Jan 5 16:00:24 2011 -0500 [SCSI] scsi_dh_alua: add scalable ONTAP lun to dev list Currently NetApp's VID/PID details in the INQUIRY response shows up as 'NETAPP' and 'LUN'. With upcoming scalable SAN ONTAP version on NetApp controllers, the PID entry alone is being modified to 'LUN C-Mode' (to distinguish current ONTAP LUNs from scalable ONTAP LUNs). 'LUN' would still suffice for matching 'LUN C-Mode' but best to explicitly add these new NetApp LUNs to the device list. Reported-by: Martin George Acked-by: Mike Christie Signed-off-by: Mike Snitzer Signed-off-by: James Bottomley commit a3b1eff70b35a8e3679ae8cd928a222fa38022c0 Author: Ilgu Hong Date: Wed Jan 5 16:00:23 2011 -0500 [SCSI] scsi_dh_alua: Add Promise VTrak to dev list Adds Promise VTrak devices to the ALUA device handler. Signed-off-by: Ilgu Hong Signed-off-by: Joseph Gruher Signed-off-by: Mike Snitzer Signed-off-by: James Bottomley commit 9349923d3f83bea1ba287a851c3f6737c6513039 Author: Joseph Gruher Date: Wed Jan 5 16:00:22 2011 -0500 [SCSI] scsi_dh_alua: fix stpg_endio group state reporting Initialize stpg_endio() 'err' to SCSI_DH_OK and only change it to SCSI_DH_IO accordingly. This allows the switching of target group state to be properly reported when no error has occurred. Signed-off-by: Joseph Gruher Signed-off-by: Ilgu Hong Signed-off-by: Mike Snitzer Signed-off-by: James Bottomley commit ed0f36bc5719b25659b637f80ceea85494b84502 Author: Joseph Gruher Date: Wed Jan 5 16:00:21 2011 -0500 [SCSI] scsi_dh_alua: fix deadlock in stpg_endio The use of blk_execute_rq_nowait() implies __blk_put_request() is needed in stpg_endio() rather than blk_put_request() -- blk_finish_request() is called with queue lock already held. Signed-off-by: Joseph Gruher Signed-off-by: Ilgu Hong Signed-off-by: Mike Snitzer Cc: stable@kernel.org Signed-off-by: James Bottomley commit 7c66e9a5e6b0459c619562c5ad321071e2767faa Author: Joseph Gruher Date: Wed Jan 5 16:00:20 2011 -0500 [SCSI] scsi_dh_alua: fix submit_stpg return submit_stpg() will always return failure so alua_activate() will report failure via dm-multipath callback function. Even though the stpg fired successfuly dm-multipath does not know and always fails to change the valid path. By returning SCSI_DH_OK we're now skipping alua_activate()'s call to activate_complete 'fn'. But this is fine because stpg_endio() will call it via h->callback_fn(). Signed-off-by: Joseph Gruher Signed-off-by: Ilgu Hong Signed-off-by: Mike Snitzer Signed-off-by: James Bottomley commit aa023b8b2fc09baeeb27af959ab38a8d684946bf Author: Kashyap, Desai Date: Tue Jan 4 11:40:59 2011 +0530 [SCSI] mpt2sas: Bump version 08.100.00.00 Upgrade driver version from 7.100.00.00 to 8.100.00.00 Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit d5bd3491c8c30b98f642cab4361ff1a43955ccd4 Author: Kashyap, Desai Date: Tue Jan 4 11:39:20 2011 +0530 [SCSI] mpt2sas: Basic Code Cleanup in mpt2sas_base Basic Code Cleanup: (1) _base_get_cb_idx and mpt2sas_base_free_smid were reorganized in similar fashion so the order of obtaining the cbx and smid are scsiio, hi_priority, and internal. (2) The hi_priority and internal request queue struct was made smaller by removing the scmd and chain_tracker, thus saving memory allocation. (3) For scsiio request, a new structure was created having the same elements from the former request tracker struct. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit fb396bec76187aae1a0eaf5b7f21327b8cb34fec Author: Kashyap, Desai Date: Tue Jan 4 11:36:37 2011 +0530 [SCSI] mpt2sas: Add support for Customer specific branding messages Add support for Customer specific branding messages when device driver loads, based on specific customer subsystem vendor and device Ids Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 9af05d90e91026838330a2bf86a6692c86f3c4e7 Author: Kashyap, Desai Date: Tue Jan 4 11:35:41 2011 +0530 [SCSI] mpt2sas: Revision P MPI Header Update Revision P MPI Header Update: a) Added enable/disable SATA NCQ operations to SAS IO Unit Control Request. b) Modified Host Based Discovery Action Request message format. c) Removed Device Path bit from IO Unit Page 1 Flags field. d) Added description of ChainOffset field for Diagnostic Data Upload Tool.Chaining is not allowed. Removed mpi2_history.txt file Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit ef1d1af28ca37fdbc2745da040529cd2953c1af5 Author: Arnaldo Carvalho de Melo Date: Tue Jan 18 21:41:45 2011 -0200 perf evsel: Introduce perf_evsel__{in,ex}it Out of the {con,des}structor, as in interpreted language bindings we will need to go back from the wrapper object to the real thing. In that case using container_of will save us to have an extra pointer in the perf_evsel struct. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit d0dd74e853a0a6f37e8061d6d50be41c7034c54c Author: Arnaldo Carvalho de Melo Date: Fri Jan 21 13:46:41 2011 -0200 perf tools: Move event__parse_sample to evsel.c To avoid linking more stuff in the python binding I'm working on, future csets will make the sample type be taken from the evsel itself, but for that we need to first have one file per cpu and per sample_type, not a single perf.data file. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 25527885e335a6da18bc9d043c3fd589280d120f Author: Arvind R Date: Fri Jan 21 23:13:37 2011 +0530 edac: i82975x author/maintainer email address change edac-i82975x author/maintainer email address change Signed-off-by: Arvind R. Signed-off-by: Jiri Kosina commit fd78260b5376173faeb17127bd63b3c99a8e8bfb Author: Arnaldo Carvalho de Melo Date: Tue Jan 18 15:15:24 2011 -0200 perf threads: Move thread_map to separate file To untangle it from struct thread handling, that is tied to symbols, etc. Right now in the python bindings I'm working on I need just a subset of the util/ files, untangling it allows me to do that. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 17ea1b70a87e28457821318341bead2b45563092 Author: Arnaldo Carvalho de Melo Date: Mon Jan 17 14:40:46 2011 -0200 perf tools: Pass the struct opt to the wildcard parsing routine It is needed because it will call parse_event for each tracepoint name that matches, and we pass the perf_evlist via opt->value. Problem introduced in 4503fdd where my assumption about opt being always non NULL made me not look at callers of parse_events outside builtin-*.c. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit d7065adb9b4f3384c2615f0a3dbdb6c3aae1eb18 Author: Franck Bui-Huu Date: Sun Jan 16 17:14:45 2011 +0100 perf record: auto detect when stdout is a pipe This patch gives the ability to 'perf record' to detect when its stdout has been redirected to a pipe. There's now no more need to add '-o -' switch in this case. However '-o ' option has always precedence, that is if specified and stdout has been connected via a pipe then the output will go into the specified output. LKML-Reference: Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit e80711ca8512c8586da0c3e18e2f1caf73c88731 Author: Masami Hiramatsu Date: Thu Jan 13 21:46:11 2011 +0900 perf probe: Add --funcs to show available functions in symtab Add --funcs to show available functions in symtab. Originally this feature came from Srikar's uprobes patches ( http://lkml.org/lkml/2010/8/27/244 ) e.g. ... __ablkcipher_walk_complete __absent_pages_in_range __account_scheduler_latency __add_pages __alloc_pages_nodemask __alloc_percpu __alloc_reserved_percpu __alloc_skb __alloc_workqueue_key __any_online_cpu __ata_ehi_push_desc ... This also supports symbols in module, e.g. ... cleanup_module cpuid_maxphyaddr emulate_clts emulate_instruction emulate_int_real emulate_invlpg emulator_get_dr emulator_set_dr emulator_task_switch emulator_write_emulated emulator_write_phys fx_init ... Original-patch-from: Srikar Dronamraju Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Franck Bui-Huu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110113124611.22426.10835.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu [ committer note: Add missing elf.h for STB_GLOBAL that broke a RHEL4 build ] Signed-off-by: Arnaldo Carvalho de Melo commit 5069ed86be3c2f28bcdf7fae1374ec0c325aafba Author: Masami Hiramatsu Date: Thu Jan 13 21:46:05 2011 +0900 perf probe: Enable to put probe inline function call site Enable to put probe inline function call site. This will increase line-based probe-ability. $ ./perf probe -L schedule:48 pre_schedule(rq, prev); 50 if (unlikely(!rq->nr_running)) idle_balance(cpu, rq); put_prev_task(rq, prev); next = pick_next_task(rq); 56 if (likely(prev != next)) { sched_info_switch(prev, next); trace_sched_switch_out(prev, next); perf_event_task_sched_out(prev, next); $ ./perf probe -L schedule:48 48 pre_schedule(rq, prev); 50 if (unlikely(!rq->nr_running)) 51 idle_balance(cpu, rq); 53 put_prev_task(rq, prev); 54 next = pick_next_task(rq); 56 if (likely(prev != next)) { 57 sched_info_switch(prev, next); 58 trace_sched_switch_out(prev, next); 59 perf_event_task_sched_out(prev, next); Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Franck Bui-Huu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110113124604.22426.48873.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit 4cc9cec636e7f78aba7f17606ac13cac07ea5787 Author: Masami Hiramatsu Date: Thu Jan 13 21:45:58 2011 +0900 perf probe: Introduce lines walker interface Introduce die_walk_lines() for walking on the line list of given die, and use it in line_range finder and probe point finder. Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Franck Bui-Huu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20110113124558.22426.48170.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu [ committer note: s/%ld/%zd/ for a size_t nlines var that broke f14 x86 build] Signed-off-by: Arnaldo Carvalho de Melo commit 86c3304181a25f127e46c864dc735e21f24484fc Author: Alexander Sverdlin Date: Sun Jan 23 04:01:15 2011 +0300 ASoC: EDB93xx machine sound driver with CS4271 Added support for EDB93xx sound with CS4271 CODEC. Features: - Playback, Capture - Sample rates from 8kHz to 96kHz tested Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6493d24f77d8e4fe94913eb504ed9ffebb433402 Author: Carolyn Wyborny Date: Fri Jan 14 05:33:46 2011 +0000 igb: Add support for i340 Quad Port Fiber Adapter This patch enables support for Intel i340 Quad Port Fiber Adapter. Signed-off-by: Carolyn Wyborny Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 05b9321405efcca9ab217fb65c91915244ebf526 Author: Bruce Allan Date: Wed Jan 5 07:10:38 2011 +0000 e1000e: Use kmemdup rather than duplicating its implementation The semantic patch that makes this output is available in scripts/coccinelle/api/memdup.cocci. More information about semantic patching is available at http://coccinelle.lip6.fr/ Signed-off-by: Bruce Allan Tested-by: Signed-off-by: Jeff Kirsher commit 90da06692532541a38f9857972e1fd6b1cdfb45a Author: Bruce Allan Date: Thu Jan 6 07:02:53 2011 +0000 e1000e: reduce scope of some variables, remove unnecessary ones Static analysis of the driver code found some variables for which the scope can be reduced, or remove the variable altogether. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 67fd4fcb78a7ced369a6bd8a131ec8c65ebd2bbb Author: Jeff Kirsher Date: Fri Jan 7 05:12:09 2011 +0000 e1000e: convert to stats64 Based on the patch provided by Flavio Leitner Provides accurate stats at the time user reads them. v2: fixed whitespace/merging issues (by Jeff Kirsher) v3: fixed namespacing issues (by Bruce Allan) CC: Eric Dumazet Signed-off-by: Jeff Kirsher Tested-by: Jeff Pieper Signed-off-by: Flavio Leitner commit 56f94b1e6eddef55ebc9850ac4e4dfea366401bf Author: Daiane Angolini Date: Thu Dec 9 15:50:49 2010 -0200 ARM: mx5/mx51_3ds: Add watchdog support Signed-off-by: Daiane Angolini Signed-off-by: Sascha Hauer commit 821404434f3324bf23f545050ff64055a149766e Author: David Howells Date: Fri Dec 24 14:48:35 2010 +0000 CacheFiles: Add calls to path-based security hooks Add calls to path-based security hooks into CacheFiles as, unlike inode-based security, these aren't implicit in the vfs_mkdir() and similar calls. Reported-by: Tetsuo Handa Signed-off-by: David Howells Signed-off-by: James Morris commit ced3b93018a9633447ddeb12a96f25e08154cbe7 Author: Shan Wei Date: Wed Jan 19 17:21:44 2011 +0800 security:selinux: kill unused MAX_AVTAB_HASH_MASK and ebitmap_startbit Kill unused MAX_AVTAB_HASH_MASK and ebitmap_startbit. Signed-off-by: Shan Wei Signed-off-by: James Morris commit 63310467a3d1ed6a0460ec1f4268126cd1ceec2e Author: Christoph Lameter Date: Thu Jan 20 11:12:26 2011 -0600 mm: Remove support for kmem_cache_name() The last user was ext4 and Eric Sandeen removed the call in a recent patch. See the following URL for the discussion: http://marc.info/?l=linux-ext4&m=129546975702198&w=2 Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit a37f2f87edc1b6e5932becf6e51535d36b690f2a Author: Chris Wilson Date: Sun Jan 23 12:22:37 2011 +0000 drm/i915: Remove unused code: i915_enable_interrupt() Signed-off-by: Chris Wilson commit e71084af58cf15e6043338500eeaf6281d0a62af Author: Clemens Ladisch Date: Sat Jan 22 15:05:03 2011 +0100 firewire: core: fix card->reset_jiffies overflow On a 32-bit machine with, e.g., HZ=1000, jiffies will overflow after about 50 days, so if there are between 25 and 50 days between bus resets, the card->reset_jiffies comparisons can get wrong results. To fix this, ensure that this timestamp always uses 64 bits. Signed-off-by: Clemens Ladisch Signed-off-by: "Stefan Richter" commit dbc9880fa731fe2482a706bbabb4165269233063 Author: Clemens Ladisch Date: Mon Jan 10 17:29:03 2011 +0100 firewire: cdev: remove unneeded reference For outbound transactions, the IDR's and the callback's references now have exactly the same lifetime, so we do not need both of them. Signed-off-by: Clemens Ladisch Signed-off-by: "Stefan Richter" commit 5a5e62da9be255439e8ce59f96828775b7b33374 Author: Clemens Ladisch Date: Mon Jan 10 17:28:39 2011 +0100 firewire: cdev: always wait for outbound transactions to complete We must not use fw_cancel_transaction() because it cannot correctly abort still-active transactions. The only place in core-cdev where this matters is when the file is released. Instead of trying to abort the transactions, we wait for them to complete normally, i.e., until all outbound transaction resources have been removed from the IDR tree. Signed-off-by: Clemens Ladisch Signed-off-by: "Stefan Richter" commit 3e204dfcaff0e7f6c4d9873fb8c9d948ec5ab2da Author: Clemens Ladisch Date: Mon Jan 10 17:28:27 2011 +0100 firewire: cdev: remove unneeded idr_find() from complete_transaction() Outbound transactions are never aborted with release_client_resource(), so it is not necessary for complete_transaction() to check whether the resource is still registered. Only shutdown_resource() can abort such an transaction, and this is already handled with the in_shutdown check. Signed-off-by: Clemens Ladisch Signed-off-by: "Stefan Richter" commit f117a3e3004381ccadadc5156178c283815ca393 Author: Clemens Ladisch Date: Mon Jan 10 17:21:35 2011 +0100 firewire: ohci: log dead DMA contexts When a DMA context goes into the dead state (and the controller thus stops working correctly), logging this error and the controller's error code might be helpful for debugging. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 5efb94ee144c1c7290652495a0f4f29cae845a62 Author: Jamie Iles Date: Sun Jan 23 18:58:29 2011 +1100 hwrng: pixocell - add support for picoxcell TRNG This driver adds support for the True Random Number Generator in the Picochip PC3X3 and later devices. Signed-off-by: Jamie Iles Acked-by: Matt Mackall Signed-off-by: Herbert Xu commit 7efd95f6270e210be90b94466bd3405b81e8d667 Author: Jesper Juhl Date: Sun Jan 23 18:56:36 2011 +1100 crypto: aesni-intel - Don't leak memory in rfc4106_set_hash_subkey There's a small memory leak in arch/x86/crypto/aesni-intel_glue.c::rfc4106_set_hash_subkey(). If the call to kmalloc() fails and returns NULL then the memory allocated previously by ablkcipher_request_alloc() is not freed when we leave the function. I could have just added a call to ablkcipher_request_free() before we return -ENOMEM, but that started to look too much like the code we already had at the end of the function, so I chose instead to rework the code a bit so that there are now a few labels at the end that we goto when various allocations fail, so we don't have to repeat the same blocks of code (this also reduces the object code size slightly). Signed-off-by: Jesper Juhl Signed-off-by: Herbert Xu commit 0fe6f1d1f612035d78d8d195bbc3485a341386d5 Author: Yuan-Hsin Chen Date: Tue Jan 18 14:49:28 2011 +0800 usb: udc: add Faraday fusb300 driver USB2.0 device controller driver for Faraday fubs300 Signed-off-by: Yuan-Hsin Chen Signed-off-by: Greg Kroah-Hartman commit bc0f23dccad16c7834cb09d943981475be81ddb1 Author: Martin Fuzzey Date: Sun Jan 16 19:17:21 2011 +0100 USB: usbtest - add alignment tests to test script Enhance the test script to call the new tests added to usbtest in order to detect host controllers that don't accept byte aligned DMA. The unaligned tests are called after their aligned equivalents but for fewer iterations (since alignment failure is generally immediate). Signed-off-by: Martin Fuzzey Signed-off-by: Greg Kroah-Hartman commit c17d936e05a186ce5bce2acf2d58a4172df7f435 Author: David Brownell Date: Sun Jan 16 19:17:16 2011 +0100 USB: usbtest - add shell script to test HCDs This patch just adds the script available at http://www.linux-usb.org/usbtest/test.sh as is. Signed-off-by: Martin Fuzzey Signed-off-by: Greg Kroah-Hartman commit 084fb206a91f72b22c4e2f41709730a81e3e0de6 Author: Martin Fuzzey Date: Sun Jan 16 19:17:11 2011 +0100 USB: usbtest - Add tests to ensure HCDs can accept byte aligned buffers. Add a set of new tests similar to the existing ones but using transfer buffers at an "odd" address [ie offset of +1 from the buffer obtained by kmalloc() or usb_alloc_coherent()] The new tests are: #17 : bulk out (like #1) using kmalloc and DMA mapping by USB core. #18 : bulk in (like #2) using kmalloc and DMA mapping by USB core. #19 : bulk out (like #1) using usb_alloc_coherent() #20 : bulk in (like #2) using usb_alloc_coherent() #21 : control write (like #14) #22 : isochonous out (like #15) #23 : isochonous in (like #16) Signed-off-by: Martin Fuzzey Signed-off-by: Greg Kroah-Hartman commit 50a6cb932d5cccc6a165219f137b87ea596b4cd0 Author: wwang Date: Fri Jan 14 16:53:34 2011 +0800 USB: usb_storage: add ums-realtek driver ums_realtek is used to support the power-saving function for Realtek RTS51xx USB card readers. Signed-off-by: wwang Signed-off-by: Greg Kroah-Hartman commit f6c259a39fd7bb8db6661690976a0f05d12b707d Author: Daniel Glöckner Date: Tue Jan 11 00:42:14 2011 +0100 USB: ftdi_sio: fix resolution of 2232H baud rate dividers The 2232H high speed baud rates also support fractional baud rate divisors, but when the performing the divisions before the multiplication, the fractional bits are lost. Signed-off-by: Daniel Glöckner Acked-by: Mark Adamson Signed-off-by: Greg Kroah-Hartman commit 9abff15dd69c6f4ed88ecc8ba089f55e9cf6655e Author: Tejun Heo Date: Mon Jan 3 14:49:42 2011 +0100 USB: ueagle-atm: use system_wq instead of dedicated workqueues With cmwq, there's no reason to use separate workqueues. Drop uea_softc->work_q and use system_wq instead. The used work item is sync flushed on driver detach. Signed-off-by: Tejun Heo Cc: Stanislaw Gruszka Signed-off-by: Greg Kroah-Hartman commit ef58d97a30af66b31f6400e49c87b4d64fc1f5bc Author: Ferenc Wagner Date: Mon Jan 10 19:00:35 2011 +0100 USB: ehci-dbgp: fix typo in startup message Signed-off-by: Ferenc Wagner Signed-off-by: Greg Kroah-Hartman commit 32b801e9fa5e05c179b86802ccb19b3b97d47471 Author: Justin P. Mattock Date: Fri Dec 31 09:40:21 2010 -0800 USB: wusbcore: rh.c Typo change desciptor to descriptor. Change a typo from "desciptor" to "descriptor". Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 0828376deadb93f2e839900065f536ddc1190e73 Author: Tobias Ollmann Date: Sat Dec 25 11:17:01 2010 +0100 USB: Core: Fix minor coding style issues Fixing all coding style issues in buffer.c Signed-off-by: Tobias Ollmann Signed-off-by: Greg Kroah-Hartman commit 60678b60d78cd268a3aed3044dfbbb85760b2c54 Author: Oliver Neukum Date: Sun Dec 19 21:54:48 2010 +0100 USB: add helper to convert USB error codes This converts error codes specific to USB to generic error codes that can be returned to user space. Tests showed that it is so small that it is better inlined. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit b0e8572f3b29c0760b66ba5627a6d5426c88c97d Author: Arnaldo Carvalho de Melo Date: Sun Jan 16 17:39:15 2011 -0200 perf top: Add native_safe_halt to skip symbols Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 529363b76929beb85b81439c61063130af046a21 Author: Frederic Weisbecker Date: Fri Jan 14 04:52:01 2011 +0100 perf callchain: Don't give arbitrary gender to callchain tree nodes Some little callchain tree nodes shyly asked me if they can have sisters. How cute! Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1294977121-5700-5-git-send-email-fweisbec@gmail.com> Signed-off-by: Frederic Weisbecker Signed-off-by: Arnaldo Carvalho de Melo commit 16537f1355017a285b904bfb6bf767464293e69c Author: Frederic Weisbecker Date: Fri Jan 14 04:52:00 2011 +0100 perf callchain: Rename register_callchain_param into callchain_register_param To make the callchain API naming more consistent. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1294977121-5700-4-git-send-email-fweisbec@gmail.com> Signed-off-by: Frederic Weisbecker Signed-off-by: Arnaldo Carvalho de Melo commit f08c3154ac439c4b5762a40107d84e839e08fbc5 Author: Frederic Weisbecker Date: Fri Jan 14 04:51:59 2011 +0100 perf callchain: Rename cumul_hits into callchain_cumul_hits That makes the callchain API naming more consistent and reduce potential naming clashes. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1294977121-5700-3-git-send-email-fweisbec@gmail.com> Signed-off-by: Frederic Weisbecker Signed-off-by: Arnaldo Carvalho de Melo commit 1b3a0e9592ebf174af934b3908a2bf6a6fa86169 Author: Frederic Weisbecker Date: Fri Jan 14 04:51:58 2011 +0100 perf callchain: Feed callchains into a cursor The callchains are fed with an array of a fixed size. As a result we iterate over each callchains three times: - 1st to resolve symbols - 2nd to filter out context boundaries - 3rd for the insertion into the tree This also involves some pairs of memory allocation/deallocation everytime we insert a callchain, for the filtered out array of addresses and for the array of symbols that comes along. Instead, feed the callchains through a linked list with persistent allocations. It brings several pros like: - Merge the 1st and 2nd iterations in one. That was possible before but in a way that would involve allocating an array slightly taller than necessary because we don't know in advance the number of context boundaries to filter out. - Much lesser allocations/deallocations. The linked list keeps persistent empty entries for the next usages and is extendable at will. - Makes it easier for multiple sources of callchains to feed a stacktrace together. This is deemed to pave the way for cfi based callchains wherein traditional frame pointer based kernel stacktraces will precede cfi based user ones, producing an overall callchain which size is hardly predictable. This requirement makes the static array obsolete and makes a linked list based iterator a much more flexible fit. Basic testing on a big perf file containing callchains (~ 176 MB) has shown a throughput gain of about 11% with perf report. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1294977121-5700-2-git-send-email-fweisbec@gmail.com> Signed-off-by: Frederic Weisbecker Signed-off-by: Arnaldo Carvalho de Melo commit de5fa3a8a05cd60f59622e88cfeb90416760d78e Author: Arnaldo Carvalho de Melo Date: Sat Jan 15 10:42:46 2011 -0200 perf test: Add test for the evlist mmap routines This test will generate random numbers of calls to some getpid syscalls, then establish an mmap for a group of events that are created to monitor these syscalls. It will receive the events, using mmap, use its PERF_SAMPLE_ID generated sample.id field to map back to its respective perf_evsel instance. Then it checks if the number of syscalls reported as perf events by the kernel corresponds to the number of syscalls made. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 04391debc3e1195222a4dbb162ace6542dd89c1c Author: Arnaldo Carvalho de Melo Date: Sat Jan 15 10:40:59 2011 -0200 perf evlist: Steal mmap reading routine from 'perf top' Will be used in the upcoming 'perf test' entry for the evlist mmap routines. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 98d77b78504a423fca911a26a17bee00ef2fdda2 Author: Han Pingtian Date: Sat Jan 15 07:00:50 2011 +0800 perf test: check if cpu_map__new() return NULL It looks like we should check if cpus is NULL after cpus = cpu_map__new(NULL); in test__open_syscall_event_on_all_cpus(). LKML-Reference: <20110114230050.GA7011@localhost> Signed-off-by: Han Pingtian Signed-off-by: Arnaldo Carvalho de Melo commit d2af9687c96f3864178de1860e6d83873aeef224 Author: Arnaldo Carvalho de Melo Date: Fri Jan 14 16:24:49 2011 -0200 perf test: Check counts on all cpus in test__open_syscall_event_on_all_cpus We were bailing out after the first count mismatch, do it in all to see if only some CPUs are not getting the expected number of events. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 915fce20ecf8f7ff4189d0fff42b62aebf6a57cc Author: Arnaldo Carvalho de Melo Date: Fri Jan 14 16:19:12 2011 -0200 perf tools: Add missing cpu_map__delete() Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 0a27d7f9f417c0305f7efa70631764a53c7af219 Author: Arnaldo Carvalho de Melo Date: Fri Jan 14 15:50:51 2011 -0200 perf record: Use perf_evlist__mmap There is more stuff that can go to the perf_ev{sel,list} layer, like detecting if sample_id_all is available, etc, but lets try using this in 'perf test' first. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 70db7533caef02350ec8d6852e589491bca3a951 Author: Arnaldo Carvalho de Melo Date: Wed Jan 12 22:39:13 2011 -0200 perf evlist: Move the mmap array from perf_evsel Adopting the new model used in 'perf record', where we don't have a map per thread per cpu, instead we have an mmap per cpu, established on the first fd for that cpu and ask the kernel using the PERF_EVENT_IOC_SET_OUTPUT ioctl to send events for the other fds on that cpu for the one with the mmap. The methods moved from perf_evsel to perf_evlist, but for easing review they were modified in place, in evsel.c, the next patch will move the migrated methods to evlist.c. With this 'perf top' now uses the same mmap model used by 'perf record' and the next patches will make 'perf record' use these new routines, establishing a common codebase for both tools. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 115d2d8963a426670ac3ce983fc4c4e001703943 Author: Arnaldo Carvalho de Melo Date: Wed Jan 12 17:11:53 2011 -0200 perf record: Move perf_mmap__write_tail to perf.h Close to perf_mmap__read_head() and the perf_mmap struct definition. This is useful for any recorder, and we will need it in 'perf test'. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 744bd8aa3c8b43447f689a27872fa95e700b8a4f Author: Arnaldo Carvalho de Melo Date: Wed Jan 12 17:07:28 2011 -0200 perf record: Use struct perf_mmap and helpers Paving the way to using perf_evsel->mmap, do this to reduce the patch noise in the next ones. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 70082dd92c4b288bd723a77897e2b555f0e63113 Author: Arnaldo Carvalho de Melo Date: Wed Jan 12 17:03:24 2011 -0200 perf evsel: Introduce mmap support Out of the code in 'perf top'. Record is next in line. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit dd7927f4f8ee75b032ff15aeef4bda49719a443a Author: Arnaldo Carvalho de Melo Date: Wed Jan 12 14:28:51 2011 -0200 perf record: Use perf_evsel__open Now its time to factor out the mmap handling bits into the perf_evsel class. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 72cb7013e08dec29631e0447f9496b7bacd3e14b Author: Arnaldo Carvalho de Melo Date: Wed Jan 12 10:52:47 2011 -0200 perf top: Use perf_evsel__open Now that it handles group_fd and inherit we can use it, sharing it with stat. Next step: 'perf record' should use, then move the mmap_array out of ->priv and into perf_evsel, with top and record sharing this, and at the same time, write a 'perf test' stress test. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 9d04f1781772e11bd58806391555fc23ebb54377 Author: Arnaldo Carvalho de Melo Date: Wed Jan 12 00:08:18 2011 -0200 perf evsel: Allow specifying if the inherit bit should be set As this is a per-cpu attribute, we can't set it up in advance and use it for all the calls. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit f08199d314458610d4ca52f8e86e0a4ec7a7bc54 Author: Arnaldo Carvalho de Melo Date: Tue Jan 11 23:42:19 2011 -0200 perf evsel: Support event groups The perf_evsel__open now have an extra boolean argument specifying if event grouping is desired. The first file descriptor created on a CPU becomes the group leader. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 5c581041cf97aa7980b442de81ddea8273d6dcde Author: Arnaldo Carvalho de Melo Date: Tue Jan 11 22:30:02 2011 -0200 perf evlist: Adopt the pollfd array Allocating just the space needed for nr_cpus * nr_threads * nr_evsels, not the MAX_NR_CPUS and counters. LKML-Reference: Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit 361c99a661a78ed22264649440e87fe4fe8da1f2 Author: Arnaldo Carvalho de Melo Date: Tue Jan 11 20:56:53 2011 -0200 perf evsel: Introduce perf_evlist Killing two more perf wide global variables: nr_counters and evsel_list as a list_head. There are more operations that will need more fields in perf_evlist, like the pollfd for polling all the fds in a list of evsel instances. Use option->value to pass the evsel_list to parse_{events,filters}. LKML-Reference: Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit cd7eab44e9946c28d595abe3e9a43e945bc49141 Author: Ben Hutchings Date: Wed Jan 19 21:01:44 2011 +0000 genirq: Add IRQ affinity notifiers When initiating I/O on a multiqueue and multi-IRQ device, we may want to select a queue for which the response will be handled on the same or a nearby CPU. This requires a reverse-map of IRQ affinity. Add a notification mechanism to support this. This is based closely on work by Thomas Gleixner . Signed-off-by: Ben Hutchings Cc: linux-net-drivers@solarflare.com Cc: Tom Herbert Cc: David Miller LKML-Reference: <1295470904.11126.84.camel@bwh-desktop> Signed-off-by: Thomas Gleixner commit 3cbea4366f17dcb22f3bf5f253eeb86b622d24d0 Author: Tony Finch Date: Tue Jan 18 20:12:49 2011 +0000 unifdef: update to upstream version 2.5 Fix a long-standing cpp compatibility bug. The -DFOO argument (without an explicit value) should define FOO to 1 not to the empty string. Add a -o option to support overwriting a file in place, and a -S option to list the nesting depth of symbols. Include line numbers in debugging output. Support CRLF newlines. Signed-off-by: Tony Finch Signed-off-by: Michal Marek commit 4b3fd57138c969dd940651fadf90db627254edbf Author: Simon Horman Date: Sat Jan 22 13:48:01 2011 +1100 IPVS: Change sock_create_kernel() to __sock_create() The recent netns changes omitted to change sock_create_kernel() to __sock_create() in ip_vs_sync.c The effect of this is that the interface will be selected in the root-namespace, from my point of view it's a major bug. Reported-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 091bb34c143674d37a59b2d4857534f7106c5d7d Author: Changli Gao Date: Fri Jan 21 18:02:13 2011 +0800 netfilter: ipvs: fix compiler warnings Fix compiler warnings when no transport protocol load balancing support is configured. [horms@verge.net.au: removed suprious __ip_vs_cleanup() clean-up hunk] Signed-off-by: Changli Gao Signed-off-by: Simon Horman commit 8b4d95fc76b85696c508f316810a6fbc15a7b8c5 Author: Sahitya Tummala Date: Tue Jan 18 11:22:50 2011 +0530 msm: 8x50: Add initial support for SDCC Signed-off-by: Sahitya Tummala commit 7a89248a47d201e6ade2daddd79b0fd902cad400 Author: Sahitya Tummala Date: Tue Jan 18 11:22:49 2011 +0530 mmc: msm_sdcc: Add gpio handling function to driver Configure SDCC GPIOs when the host is powered up or powered off. Signed-off-by: Sahitya Tummala commit 23624935e0c4b04730ed8d7d21f0cd25b2c2cda1 Author: Eric Dumazet Date: Fri Jan 21 16:26:09 2011 -0800 net_sched: TCQ_F_CAN_BYPASS generalization Now qdisc stab is handled before TCQ_F_CAN_BYPASS test in __dev_xmit_skb(), we can generalize TCQ_F_CAN_BYPASS to other qdiscs than pfifo_fast : pfifo, bfifo, pfifo_head_drop and sfq SFQ is special because it can have external classifiers, and in these cases, we cannot bypass queue discipline (packet could be dropped by classifier) without admin asking it, or further changes. Its worth doing this, especially for SFQ, avoiding dirtying memory in case no packets are already waiting in queue. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit ec8f29e70edceb93c021148a99a5c3889cdc1b08 Author: Stepan Moskovchenko Date: Tue Dec 21 12:38:05 2010 -0800 serial: msm: Add support for UARTDM cores Add support for the next-generation version of the MSM UART to the msm_serial driver. This version of the hardware is similar to the original version, but has some DMA capabilities that are used in PIO mode in this driver. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit d41cb8c95681345ded5ef1e78d235d06d68baee2 Author: Stepan Moskovchenko Date: Mon Jan 17 20:33:32 2011 -0800 msm: Add name field to UART resources Add a name field to the I/O resources for the UARTs on MSM targets in preparation for updates to the msm_serial driver. The driver assumed there is one I/O resource per UART, which is not the case on all targets. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit f35c0c560994226847fa33f0021046a44ab1460f Author: Wey-Yi Guy Date: Thu Jan 13 17:09:29 2011 -0800 iwlwifi: initial P2P support If PAN functionality is present, advertise P2P interface type support and thus support for P2P. However, the support is currently somewhat incomplete -- NoA schedule isn't added to probe responses, and 11b bitrates may be used still, etc. Therefore, make it all optional with a Kconfig option. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 940739196c78576590dd155c1b9d8a705cea2af1 Author: Johannes Berg Date: Thu Jan 6 08:07:11 2011 -0800 iwlwifi: replace minimum slot time constant There are a number of places where the minimum slot time is hardcoded to 20 TU, add a new constant for that and use it everywhere. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 9b9190d9688ccf531a3a5dac84d7b9654a08bfc5 Author: Johannes Berg Date: Thu Jan 6 08:07:10 2011 -0800 iwlwifi: implement remain-on-channel For device supporting PAN/P2P, use the PAN context to implement the remain-on-channel operation using device offloads so that the filters in the device will be programmed correctly -- otherwise we cannot receive any probe request frames during off-channel periods. Signed-off-by: Johannes Berg commit 9d4dea7259d2fccf447f20788300121cf1d014bb Author: Meenakshi Venkataraman Date: Thu Jan 13 11:35:26 2011 -0800 iwlagn: Enable idle powersave mode in 1000 series The iwlagn powersave algorithm uses the supports_idle parameter to tell the device to save power when it is not associated with an AP and is idle. Enable this feature for the 1000 series of devices. Reported-by: Johannes Berg Signed-off-by: Meenakshi Venkataraman Signed-off-by: Wey-Yi Guy commit 24834d2c8455a6eeee82e007d41d7e05986d134f Author: Jay Sternberg Date: Tue Jan 11 15:41:00 2011 -0800 iwlwifi: correct debugfs data dumped from sram the sram data dumped through the debugfs interface would only work properly when dumping data on even u32 boundaries and swap bytes based on endianness on that boundary making byte arrays impossible to read. now addresses are displayed at the start of every line and the data is displayed consistently if dumping 1 byte or 20 and regardless of what is the starting address. if no lenght given, address displayed is u32 in device format Signed-off-by: Jay Sternberg Signed-off-by: Wey-Yi Guy commit fcdf1f73fe913c5f16b7f0547cc3df1b0796689f Author: Wey-Yi Guy Date: Mon Jan 10 14:34:38 2011 -0800 iwlwifi: add hw rev for 2000 series devices 2000 series device has different HW rev, add it Signed-off-by: Wey-Yi Guy commit 14a75766f38d44ca715d9e9ccb0a69e065e4a24e Author: Wey-Yi Guy Date: Mon Jan 10 14:24:28 2011 -0800 iwlwifi: remove g2 from csr hw rev Remove refernce of g2 and use offical number for hw rev. Signed-off-by: Wey-Yi Guy commit 52d8a50c39e95bce686cb5c5da4dbb2f61ffb92b Author: Wey-Yi Guy Date: Tue Jan 11 15:59:49 2011 -0800 iwlagn: remove Gen2 from Kconfig Remove Gen 2 from Kconfig file since 6005/6030/6150 series of products are released. Signed-off-by: Wey-Yi Guy commit d380cbceea926795efe5ef434c60ed03859425eb Author: Wey-Yi Guy Date: Tue Jan 11 15:54:19 2011 -0800 iwlagn: add 2000 series to Kconfig Add 2000 series support to Kconfig Signed-off-by: Wey-Yi Guy commit 04b8e7510015944a6c8198434cee14fb3bbff67a Author: Wey-Yi Guy Date: Sat Jan 8 11:47:56 2011 -0800 iwlagn: add 2000 series pci id Add PCI ID supports for all 2000 series devices Signed-off-by: Wey-Yi Guy commit c5a5e1853a6d87eb9f58bf8930e267d619dd24f6 Author: Wey-Yi Guy Date: Fri Jan 21 15:47:21 2011 -0800 iwlagn: 2000 series devices support Adding 2000 series devices supports, the 2000 series devices has many different SKUs which includes 1x1 and 2x2 devices,also with and without BT combo. Signed-off-by: Wey-Yi Guy commit fa57980e402cfe2e3651f1104c23a4517849ec91 Author: Wey-Yi Guy Date: Sat Jan 8 11:47:54 2011 -0800 iwlagn: add 2000 series EEPROM version Adding EEPROM version for 2000 series devices Signed-off-by: Wey-Yi Guy commit 1956e1ad6292d257219d0f98a53f0a78ef282070 Author: Wey-Yi Guy Date: Sat Jan 8 10:25:14 2011 -0800 iwlagn: remove reference to gen2a and gen2b Since 6005, 6030 and 6150 series are offical released, remove the reference to gen2x and use the product number instead. Signed-off-by: Wey-Yi Guy commit 50ede4e39aa5b61685ca87f58422478b1a538ca8 Author: Stepan Moskovchenko Date: Mon Dec 13 18:12:19 2010 -0800 msm: Support for the MSM8960 RUMI3 target Add the machine record, init code, and build support for the MSM8960 RUMI3. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit f441ca2d403cf74ebffbc07a3ccd402efd995799 Author: Stepan Moskovchenko Date: Wed Dec 1 19:31:16 2010 -0800 msm: Support for the MSM8960 Simulator target Add the board file, Kconfig options, and Makefile options needed to build for the MSM8960 Simulator target. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit decd4a9d3671cd95a46ca0e004700077d81c370d Author: Stepan Moskovchenko Date: Thu Dec 9 19:16:13 2010 -0800 msm: Makefile cleanup Clean up some of the conditionals in the Makefile in preparation for adding build support for MSM8960. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit a81c8c38ed06c5f59d62a2257d21ed02d2af38fe Author: Stepan Moskovchenko Date: Wed Dec 1 19:25:14 2010 -0800 msm: timer: Timer support for MSM8960 Modify the macros in the MSM timer driver to support the MSM8960 chip. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit b83ce5812a1581655df8d1502398f03408539ba5 Author: David Brown Date: Wed Jan 12 12:55:16 2011 -0800 msm: Add MSM 8960 cpu_is check Signed-off-by: David Brown commit a6481cd3d901165100e12f9f1f7787293d757574 Author: Stepan Moskovchenko Date: Wed Dec 1 19:30:35 2010 -0800 msm: irqs-8960: Interrupt map for MSM8960 Add the interrupt map for the Qualcomm MSM8960 chip. This chip has an interrupt map that is different from previous targets. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit a2ad9421ce19f57e99b7a5e8798b8697b916d673 Author: Stepan Moskovchenko Date: Wed Dec 1 20:06:26 2010 -0800 msm: Physical offset for MSM8960 Add the physical memory offset value for the Qualcomm MSM8960 chip. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 5d0afd74b7f5202cad2d26b5bcd1fc1bdf44858f Author: Stepan Moskovchenko Date: Wed Dec 1 19:05:49 2010 -0800 msm: io: I/O register definitions for MSM8960 Add the register address definitions for the basic hardware blocks on the Qualcomm MSM8960 chip. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 8bb06444804c58dffcb5d048381c6378d2b007f7 Author: David Brown Date: Tue Jan 4 11:02:59 2011 -0800 msm: Generalize QGIC registers The QGIC registers are mapped to the same virtual addresses across targets, only the physical address changes. Move the BASE address out of target-specific files, and add a SOC name to the base addresses. Signed-off-by: David Brown commit 8c27e6f305242ffab0c88eed5dea8394b8ce86d0 Author: David Brown Date: Fri Jan 7 10:20:49 2011 -0800 msm: Generalize timer register mappings Allow the timer register to be determined dynamically instead of at compile time. Use common virtual addresses for the registers across all MSM chips, and select the register mappings based on the detected CPU. Signed-off-by: David Brown commit 87fa28e972c223f69c1315a1b2ddb2a11d33ad0e Author: David Brown Date: Tue Jan 4 17:02:48 2011 -0800 msm: Add CPU queries Create runtime queries to distinguish the various MSM targets. Although these would probably be better named soc_is..., use cpu_is... to match convention in the rest of the kernel. Hard code the tests based on config options for now. When runtime device detection is implemented, these can be made dynamic. Signed-off-by: David Brown commit 5ed540aecc2aae92d5c97b9a9306a5bf88ad5574 Author: Wey-Yi Guy Date: Fri Jan 21 15:26:39 2011 -0800 iwlwifi: use mac80211 throughput trigger Instead of keeping track of LED blink speed in the driver, use the new mac80211 trigger and link it up with an LED classdev that we now register. This also allows users more flexibility in how they want to have the LED blink or not. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 4a4fdf2e0b9e3534f6ec4f3e7077470bd66924ab Author: Felix Fietkau Date: Fri Jan 21 18:46:35 2011 +0100 ath9k_hw: replace magic values in register writes with proper defines Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 2b1351a30705925ed06b41ec98a6fbaad4ba4d6f Author: Bruno Randolf Date: Fri Jan 21 12:19:52 2011 +0900 ath5k: Simplify loop when setting up channels Simplify confusing code and get rid of an unnecessary variable. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit d7e86c3219a1287dd1350a590ee79c8753ff2420 Author: Felix Fietkau Date: Thu Jan 20 21:57:30 2011 +0100 ath9k: remove a bogus error message When beacons are being added or removed for an interface, ieee80211_beacon_get will sometimes not return a beacon. This is normal and should not result in useless logspam. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit bb134d2298b49f50cf6d9388410fba96272905dc Author: Eric Dumazet Date: Thu Jan 20 19:18:08 2011 +0000 net: netif_setup_tc() is static Signed-off-by: Eric Dumazet Acked-by: John Fastabend Signed-off-by: David S. Miller commit e26a755211c72ccfc52faf4e647757a058eb131a Author: Alexey Khoroshilov Date: Thu Jan 20 00:13:44 2011 +0300 Staging: pohmelfs/dir.c: Remove unneeded mutex_unlock() from pohmelfs_rename() I do not see any reason for the mutex_unlock(&inode->i_mutex); in pohmelfs_rename(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Acked-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 4ac638b2ce0738183019c9fe72a8cd1259eb2ad1 Author: Naveen Kumar Gaddipati Date: Fri Jan 21 15:50:16 2011 +0530 staging: synaptics: Update with the kernel object name of touch device Update with the kernel object name of touch device for getting the regulator of the synaptics rmi4 touch device. Signed-off-by: Naveen Kumar Gaddipati Signed-off-by: Greg Kroah-Hartman commit 3ec6080e2e5be05e6f7fbbe5ab20b0eab84e166b Author: Ralph Loader Date: Fri Jan 21 19:27:53 2011 +1300 staging: Fix some incorrect use of positive error codes. Use -E... instead of just E... in a few places where negative error codes are expected by a functions callers. These were found by grepping with coccinelle & then inspecting by hand to determine which were bugs. The staging/cxt1e1 driver appears to intentionally use positive E... error codes in some places, and negative -E... error codes in others, making it hard to know which is intended where - very likely I missed some problems in that driver. Signed-off-by: Ralph Loader Signed-off-by: Greg Kroah-Hartman commit 930a7622d618cdf794787938d7cbda5461adb1cb Author: Bruno Randolf Date: Wed Jan 19 18:21:13 2011 +0900 ath5k: Remove redundant sc->curband Remove sc->curband because the band is already stored in the current channel. Signed-off-by: Bruno Randolf Acked-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 4b3721ceb3c1f9b032c6eeb108e44692efbcacef Author: Bruno Randolf Date: Wed Jan 19 18:21:08 2011 +0900 ath5k: Remove unused sc->curmode sc->curmode is set but never used. Remove it and the helper function. Also the ath5k_rate_update which is refered to in the comment does not exist (any more?) so we don't need to setup the band in that place. Signed-off-by: Bruno Randolf Acked-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 75f9569bfc4f3b138d196091b85c91678183520e Author: Bruno Randolf Date: Wed Jan 19 18:21:02 2011 +0900 ath5: Remove unused CTL definitions They are unused in ath5k and a more detailled definition is in ath/regd_common.h. Signed-off-by: Bruno Randolf Acked-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 410e6120a500edcf3fb8239301deabf20a4310db Author: Bruno Randolf Date: Wed Jan 19 18:20:57 2011 +0900 ath5k: Add 802.11j 4.9GHz channels to allowed channels Add the 802.11j (20MHz channel width) channels to the allowed channels. This still does not enable 802.11j in ath5k since these frequencies are out of the configured range. A later patch will deal with that. Signed-off-by: Bruno Randolf Acked-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 01ebd764dab26b3064b0c73ddcf726dd4b41485a Author: Vasiliy Kulikov Date: Mon Jan 17 13:08:49 2011 +0300 staging: cs5535_gpio: check put_user() return code put_user() may fail, if so return -EFAULT. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit 2f644ccfc5a3195290d12b8eedf18a37bba27d98 Author: Ian Abbott Date: Tue Jan 18 17:44:33 2011 +0000 staging: comedi: Make INSN_BITS behavior consistent across drivers Most comedi hardware drivers that support the INSN_BITS instruction ignore the base channel (specified by insn->chanspec) and assume it is 0. The base channel is supposed to affect how the mask (in data[0]) and bits (in data[1]) are treated. Bit 0 applies to the base channel, bit 1 applies to base channel plus 1, etc. For subdevices with no more than 32 channels, this patch modifies the chanspec and data before presenting it to the hardware driver, and modifies the data bits read back by the hardware driver (into data[1]). This makes it appear to the hardware driver that the base channel was set to 0. For subdevices with more than 32 channels, the instruction is left unmodified, as it is assumed that the hardware driver takes note of the base channel in this case in order to provide access beyond channel 31. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 0810569076c1f3cf4a82da40211dd0b07b3ad07e Author: Bruno Randolf Date: Wed Jan 19 18:20:47 2011 +0900 ath5k: Rename ath5k_copy_channels Rename ath5k_copy_channels() to ath5k_setup_channels() - nothing is copied here. Signed-off-by: Bruno Randolf Acked-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 90c02d72ffbec3804f48c517ecfc72f9440a67b3 Author: Bruno Randolf Date: Wed Jan 19 18:20:36 2011 +0900 ath5k: Use mac80211 channel mapping function Use mac80211 channel mapping function instead of own homegrown version. Signed-off-by: Bruno Randolf Acked-by: Bob Copeland Signed-off-by: John W. Linville commit 7755bad9ffe56e0faacb13bc9484ccc0194aaa75 Author: Ben Greear Date: Tue Jan 18 17:30:00 2011 -0800 ath9k: Try more than one queue when scheduling new aggregate. Try all xmit queues until the hardware buffers are full. Signed-off-by: Ben Greear Acked-by: Felix Fietkau Signed-off-by: John W. Linville commit 55f6d0fff64dfee57812e821f846b068a8c2df01 Author: Ben Greear Date: Mon Jan 17 11:54:50 2011 -0800 ath9k: Add 'misc' file to debugfs, fix queue indexes. Add a misc file to show hardware op-mode, irq setup, number of various types of VIFs and more. Also, previous patches were using the wrong xmit queue indexes. Change to use the internal ath9k indexes instead of the mac80211 queue indexes. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 59eb21a6504731fc16db4cf9463065dd61093e08 Author: Bruno Randolf Date: Mon Jan 17 13:37:28 2011 +0900 cfg80211: Extend channel to frequency mapping for 802.11j Extend channel to frequency mapping for 802.11j Japan 4.9GHz band, according to IEEE802.11 section 17.3.8.3.2 and Annex J. Because there are now overlapping channel numbers in the 2GHz and 5GHz band we can't map from channel to frequency without knowing the band. This is no problem as in most contexts we know the band. In places where we don't know the band (and WEXT compatibility) we assume the 2GHz band for channels below 14. This patch does not implement all channel to frequency mappings defined in 802.11, it's just an extension for 802.11j 20MHz channels. 5MHz and 10MHz channels as well as 802.11y channels have been omitted. The following drivers have been updated to reflect the API changes: iwl-3945, iwl-agn, iwmc3200wifi, libertas, mwl8k, rt2x00, wl1251, wl12xx. The drivers have been compile-tested only. Signed-off-by: Bruno Randolf Signed-off-by: Brian Prodoehl Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit 60f2d1d506195803fa6e1dcf3972637b740fdd60 Author: Ben Greear Date: Sun Jan 9 23:11:52 2011 -0800 ath9k: Restart xmit logic in xmit watchdog. The system can get into a state where the xmit queue is stopped, but there are no packets pending, so the queue will not be restarted. Add logic to the xmit watchdog to attempt to restart the xmit logic if this situation is detected. Example 'dmesg' output: ath: txq: f4e723e0 axq_qnum: 2, mac80211_qnum: 2 axq_link: f4e996c8 pending frames: 1 axq_acq empty: 1 stopped: 0 axq_depth: 0 Attempting to restart tx logic. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 71e025a5a630681ad8b37d4426a994d199976ec9 Author: Ben Greear Date: Sun Jan 9 23:11:50 2011 -0800 ath9k: More xmit queue debugfs information. To try to figure out why xmit logic hangs. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 7f010c93d73847ffc6b74b572fef9a63e305d65e Author: Ben Greear Date: Sun Jan 9 23:11:49 2011 -0800 ath9k: Keep track of stations for debugfs. The stations hold the ath_node, which holds the tid and other xmit logic structures. In order to debug stuck xmit logic, we need a way to print out the tid state for the stations. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit bda8addaed08834956d5695212717893a2e0cb13 Author: Ben Greear Date: Sun Jan 9 23:11:48 2011 -0800 ath9k: Add counters to distinquish AMPDU enqueues. Show counters for pkts sent directly to hardware and those queued in software. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 082f65368991f6bb7499c379754505cb674708b1 Author: Ben Greear Date: Sun Jan 9 23:11:47 2011 -0800 ath9k: Ensure xmit makes progress. If the txq->axq_q is empty, the code was breaking out of the tx_processq logic without checking to see if it should transmit other queued AMPDU frames (txq->axq_acq). This patches ensures ath_txq_schedule is called. This needs review. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 9244f48d0052ae17b4af70bfc46ad544c4c06a50 Author: Ben Greear Date: Sun Jan 9 23:11:46 2011 -0800 ath9k: Remove un-used member from ath_node. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 2dac4fb97a41af1e6b7ab9f59c837d20838e92da Author: Ben Greear Date: Sun Jan 9 23:11:45 2011 -0800 ath9k: Add more information to debugfs xmit file. Should help debug strange tx lockup type issues. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 233536e126056f65a8aac7ff38788d19dbb53299 Author: Ben Greear Date: Sun Jan 9 23:11:44 2011 -0800 ath9k: Initialize ah->hw Previous code left it NULL. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 1f427dd913a1bf61f2d124d12a022ca2f1d27f53 Author: Ben Greear Date: Sun Jan 9 23:11:43 2011 -0800 ath9k: Show some live tx-queue values in debugfs. I thought this might help track down stuck queues, etc. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit b305dae488193b65cfa80e1c06c0aa0ce60005a9 Author: Ben Greear Date: Sat Jan 8 10:30:54 2011 -0800 mac80211: Fix skb-copy failure debug message. This particular error isn't about multicast. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit ea67485ae6894e603984c3b13b8df54ae2c128d8 Author: Johannes Berg Date: Tue Jan 4 16:22:03 2011 -0800 iwlwifi: fix 4965 notification wait setup The notification wait support code is shared between 4965 and other AGN devices, so 4965 also has to initialize the data structures for it, otherwise it crashes. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2a1a78d240c68b918406cb5b31a375eaf1dc1835 Author: Johannes Berg Date: Tue Jan 4 16:22:02 2011 -0800 iwlagn: return error if PAN disable timeout Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 311dce71b6af263a630717d77bd49cffc0d122a5 Author: Johannes Berg Date: Tue Jan 4 16:22:01 2011 -0800 iwlagn: properly wait for PAN disable Previously I hacked this with an msleep(300) which was fine since we never had longer PAN time slots, but now that we will have them I need to fix that. Use the new notification wait support to properly wait for the WIPAN deactivation complete signal from the ucode. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 7194207ceea7a54c846e0865d2459f4887fe1e0d Author: Johannes Berg Date: Tue Jan 4 16:22:00 2011 -0800 iwlagn: add support for waiting for notifications In order to implement waiting for notifications, add a structure that captures the information, and a list of such structures that will be traversed when a command is received from the ucode. Use sparse checking to make sure calls to the prepare/wait/cancel functions are always nested correctly. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit f945f1087f1fe20f9c626daa175b677736fc614d Author: Johannes Berg Date: Tue Jan 4 16:21:59 2011 -0800 iwlagn: make iwl_rx_handle static It's not used or likely to be needed from other files, so it can be static. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 7bd74cd0e5f56088c0aa873bb6ba0dab0b21a7e1 Author: Jesper Juhl Date: Mon Jan 10 23:23:10 2011 +0100 Staging: FT1000: remove duplicate inc of linux/slab.h linux/slab.h is included twice in ft1000_dnld.c - remove duplicate. Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 34381c22b0a26ef6663f5fd92574d3f45243cabf Author: Peter Huewe Date: Mon Jan 10 23:28:06 2011 +0100 staging/vt6655: fix sparse warning "obsolete struct initializer" This patch fixes the sparse warnings "obsolete struct initializer, use C99 syntax" in vt6655/device_main.c by converting the struct to C99 syntax KernelVersion: linux-next-20110110 Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit eb8393926688a6ce784c35d26dcde005e769bbdc Author: Peter Huewe Date: Mon Jan 10 23:18:33 2011 +0100 staging/comedi/icp_multi: fix sparse warning "obsolete struct initializer" This patch fixes the sparse warnings "obsolete struct initializer, use C99 syntax" in icp_multi.c by converting the struct to C99 syntax KernelVersion: linux-next-20110110 Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit 56aec8de6ee32cde195ae83ce765583191238860 Author: Peter Huewe Date: Mon Jan 10 23:07:16 2011 +0100 staging/comedi/me4000: fix sparse warning "obsolete struct initializer" This patch fixes the sparse warnings in me4000.c: me4000.c:122:1: warning: obsolete struct initializer, use C99 syntax me4000.c:123:1: warning: obsolete struct initializer, use C99 syntax me4000.c:124:1: warning: obsolete struct initializer, use C99 syntax me4000.c:125:1: warning: obsolete struct initializer, use C99 syntax by converting the struct to use C99 syntax Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit e8b754ee8f71835281bdcea91d0ab37718abadb6 Author: Tomas Winkler Date: Wed Jan 19 00:24:10 2011 +0200 staging: easycap: replace STRINGIZE with __stringify() Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 5a858078942a6cb75f1d3ac44e8077bc228f32a8 Author: Tomas Winkler Date: Wed Jan 19 00:24:09 2011 +0200 staging: easycap: kill EASYCAP_NEEDS_CARD_CREATE for in-tree driver we can use snd_card_create for backports to older kernels this can be easily wrapped Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 1dc6e41825aa270cfc0166beb54afb1c235dc803 Author: Tomas Winkler Date: Wed Jan 19 00:24:06 2011 +0200 staging: easycap: drop redunant backslashes from the code remove \ from the code where C syntex doesnt require it Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 2a9a05c43294d703e351753da49231c47e0aad0d Author: Tomas Winkler Date: Tue Jan 18 14:03:23 2011 +0200 Staging: easycap: fix sparse warnings for module parameters easycap_main.c:34:5: warning: symbol 'easycap_debug' was not declared. Should it be static? easycap_main.c:36:5: warning: symbol 'easycap_gain' was not declared. Should it be static? These two variables actually were declared in several places. The variables are used in several files. I've fixed "easycap_debug" so it gets declared in one place only and included properly. For "easycap_gain" made it static and I created added a ->gain member to the easycap struct. This seems cleaner than using a global variable and later on we may make this controlable via sysfs. Cc:Mike Thomas Signed-off-by: Tomas Winkler Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit a9855917290fc40dbfd67d3ee06c190667d6c5b5 Author: Mike Thomas Date: Mon Jan 10 18:41:11 2011 +0000 staging: easycap: add ALSA support This is necessary because some distributions are disabling OSS entirely. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit b54a28a418b2730bf61554864fee3fb24f79e182 Author: Larry Finger Date: Fri Jan 14 15:02:18 2011 -0600 staging: r8712u: Firmware changes for driver * select FW_LOADER in Kconfig - From: Stefan Lippers-Hollmann * declare MODULE_FIRMWARE for r8712u and change to correct directory * delete 10K line farray.h containing internal firmware Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit c84a7028cc4957e39af5ed8b1a3c8acda24a2a89 Author: Larry Finger Date: Fri Jan 14 14:54:18 2011 -0600 staging: r8712u: Switch driver to use external firmware from linux-firmware Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit e3dc896b21fbb4d23e2747dbe58bb9156c9e1a99 Author: Larry Finger Date: Fri Jan 14 14:54:13 2011 -0600 staging: r8712u: Fix sparse message Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 6ddc5fb43e47e18d434619e08d41260ff121a7f6 Author: Roland Stigge Date: Wed Jan 12 11:41:59 2011 +0100 Staging: iio: add driver for MAX517/518/519 IIO Driver for Maxim MAX517, MAX518 and MAX519 DAC Signed-off-by: Roland Stigge Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 18545cfd3623e5cd8960f5155f95e0a9c790a54c Author: Mike Thomas Date: Mon Jan 10 18:34:41 2011 +0000 Staging: easycap: Make easycap_debug non-static The parameter easycap_debug appears in macros JOT and JOM and therefore needs to be visible from all source files. The easycap_ prefix should be sufficient to avoid namespace clashes outside the module. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit 0a8692b534e18fcec6eac07551bb37a22659f5c7 Author: Ben Hutchings Date: Sun Jan 9 04:20:04 2011 +0000 rtl8192u_usb: Remove built-in firmware images These firmware images are already unused. Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 31d5bbf3da8c3c9de5944f2c09cbc7ea5a72bdb4 Author: Ben Hutchings Date: Sun Jan 9 04:16:48 2011 +0000 vt6656: Use request_firmware() to load firmware The file added to linux-firmware is a copy of the current array which does not have a recognisable header, so no validation is done. Change the firmware version check to accept newer versions. Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit f1bc434398e8cf400374911357e89a13de366ce7 Author: Brice Dubost Date: Fri Jan 7 18:49:18 2011 +0100 staging: comedi : Analog input trigerring modes for cb_pcidas This patch allows the possibility to choose between edgre triggering and level trigerring, for the analog input, on the Measurement Computing PCI-DAS* boards Signed-off-by: Brice Dubost Signed-off-by: Greg Kroah-Hartman commit 1a37f3f476c37e8c8b80858991fb8ecaaad2fd6a Author: Javier Martinez Canillas Date: Sun Jan 2 23:14:29 2011 +0100 staging: keucr: Delete use kernel strcmp() & strcpy() from TODO file staging: keucr: Delete use kernel strcmp() & strcpy() from TODO file Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Reviewed-by: Marcin Slusarz Cc: Al Cho Signed-off-by: Greg Kroah-Hartman commit 1b9f644dfeb638e0146ce54f4e48c87a2841a603 Author: Javier Martinez Canillas Date: Sun Jan 2 23:14:28 2011 +0100 staging: keucr: Delete StringCmp() and StringCopy custom functions staging: keucr: Delete StringCmp() and StringCopy custom functions Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Reviewed-by: Marcin Slusarz Cc: Al Cho Signed-off-by: Greg Kroah-Hartman commit f3d5049ccdb57d14712f7cba27b0dd0a860961d7 Author: Javier Martinez Canillas Date: Sun Jan 2 23:14:27 2011 +0100 staging: keucr: Use memcpy() instead custom StringCopy() and some style cleanups staging: keucr: Use memcpy() instead custom StringCopy() and some style cleanups Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Reviewed-by: Marcin Slusarz Cc: Al Cho Signed-off-by: Greg Kroah-Hartman commit 1b5b4e17e58a0c8ddfd5ad60e65f924fb00b60ef Author: Javier Martinez Canillas Date: Sun Jan 2 23:14:26 2011 +0100 staging: keucr: Use memcmp() instead custom StringCmp() and some style cleanups staging: keucr: Use memcmp() instead custom StringCmp() and some style cleanups Signed-off-by: Javier Martinez Canillas Acked-by: Dan Carpenter Reviewed-by: Marcin Slusarz Cc: Al Cho Signed-off-by: Greg Kroah-Hartman commit 2591418bb18ea597dc34cc369899e11c3d4ecc87 Author: Dan Carpenter Date: Mon Jan 3 08:44:38 2011 +0300 Staging: tm6000: check usb_alloc_urb() return usb_alloc_urb() can return NULL so check for that and return -ENOMEM if it happens. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit b01627c608d97b5246eb7a4b75c40f2a1fb4dc30 Author: Dan Carpenter Date: Mon Jan 3 08:47:40 2011 +0300 Staging: tm6000: silence Sparse warning "dubious: !x | !y" Bitwise and logical or are the equivalent here, so this doesn't affect runtime, but logical or was intended. The original code causes a warning in Sparse: "warning: dubious: !x | !y" Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit aa96646daa15d6ac05addc7db7272dd5787c6953 Author: roel kluin Date: Mon Jan 3 11:59:14 2011 -0800 staging: spectra: don't read past array in Conv_Spare_Data_Log2Phy_Format() It should decrement or we read past the array Signed-off-by: Roel Kluin Cc: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e508edb203352e044dac359fb98579508bf7376c Author: Mark Allyn Date: Tue Jan 4 14:16:59 2011 -0800 staging: sep: update driver to SEP version 3.4.5 These changes enable the driver to work with SEP version 3.4.5 Major change is to use non DMA access for any data comming from a function that uses the external application service on the SEP. Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit dfcfc166fe9c5825c506795a3f29471f9bd410a3 Author: Mark Allyn Date: Tue Jan 4 12:57:16 2011 -0800 staging: sep: Remove un-needed debug prints Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 91caec33e50630fc5d1d4f36e12e1eb74cbc02e4 Author: Mark Allyn Date: Tue Jan 4 12:56:27 2011 -0800 staging: sep: Add comment to TODO to clean up un-needed debug prints Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 77d89b08766c878a2594b15d203e513acf952340 Author: wwang Date: Fri Jan 21 17:39:18 2011 +0800 staging: add rts_pstor for Realtek PCIE cardreader rts_pstor is used to support Realtek PCI-E card readers, including rts5209, rts5208, Barossa. Signed-off-by: wwang Signed-off-by: Greg Kroah-Hartman commit 88c8a4437b061dd9dae738802a9eddc297a96278 Author: Randy Dunlap Date: Fri Jan 21 09:18:56 2011 -0800 staging: hv: hv_utils depends on CONNECTOR Don't build hv_utils when CONFIG_CONNECTOR is not enabled. Fixes these build errors: ERROR: "cn_add_callback" [drivers/staging/hv/hv_utils.ko] undefined! ERROR: "cn_del_callback" [drivers/staging/hv/hv_utils.ko] undefined! ERROR: "cn_netlink_send" [drivers/staging/hv/hv_utils.ko] undefined! Signed-off-by: Randy Dunlap Cc: Greg Kroah-Hartman Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 824090ef81800419cd9943548ef2d505efe42a6e Author: Arend van Spriel Date: Fri Jan 21 11:20:16 2011 +0100 staging: brcm80211: remove unused type definitions from driver Quite some definitions are not referenced in the drivers sources and clutter up the files so they are removed. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 93ed8e35e2f7e4951e0ddb75acf9cad60e43f91b Author: Arend van Spriel Date: Fri Jan 21 11:20:15 2011 +0100 staging: brcm80211: remove unused function from wlc_stf.c Working through a list of unused functions in the driver tree. This file has following redundant function(s): wlc_stf_stbc_rx_get wlc_stf_rxchain_set Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit e71e940c2d76860a7a2e8c052a5169d2ef468561 Author: Arend van Spriel Date: Fri Jan 21 11:20:14 2011 +0100 staging: brcm80211: removed unused inline function from wlc_ampdu.c This file defined an inline function pkt_txh_seqnum() which was not used and as such is removed. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 377793824d1cc6119d0b84f00d8bae818847e44b Author: Arend van Spriel Date: Fri Jan 21 11:20:13 2011 +0100 staging: brcm80211: remove unused function from wlc_event.c Working through a list of unused functions in the driver tree. This file has following redundant function(s): wlc_eventq_next wlc_eventq_cnt Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 20de47a5c2d6516a4eebf874cc35ee5432955f8d Author: Arend van Spriel Date: Fri Jan 21 11:20:12 2011 +0100 staging: brcm80211: remove unused function from wlc_channel.c Working through a list of unused functions in the driver tree. This file has following redundant function(s): wlc_channel_country_abbrev wlc_channel_locale_flags wlc_channel_get_chanvec wlc_valid_40chanspec_in_band wlc_channel_set_txpower_limit wlc_valid_chanspec Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit f3237e56b995367448f717a0dddcd76e0743bfdb Author: Arend van Spriel Date: Fri Jan 21 11:20:11 2011 +0100 staging: brcm80211: remove unused function from wlc_bmac.c Working through a list of unused functions in the driver tree. This file has following redundant function(s): wlc_bmac_set_hw_etheraddr wlc_cur_phy wlc_bmac_revinfo_get wlc_bmac_set_deaf wlc_bmac_xmtfifo_sz_set wlc_bmac_ifsctl_edcrs_set wlc_bmac_set_ucode_loaded wlc_bmac_set_clk wlc_gpio_fast_deinit wlc_bmac_radio_hw wlc_bmac_set_txpwr_percent Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit fd04e62715d5a5cbdf6b1721276295e81aa54327 Author: Arend van Spriel Date: Fri Jan 21 11:20:10 2011 +0100 staging: brcm80211: remove unused functions from sbutils.c Cleaning up unused function from the driver sources. This file contained the following unused functioin(s): sb_base sb_taclear sb_serr_clear Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 4e9dc61ffdcf1ba7dcdbd7d31137f02c5e57873b Author: Arend van Spriel Date: Fri Jan 21 11:20:09 2011 +0100 staging: brcm80211: remove unused inline funtion from siutils.h The header file contains a inline function, but it is not used by the driver sources: si_seci_init Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit bea4238e17a7d9f81c982087b2b46646f8ff7cea Author: Arend van Spriel Date: Fri Jan 21 11:20:08 2011 +0100 staging: brcm80211: remove unused function from dhd_common.c Working through a list of unused functions in the driver tree. This file has following redundant function(s): dhd_store_conn_status print_buf wl_event_to_host_order Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 072c35ada2fcb3fe925f0c1b3c2793010c3f1f86 Author: Arend van Spriel Date: Fri Jan 21 11:20:07 2011 +0100 staging: brcm80211: remove unused function from dhd_cdc.c Working through a list of unused functions in the driver tree. This file has following redundant function(s): dhd_proto_fcinfo Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit ed3556d17ce1a3ff2d5eeb9c78a1fbfc3d5b564d Author: Arend van Spriel Date: Fri Jan 21 11:20:06 2011 +0100 staging: brcm80211: remove unused function from bcmwifi.c Working through a list of unused functions in the driver tree. This file has following redundant function(s): wf_chspec_ctlchspec Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit c836f77fdba3631e295e3da1718ab53a9038fdf2 Author: Arend van Spriel Date: Fri Jan 21 10:54:52 2011 +0100 staging: brcm80211: use KBUILD_MODNAME as driver name in registration The driver name was hardcoded and not same as the kernel module file being build. Although there may be no strong requirement to this it may provide increased consistency. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit d8941ea65ac3e0200e960957125be50f245d164c Author: Arend van Spriel Date: Fri Jan 21 10:54:50 2011 +0100 staging: brcm80211: removed sys directory layer from brcmsmac driver Based on review comments moved sources from brcm80211/brcmsmac/sys to its parent directory. The phy directory is kept for maintainance logistics around phy source code. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 5e72615c130d8fe9800711be2d713caeaa2d4a64 Author: Arend van Spriel Date: Fri Jan 21 10:54:49 2011 +0100 staging: brcm80211: cleanup on the brcm80211 include directory moved several files to specific source directory as these do not need to be shared between drivers. Also removed some unused include files from the include directory. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit f8559b6920b435028ec9aed62846906bb20e47d8 Author: Arend van Spriel Date: Fri Jan 21 10:54:48 2011 +0100 staging: brcm80211: moved code around for cleanup Restructured code to have more consistent directory tree for the two drivers. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 4d805f7b6607f6e547dc22e5d57c201e43d21c05 Author: Kuninori Morimoto Date: Thu Jan 20 11:46:02 2011 +0900 ASoC: sh: fsi: Add snd_soc_dai_set_fmt support This patch add snd_soc_dai_ops :: set_fmt to FSI driver and select master/slave clock mode by snd_soc_dai_set_fmt on fsi-xxx.c instead of platform infomation code. This patch remove fsi_is_master function which is no longer needed. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Acked-by: Paul Mundt Signed-off-by: Mark Brown commit 0d032c19e764ad2f60292f58116f6c2a052a58ab Author: Kuninori Morimoto Date: Thu Jan 20 11:45:51 2011 +0900 ASoC: sh: fsi: Add fsi_get_priv_frm_dai function Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit cb9c130aa97bd41887a0a391388ef4070caab4d9 Author: Kuninori Morimoto Date: Thu Jan 20 11:45:34 2011 +0900 ASoC: ak4642: add SND_SOC_DAIFMT_FORMAT support This patch support LEFT_J / I2S only for now Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 477adb06bf1638a4f108d155431ec0dd1ff8ba88 Merge: c358e64 20a4e7f Author: Mark Brown Date: Fri Jan 21 18:30:55 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit c358e640a669b528b32af5442c92b856de623e1c Author: Dimitris Papastamos Date: Fri Jan 21 15:29:02 2011 +0000 ASoC: soc-cache: Add trace event for snd_soc_cache_sync() This patch makes it easy to see when the syncing process begins and ends. You can also enable the snd_soc_reg_write tracepoint to see which registers are being synced. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 67b22517d8e48a97e1d2ab10d095c538bbb2374c Author: Alexander Sverdlin Date: Wed Jan 19 21:22:06 2011 +0300 ASoC: CS4271 codec support Added support for CS4271 codec to ASoC. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7cfe56172ac14d2031f1896ecb629033f71caafa Author: Stephen Warren Date: Thu Jan 20 13:52:08 2011 -0700 ASoC: wm8903: Expose GPIOs through gpiolib Also, update platform_data GPIO handling to have an explicit "don't touch this pin" option. Add #defines for the GPIO pin functions. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9dabb3f3269d042908bf1f4e685413c39cc8c373 Author: Guennadi Liakhovetski Date: Fri Jan 21 16:56:42 2011 +0100 spi/spi_sh_msiof: consolidate data in 8-bit mode into 32-bit words Instead of sending data 8 bits at a time in 8-bit SPI mode, swap bytes and send and receive them 32 bits at a time. Tested with an SD-card, with which this patch reduced the number of interrupts by 50%, when reading 5MiB of data (there are also small service packets, the number of interrupts, produced by 512-byte sectors should, of course, drop by 75%), and improved throughput by more than 40%. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Grant Likely commit e2dbf5ebcc983b0349ab507bf7dd5562cf88dd24 Author: Guennadi Liakhovetski Date: Fri Jan 21 16:56:37 2011 +0100 spi/spi_sh_msiof: cosmetic clean-up 1. sort headers alphabetically 2. use fixed-size types u8, u16, u32 for register values and transferred data 3. simplify some arithmetic operations Signed-off-by: Guennadi Liakhovetski [grant.likely@secretlab.ca: removed label indentation change] Signed-off-by: Grant Likely commit 64ed98365062b748770b340fd27ae34564a5a322 Author: Mark Brown Date: Thu Jan 20 21:43:44 2011 +0000 ASoC: Staticise twl6040_hs_jack_report() It's an internal function so shouldn't be exported (as sparse points out). Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 Author: Grant Likely Date: Fri Jan 21 09:24:48 2011 -0700 driver-core: remove conditionals around devicetree pointers Having conditional around the of_match_table and the of_node pointers turns out to make driver code use ugly #ifdef blocks. Drop the conditionals and remove the #ifdef blocks from the affected drivers. Also tidy up minor whitespace issues within the same hunks. Signed-off-by: Grant Likely Acked-by: Greg Kroah-Hartman commit b8d6568a122ab7bd47b151ff9f9a40cebea579c0 Author: Tao Ma Date: Fri Jan 21 23:21:31 2011 +0800 ext4: Fix comment typo "especiially". Change "especiially" to "especially". Cc: Jiri Kosina Signed-off-by: Tao Ma Signed-off-by: Jiri Kosina commit a320b2793dae44953dc58e9f681d8f161eb5b3ab Author: Shawn Guo Date: Fri Jan 14 15:25:52 2011 +0800 ARM: mxs/mx28evk: read fec mac address from ocotp Read fec mac address from ocotp and save it into fec_platform_data mac field for fec driver to use. Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 67f43086a24b77a82724855141a5b7a4d72549bd Author: Shawn Guo Date: Fri Jan 14 23:11:23 2011 +0800 ARM: mxs: add ocotp read function Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit bb58b3e8b18c542f30f898fff82f7ce58a4bdf7a Author: Fabio Estevam Date: Wed Jan 19 10:27:33 2011 -0200 ARM: mx5: Use dummy clock for the keypad Reuse dummy_clk for the imx-keypad device instead of using a dedicated kpp_clk. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 816ad741b6a168e1d0c182d10999c298fc281d17 Author: Dinh Nguyen Date: Sat Jan 15 13:40:12 2011 -0600 ARM: i.MX53: Add full iomux support for mx53 This iomux file contains all the available pins that are iomux capable. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit 75d5cfbe4b78cc26af7b042e23f61700b50bc294 Author: Steven Whitehouse Date: Wed Jan 19 09:42:40 2011 +0000 GFS2: Post-VFS scale update for RCU path walk We can allow a few more cases to use RCU path walking than originally allowed. It should be possible to also enable RCU path walking when the glock is already cached. Thats a bit more complicated though, so left for a future patch. Signed-off-by: Steven Whitehouse Cc: Nick Piggin commit bc015cb84129eb1451913cfebece270bf7a39e0f Author: Steven Whitehouse Date: Wed Jan 19 09:30:01 2011 +0000 GFS2: Use RCU for glock hash table This has a number of advantages: - Reduces contention on the hash table lock - Makes the code smaller and simpler - Should speed up glock dumps when under load - Removes ref count changing in examine_bucket - No longer need hash chain lock in glock_put() in common case There are some further changes which this enables and which we may do in the future. One is to look at using SLAB_RCU, and another is to look at using a per-cpu counter for the per-sb glock counter, since that is touched twice in the lifetime of each glock (but only used at umount time). Signed-off-by: Steven Whitehouse Cc: Paul E. McKenney commit ffa934f192c8381061242eb170419266ef229902 Author: Patrick McHardy Date: Thu Jan 20 03:00:42 2011 +0000 rtnetlink: fix link attribute validation with IFLA_GROUP rtnl_group_changelink() is invoked by rtnl_newlink() before the link attributes have been validated. Additionally the group changes are performed even if NLM_F_CREATE is specified and a new link is created, while more reasonable semantics would be to set the group value on the newly created link. Fix both problems by moving the rtnl_group_changelink() invocation down to the handling of non-existant links without NLM_F_CREATE() and add a dev_set_group() call to rtnl_create_link(). Signed-off-by: Patrick McHardy Acked-by: Vlad Dogaru Signed-off-by: David S. Miller commit 906b17dc089f7fa87e37a9cfe6ee185efc90e0da Author: Paul Mundt Date: Fri Jan 21 16:19:53 2011 +0900 serial: sh-sci: Kill off the special earlyprintk device. This reworks some of the code a bit so that we always wrap in to the global port array instead of flipping between it and the special early device. This will make it easier to split the initialization in to early and late parts where we can simply initialize the remaining bits of the partially-initialized port coming off of the early console later in the boot process. Signed-off-by: Paul Mundt commit 1020520e41965eb11759a0c40e6ab66297340df6 Author: Paul Mundt Date: Fri Jan 21 16:00:31 2011 +0900 serial: sh-sci: Use dev_name() for region reservations. dev_name() matches what the other drivers are doing, so prefer that over the port type. Signed-off-by: Paul Mundt commit 3c36e719033ddc09aded770472cbdb477fcb4479 Author: Mark Brown Date: Thu Jan 20 22:51:26 2011 -0800 Input: ads7846 - convert to dev_pm_ops There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitate updates to the PM core. Do this move for the ads7846 driver. Signed-off-by: Mark Brown Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit c7848c8e1a26ca6075d6cb538657f5381afcadc4 Author: Mark Brown Date: Thu Jan 20 22:48:44 2011 -0800 Input: ad7879 - convert SPI to dev_pm_ops There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitate updates to the PM core. Do this move for the ad7879 SPI driver. Signed-off-by: Mark Brown Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit fccdd7c4aeb7ed639b51126941545bc5b3824dab Author: Mark Brown Date: Thu Jan 20 22:47:47 2011 -0800 Input: ad7877 - convert to dev_pm_ops There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitate updates to the PM core. Do this move for the ad7879 SPI driver. Signed-off-by: Mark Brown Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit d52344a7ae8a3fb660636f7de4f1c542b0036cbb Author: David S. Miller Date: Thu Jan 20 22:52:05 2011 -0800 ppp: Use SKB queue abstraction interfaces in fragment processing. No more direct references to SKB queue and list implementation details. Signed-off-by: David S. Miller commit 686a2955531312dab77bb6f1e8602787d85e47d8 Author: David S. Miller Date: Thu Jan 20 22:47:32 2011 -0800 net: Add safe reverse SKB queue walkers. Signed-off-by: David S. Miller commit 212bfb9e94e86b40684076f642b089b0565455d2 Author: David S. Miller Date: Thu Jan 20 22:46:07 2011 -0800 ppp: Reconstruct fragmented packets using frag lists instead of copying. [paulus@samba.org: fixed a couple of bugs] Signed-off-by: David S. Miller Signed-off-by: Paul Mackerras commit b48f8c23c336d82c1af9a53187568bdb6e86b8a8 Author: David S. Miller Date: Thu Jan 20 22:44:36 2011 -0800 ppp: Clean up kernel log messages. Use netdev_*() and pr_*(). To preserve existing semantics in cases where KERN_DEBUG is indeed appropriate, use netdev_printk(KERN_DEBUG, ...) Convert PPPIOCDETACH to pr_warn() because an unexpected file count is a serious bug and should be logged with KERN_WARN. Signed-off-by: David S. Miller Signed-off-by: Paul Mackerras commit f6e9495d68b91138afbf929c222a09f5d12b29fa Author: Paul Mundt Date: Fri Jan 21 15:25:36 2011 +0900 serial: sh-sci: Fix up earlyprintk port mapping. The earlyprintk path needs to establish the membase cookie, but is too early for general resource management. Split out the remap logic accordingly. Signed-off-by: Paul Mundt commit d18046b3cd989c06d2ad8d615e57c3cf63c63b67 Author: Shan Wei Date: Wed Jan 19 23:12:54 2011 +0000 dccp: clean up unused DCCP_STATE_MASK definition Remove unused DCCP_STATE_MASK macro. Signed-off-by: Shan Wei Acked-by: Gerrit Renker Signed-off-by: David S. Miller commit 4dce2396b329ef6a14b40c5416d6f76005097b0d Author: Roopa Prabhu Date: Thu Jan 20 14:35:54 2011 +0000 enic: Bug Fix: Dont reset ENIC_SET_APPLIED flag on port profile disassociate enic_get_vf_port returns port profile operation status only if ENIC_SET_APPLIED flag is set. A recent rework of enic_set_port_profile added code to reset this flag on disassociate. As a result of which a client calling enic_get_vf_port to get the status of port profile disassociate will always get a return value of ENODATA. This patch renames ENIC_SET_APPLIED to more appropriate ENIC_PORT_REQUEST_APPLIED and reverts back the recent change so that the flag is set both at associate and disassociate of a port profile. Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit f2eda47df46f9953fc8a4fec820f34d539a8efbb Author: Eric Dumazet Date: Thu Jan 20 07:37:53 2011 +0000 ipv6: raw: rcu annotations Remove sparse warnings, using a function typedef to be able to use __rcu annotation on mh_filter pointer. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 6193d2be290990b789021e06fa770ecb45319f2d Author: Eric Dumazet Date: Wed Jan 19 22:02:47 2011 +0000 neigh: __rcu annotations fix some minor issues and sparse (__rcu) warnings Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 753ea8e96258d87be1951083b5c4a368524515f1 Author: Eric Dumazet Date: Thu Jan 20 07:16:24 2011 +0000 net: ipv6: sit: fix rcu annotations Fix minor __rcu annotations and remove sparse warnings Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 2ffa007eaa01cf5fedd6a71f7d43854339a831ee Author: françois romieu Date: Thu Jan 20 04:59:33 2011 +0000 via-velocity: fix the WOL bug on 1000M full duplex forced mode. The VIA velocity card can't be waken up by WOL tool on 1000M full duplex forced mode. This patch fixes the bug. Signed-off-by: David Lv Acked-by: Francois Romieu Signed-off-by: David S. Miller commit a2da570d62fcb9e8816f6920e1ec02c706b289fa Author: Eric Dumazet Date: Thu Jan 20 03:48:19 2011 +0000 net_sched: RCU conversion of stab This patch converts stab qdisc management to RCU, so that we can perform the qdisc_calculate_pkt_len() call before getting qdisc lock. This shortens the lock's held time in __dev_xmit_skb(). This permits more qdiscs to get TCQ_F_CAN_BYPASS status, avoiding lot of cache misses and so reducing latencies. Signed-off-by: Eric Dumazet CC: Patrick McHardy CC: Jesper Dangaard Brouer CC: Jarek Poplawski CC: Jamal Hadi Salim CC: Stephen Hemminger Signed-off-by: David S. Miller commit fd245a4adb5288eac37250875f237c40a20a1944 Author: Eric Dumazet Date: Thu Jan 20 05:27:16 2011 +0000 net_sched: move TCQ_F_THROTTLED flag In commit 371121057607e (net: QDISC_STATE_RUNNING dont need atomic bit ops) I moved QDISC_STATE_RUNNING flag to __state container, located in the cache line containing qdisc lock and often dirtied fields. I now move TCQ_F_THROTTLED bit too, so that we let first cache line read mostly, and shared by all cpus. This should speedup HTB/CBQ for example. Not using test_bit()/__clear_bit()/__test_and_set_bit allows to use an "unsigned int" for __state container, reducing by 8 bytes Qdisc size. Introduce helpers to hide implementation details. Signed-off-by: Eric Dumazet CC: Patrick McHardy CC: Jesper Dangaard Brouer CC: Jarek Poplawski CC: Jamal Hadi Salim CC: Stephen Hemminger Signed-off-by: David S. Miller commit 817fb15dfd988d8dda916ee04fa506f0c466b9d6 Author: Eric Dumazet Date: Thu Jan 20 00:14:58 2011 +0000 net_sched: sfq: allow divisor to be a parameter SFQ currently uses a 1024 slots hash table, and its internal structure (sfq_sched_data) allocation needs order-1 page on x86_64 Allow tc command to specify a divisor value (hash table size), between 1 and 65536. If no value is provided, assume the 1024 default size. This allows admins to setup smaller (or bigger) SFQ for specific needs. This also brings back sfq_sched_data allocations to order-0 ones, saving 3KB per SFQ qdisc. Jesper uses ~55.000 SFQ in one machine, this patch should free 165 MB of memory. Signed-off-by: Eric Dumazet CC: Patrick McHardy CC: Jesper Dangaard Brouer CC: Jarek Poplawski CC: Jamal Hadi Salim CC: Stephen Hemminger Signed-off-by: David S. Miller commit 3fbd8758b027995b677046dae46f9b41ea88c88f Author: Eric Dumazet Date: Wed Jan 19 21:23:22 2011 +0000 net: dev_close_many() is static Signed-off-by: Eric Dumazet CC: Octavian Purdila Reviewed-by: Octavian Purdila Signed-off-by: David S. Miller commit ccd5c8ef24590bd0e1277ae6f6c0b7790afd371d Author: françois romieu Date: Thu Jan 20 04:59:23 2011 +0000 atl1e: remove private #define. Either unused or duplicates from mii.h. Signed-off-by: Francois Romieu Cc: Jay Cliburn Cc: Chris Snook Cc: Jie Yang Signed-off-by: David S. Miller commit 34aac66cc2c32f6cd0bd08e0a0e6de851d261e36 Author: françois romieu Date: Thu Jan 20 04:59:06 2011 +0000 atl1c: remove private #define. Either unused or duplicates from mii.h. Signed-off-by: Francois Romieu Cc: Jay Cliburn Cc: Chris Snook Cc: Jie Yang Signed-off-by: David S. Miller commit a57d188daa8cd2867e6d8eca8d7cc7a8f5dcf628 Author: Mike McCormack Date: Mon Dec 27 21:53:24 2010 +0900 Staging: rtl8192e: Remove pointless returns Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 951fc8ed5cf346efb1fe18dabb739bcb9d3403c6 Author: Mike McCormack Date: Mon Dec 27 21:53:05 2010 +0900 Staging: rtl8192e: Fix typo in enum name Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 7602032af1164d6b4aefc66b68cece776919dff8 Author: Mike McCormack Date: Mon Dec 27 21:52:52 2010 +0900 Staging: rtl8192e: Make arrays const Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 5506cf2eb994a9a8fb8a8449d1ca989f563acf82 Author: Mike McCormack Date: Mon Dec 27 21:52:35 2010 +0900 Staging: rtl8192e: Remove commented out printks Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 7bb5e8232b8d37cb1e2b5f80dff50b1a505c1066 Author: Mike McCormack Date: Mon Dec 27 21:51:09 2010 +0900 Staging: rtl8192e: Remove cast in request_irq Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit e9c0afc98b335a3358d57021243add3bc0495559 Author: Mike McCormack Date: Mon Dec 27 21:50:47 2010 +0900 Staging: rtl8192e: Remove commented debugging code Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 9bd931a8d470977a3658415105bedc39a63391b1 Author: Mike McCormack Date: Mon Dec 27 21:50:33 2010 +0900 Staging: rtl8192e: Remove unused RT_DEBUG_DATA macro Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 5d33549a525c737e9ad437638aa9bf812037bdf2 Author: Mike McCormack Date: Mon Dec 27 21:50:14 2010 +0900 Staging: rtl8192e: Remove assert macro Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit dd1847332a5e5c6ac945ad12db0bc49871481d3a Author: Mike McCormack Date: Mon Dec 27 21:49:49 2010 +0900 Staging: rtl8192e: Convert cpMacAddr macro to inline function Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit 03996954fd758c4f3b5de6528f77db16ef460eb3 Author: Mike McCormack Date: Mon Dec 27 21:48:32 2010 +0900 Staging: rtl8192e: Use compare_ether_addr instead of eqMacAddr Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit dbb6c03659cdb4c2073129cb9a9cdcbfafea0a27 Author: Mike McCormack Date: Mon Dec 27 21:49:28 2010 +0900 Staging: rtl8192e: Dump step we fail in init_firmware() Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit f8129a95414931c0b8e333963181548bb0f6d670 Author: Mike McCormack Date: Mon Dec 27 21:47:35 2010 +0900 Staging: rtl8192e: Unlock spinlock in once place only Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit b2cf8d4872a5c3f5e57010bcab9be45e8b27cb99 Author: Mike McCormack Date: Mon Dec 27 21:47:02 2010 +0900 Staging: rtl8192e: Clean up rtl8192_interrupt formatting Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit bf3c45f054506b8b7edc189b702b720a842e0764 Author: Mike McCormack Date: Mon Dec 27 21:46:46 2010 +0900 Staging: rtl8192e: Remove empty function rtl8192_try_wake_queue Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman commit c4586c16859861df6af51d0aab5c4738c0e4ac44 Author: Justin P. Mattock Date: Mon Dec 27 22:22:31 2010 -0800 staging:zram:xvmalloc.c Fix a typo. Not exactly sure if this is a typo or not, due to my search results comming up with not that many hits. Either its dereferenceable or dereferencable from the two I choose the later. if it's wrong let me know and I'll resend. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 1aa326640d1e91d32179310441fa3030c501d0f3 Author: Jerome Marchand Date: Fri Dec 17 17:03:15 2010 +0100 Staging: zram: make zram_read return a bio error if the device is not initialized Make zram_read() return a bio error if the device is not initialized instead of pretending nothing happened. Signed-off-by: Jerome Marchand Acked-by: Jeff Moyer Signed-off-by: Greg Kroah-Hartman commit f2da98739da4e20e907f8317d513868764002d31 Author: Jerome Marchand Date: Fri Dec 17 17:02:28 2010 +0100 Staging: zram: round up the disk size provided by user Currently disksize_store() round down the disk size provided by user. This is probably not what one would expect, so round up instead. Signed-off-by: Jerome Marchand Acked-by: Jeff Moyer Signed-off-by: Greg Kroah-Hartman commit 2b152873469d2b0751e8b726df6415f05e37632e Author: Jerome Marchand Date: Fri Dec 17 16:59:33 2010 +0100 Staging: zram: make ZRAM depends on SYSFS We can not configure zram device without sysfs anyway, so make zram depends on it. Signed-off-by: Jerome Marchand Acked-by: Jeff Moyer Signed-off-by: Greg Kroah-Hartman commit 98069c3f1cd353eda61d8e11ce40f83d5c5a99f3 Author: Roland Stigge Date: Thu Jan 13 17:43:29 2011 +0100 Staging: iio: Documented output / DAC interface Added documentation for: * /sys/bus/iio/devices/deviceX/outY_scale * /sys/bus/iio/devices/deviceX/outY_raw * /sys/bus/iio/devices/deviceX/outY&Z_raw Signed-off-by: Roland Stigge Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit c331e766f9a3dd2d05f209a39859bb206f723fae Author: Marek Belisko Date: Mon Jan 10 13:14:28 2011 +0100 staging: ft1000-pcmcia: Fix compilation errors. Following patch will fix all compilation errors. Main problems was with pcmcia API changes. Also remove BROKEN as now driver is properly build. Signed-off-by: Marek Belisko Signed-off-by: Stano Lanci Signed-off-by: Greg Kroah-Hartman commit 267024a9f6cc7f7e26ed57424d5d0c8558769b56 Author: roel kluin Date: Sat Jan 1 18:01:51 2011 +0000 Staging: iio: --/++ confusion in build_channel_array() error cleanup Fix loop: it should decrement Signed-off-by: Roel Kluin Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 4a5200ac8bd0e1a85aacea7cf4ded6e597254be0 Author: Pavan Savoy Date: Thu Dec 23 01:23:57 2010 -0600 drivers:staging: ti-st: delete old bt_drv driver point the new v7 driver to build if ST_BT is selected in Makefile and delete the old bt_drv driver. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit 977016882d62ae5124a42bc9959d8785eb143655 Author: Pavan Savoy Date: Thu Dec 23 01:23:56 2010 -0600 drivers:staging: ti-st: add the v7 btwilink driver Add the btwilink driver which has undergone 7 revisions of review. Based on bluetooth maintainer comments, since there might be some re-work needed on underlying ST driver, park the driver here. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman commit 628f34282db49359576dcb8cbaea65b4bf083ebd Author: Christopher Brannon Date: Sun Dec 19 22:50:24 2010 +0000 staging: speakup: more fixes for init-failure handling. We still leaked many resources when Speakup failed to initialize. Examples of leaked resources include: /dev/synth, keyboard or VT notifiers, and heap-allocated st_spk_t structs. This is fixed. * We now use PTR_ERR to detect kthread_create failure (thank you Dan Carpenter). * The loop which frees members of the speakup_console array now iterates over the whole array, not stopping at the first NULL value. Fixes a possible memory leak. Safe because kfree(NULL) is a no-op. * The order of some initializations was changed. The safe ones, which will never fail, are performed first. Signed-off-by: Christopher Brannon Acked-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 0bbfc0edb7a2606829dfcb5c6926f20adfc68d91 Author: Joe Perches Date: Wed Jan 12 13:21:19 2011 -0800 staging: brcm80211: Remove unnecessary memset(,0,) kzalloc'd memory doesn't need a memset to 0. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit eee3a678835fbf8f8a5a243c7bf69d9f990a70fd Author: Justin P. Mattock Date: Wed Jan 19 22:16:06 2011 -0800 staging: brcm80211 Remove WAKE_LOCK The patch below removes WAKE_LOCK since it is no longer in the kernel. Please let me know, if this is the proper way of doing this and/or more needs to be done.. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit e6856764dc677aed6c1edb317f60b35194913b0d Author: Justin P. Mattock Date: Wed Jan 19 22:16:05 2011 -0800 staging: ath6kl Remove CONFIG_HAS_WAKELOCK The patch below removes CONFIG_HAS_WAKELOCK since it is no longer in the kernel. Please let me know, if this is the proper way of doing this and/or more needs to be done.. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 2ae44d64b770832451b112c6e3d4d5ab0aef66c2 Author: Justin P. Mattock Date: Wed Jan 19 22:16:04 2011 -0800 staging: brcm80211 dhd.h Remove CONFIG_HAS_WAKELOCK Note:not sure if there is already something like this submitted or not. The first two patches removes CONFIG_HAS_WAKELOCK since it is no longer in the kernel. Please let me know, if this is the proper way of doing this and/or more needs to be done.. Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 651bd3a9ff2bd1c25998d5f66be3e2eb220c5910 Author: Roland Vossen Date: Fri Dec 24 15:17:49 2010 +0100 staging: brcm80211: replaced struct ht_cap_ie by struct ieee80211_ht_cap Code cleanup. Replaced broadcom specific type by Linux counterpart. Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 0b8b430dda57de180bb0e83a9710c70ec5794432 Author: Roland Vossen Date: Fri Dec 24 15:17:48 2010 +0100 staging: brcm80211: deleted struct dot11_bcn_prb Code cleanup. This struct did nothing useful in the code. Instances of this struct and the code that read them were removed as well. Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit d83b2a8a89fd19f5c9bfefe5d90f30b4287c8568 Author: Roland Vossen Date: Fri Dec 24 15:17:47 2010 +0100 staging: brcm80211: cleaned up macros in 802.11.h Code cleanup. Cleaned up 802.11 type and subtype related macros by using Linux defines instead of Broadcom defined ones. Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 04795017b7da2bc1ee35dd671fc11018122a7905 Author: Roland Vossen Date: Fri Dec 24 15:17:46 2010 +0100 staging: brcm80211: replaced some ieee80211 preprocessor constants part 2 Code cleanup. Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 3726ed4d55ec2b16a8b453b4025eff8ca41bd8a2 Author: Roland Vossen Date: Fri Dec 24 15:17:45 2010 +0100 staging: brcm80211: replaced some ieee80211 preprocessor constants part 1 Code cleanup. Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 392308d00eb99bd92093fd8d6b7049d6745f150b Author: Roland Vossen Date: Fri Dec 24 15:17:44 2010 +0100 staging: brcm80211: replaced struct dot11_management_header with ieee80211_mgmt Code cleanup. Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 3e9796f9d4da939f7a67ba66790e9cfb9f9a316b Author: Roland Vossen Date: Fri Dec 24 15:17:43 2010 +0100 staging: brcm80211: replaced struct dot11_header by struct ieee80211_hdr Code cleanup. Replaced Broadcom specific structure by its Linux equivalent. Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit f3dc3ea4bb06c966c2071e507df939ad95e3e32c Author: Roland Vossen Date: Fri Dec 24 15:17:42 2010 +0100 staging: brcm80211: replaced struct dot11_rts_frame by struct ieee80211_rts Code cleanup. Replacing Broadcom specific definitions with Linux counterpart. Not tested yet. Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit d69a135806136ef26298116cc3fa08d14bb1d7d6 Author: Roland Vossen Date: Fri Dec 24 15:17:41 2010 +0100 staging: brcm80211: replaced 5Ghz specific wf_channel2mhz() Code cleanup related. Replaced broadcom specific function with Linux function ieee80211_dsss_chan_to_freq(). Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 1b1d36b6e8df93b1ddba81c6b72f0c22be6ed4ef Author: Roland Vossen Date: Fri Dec 24 15:17:40 2010 +0100 staging: brcm80211: replaced 2.4Ghz specific wf_channel2mhz() 2.4 Ghz code cleanup related. Replaced broadcom specific function with Linux function ieee80211_dsss_chan_to_freq(). Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit a44d42367fe73e7720d309c4bde5ac79a6cd64a7 Author: Arend van Spriel Date: Wed Dec 22 09:30:15 2010 +0100 staging: brcm80211: last nail into proto/ethernet.h cleaned up last artifacts used from proto/ethernet.h and subsequently the file can be removed. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 1e6610862c96fbe84534507e58014b50e0a1df5b Author: Arend van Spriel Date: Wed Dec 22 09:30:14 2010 +0100 staging: brcm80211: remove usage of packet section macros Removed include construction used to solve compiler differences related to packed structure types. Now GNUC variant of packed structure is used explicitly. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 35af876454b35b9ed080569e430096d3175302c5 Author: Arend van Spriel Date: Wed Dec 22 09:30:13 2010 +0100 staging: brcm80211: removed usage of proto/wpa.h file Definitions used either had linux equivalent or were only used in one source file. Changes were made accordingly and proto/wpa.h has been removed from the driver sources. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 7925465bc50116fd314e3fe7ec080294d187e97e Author: Arend van Spriel Date: Wed Dec 22 09:30:12 2010 +0100 staging: brcm80211: cleanup proto/ethernet.h include Most definitions have been removed. Last definitions and the file itself are going to be removed in a later stage. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit e2582ad85a59bc758431db9648627c626ef2e2a7 Author: Arend van Spriel Date: Wed Dec 22 09:30:11 2010 +0100 staging: brcm80211: remove usage of struct ether_header In linux the is already a structure defined for the ethernet header. Code now uses struct ethhdr instead. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit c09240ac4b9e2f7de91331dcbaa226424fe0eef4 Author: Arend van Spriel Date: Wed Dec 22 09:30:10 2010 +0100 staging: brcm80211: move definition of ETHER_TYPE_BRCM to source file The ethertype BRCM is used in single source file and consequently move there. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 541f05fea2a943b1ff02b98558498fc2ea2e0a91 Author: Arend van Spriel Date: Wed Dec 22 09:30:09 2010 +0100 staging: brcm80211: remove usage of ETHER_MAX_LEN definition The linux include file if_ether.h already provides a definition ETH_FRAME_LEN although this is excluding checksum. So code uses ETH_FRAME_LEN+ETH_FCS_LEN now. Reviewed-by: Brett Rudley Reviewed-by: Henry Ptasinski Reviewed-by: Roland Vossen Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 7350968193f9b94c4a4b7d14d7a44333a322c5d7 Author: Uwe Kleine-König Date: Thu Jan 20 09:32:01 2011 +0100 staging/hv/osd: don't reimplement ALIGN macro The ALIGN_DOWN macro was only used in NUM_PAGES_SPANNED. So make the latter easier and get rid of the former. Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit cc04acf53fb1bba1e57b0d34a400ccaf498fc9be Author: Ky Srinivasan Date: Thu Dec 16 18:56:54 2010 -0700 Staging: hv: Add a user-space daemon to support key/value pair (KVP) All guest specific data gathering is implemented in a user-mode daemon. The kernel component of KVP passes the "key" to this daemon and the daemon is responsible for passing back the corresponding value. This daemon communicates with the kernel component via a netlink channel. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: K. Y. Srinivasan Signed-off-by: Greg Kroah-Hartman commit 245ba56a52a32536a751cc3e60e5602afcfc5fd9 Author: Ky Srinivasan Date: Thu Dec 16 18:54:16 2010 -0700 Staging: hv: Implement key/value pair (KVP) This is an implementation of the key value/pair (KVP) functionality for Linux guests hosted on HyperV. This component communicates with the host to support the KVP functionality. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: K. Y. Srinivasan Signed-off-by: Greg Kroah-Hartman commit 008c7891858498f6eea3802062f118922f46a527 Author: Ky Srinivasan Date: Thu Dec 16 18:38:28 2010 -0700 Staging: hv: Rename hv_utils.c to hv_util.c The hv_utils module will be composed of more than one file; rename hv_utils.c to accommodate this without changing the module name. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: K. Y. Srinivasan Signed-off-by: Greg Kroah-Hartman commit a0a5b676401ee97a295dd9fcd7a374e883d48a8a Author: Ky Srinivasan Date: Thu Dec 16 18:35:00 2010 -0700 Connector: Add an index to support key/value pair (KVP) functionality Added a connector index to support key value/pair (KVP) functionality for Linux guests hosted on a HyperV platform. Signed-off-by: K. Y. Srinivasan Signed-off-by: Greg Kroah-Hartman commit bced94ed5efad836859d9426f37f48d46218e99a Author: Eric Dumazet Date: Thu Jan 20 21:00:38 2011 +0100 netfilter: add a missing include in nf_conntrack_reasm.c After commit ae90bdeaeac6b (netfilter: fix compilation when conntrack is disabled but tproxy is enabled) we have following warnings : net/ipv6/netfilter/nf_conntrack_reasm.c:520:16: warning: symbol 'nf_ct_frag6_gather' was not declared. Should it be static? net/ipv6/netfilter/nf_conntrack_reasm.c:591:6: warning: symbol 'nf_ct_frag6_output' was not declared. Should it be static? net/ipv6/netfilter/nf_conntrack_reasm.c:612:5: warning: symbol 'nf_ct_frag6_init' was not declared. Should it be static? net/ipv6/netfilter/nf_conntrack_reasm.c:640:6: warning: symbol 'nf_ct_frag6_cleanup' was not declared. Should it be static? Fix this including net/netfilter/ipv6/nf_defrag_ipv6.h Signed-off-by: Eric Dumazet CC: KOVACS Krisztian Signed-off-by: Patrick McHardy commit 2f1e3176723d74ea2dd975e5be0ef6bb4fed2e2e Author: Patrick McHardy Date: Thu Jan 20 20:46:52 2011 +0100 netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=n net/built-in.o: In function `nf_conntrack_init_net': net/netfilter/nf_conntrack_core.c:1521: undefined reference to `nf_conntrack_tstamp_init' net/netfilter/nf_conntrack_core.c:1531: undefined reference to `nf_conntrack_tstamp_fini' Add dummy inline functions for the =n case to fix this. Reported-by: John Fastabend Signed-off-by: Patrick McHardy commit 06988b06935da7a210887e9d3f50f46f2faa4953 Author: Jan Engelhardt Date: Thu Jan 20 17:50:17 2011 +0100 netfilter: xtables: add missing header inclusions for headers_check Resolve these warnings on `make headers_check`: usr/include/linux/netfilter/xt_CT.h:7: found __[us]{8,16,32,64} type without #include ... Signed-off-by: Jan Engelhardt commit ecdf8a4607edfebbfd6baada8eaecf532bf38600 Author: Paul Mundt Date: Fri Jan 21 00:05:48 2011 +0900 serial: sh-sci: Limit early console to one device. Presently the early console setup will be invoked for every device handed off to he earlyprintk command line argument. In practice we can only handle one, so this adds a sanity check to prevent clobbering the existing active console. Signed-off-by: Paul Mundt commit 41a7cab6d329039d614ca5f0f87aff2dfd90637c Author: Changli Gao Date: Thu Jan 20 15:49:52 2011 +0100 netfilter: nf_nat: place conntrack in source hash after SNAT is done If SNAT isn't done, the wrong info maybe got by the other cts. As the filter table is after DNAT table, the packets dropped in filter table also bother bysource hash table. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit bc9b3f5c9f3702e71066a4de0afe509a201d98b4 Author: Paul Mundt Date: Thu Jan 20 23:30:19 2011 +0900 serial: sh-sci: Fix up break timer scheduling race. The break flag timer is presently added through add_timer() via the interrupt and error paths, where it is possible to send multiple breaks in rapid succession and trigger the timer pending BUG_ON(). This moves over to a mod_timer() instead. Signed-off-by: Paul Mundt commit 94c8b6dbd64c51aa7ce7fcc466beccf942271b0e Author: Paul Mundt Date: Thu Jan 20 23:26:18 2011 +0900 serial: sh-sci: Bring oversized error handlers out of line. Presently much of the error handling paths are inlined, stemming from a time when they were much smaller. This simply brings them out of line and leaves it up to the compiler. Given that some of these now contain nested loops, it's pretty hard to justify the inlining regardless of the footprint. Signed-off-by: Paul Mundt commit 9978007befa5efdc16dc940631c594f420f96b09 Author: Dimitris Papastamos Date: Wed Jan 19 14:53:37 2011 +0000 ASoC: soc-cache: Apply the cache_bypass option Incorporate the use of the cache_bypass functionality in the syncing functions. The snd_soc_flat_cache_sync() need not be hooked as there is no performance benefit from using the cache_bypass option. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit dad8e7aeeb83a26d267e757e4c1cf69591850477 Author: Dimitris Papastamos Date: Wed Jan 19 14:53:36 2011 +0000 ASoC: soc-cache: Introduce the cache_bypass option This is primarily needed to avoid writing back to the cache whenever we are syncing the cache with the hardware. This gives a performance benefit especially for large register maps. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4cda47d2e7b21b0b41e44dbe4cd9804fea2d30e9 Merge: 82d800d ba12b13 Author: Patrick McHardy Date: Thu Jan 20 14:17:32 2011 +0100 Merge branch 'connlimit' of git://dev.medozas.de/linux commit ba12b130a65840005770135a69199cb9adaf8c8f Author: Jan Engelhardt Date: Thu Jan 20 14:01:12 2011 +0100 netfilter: xtables: remove duplicate member Accidentally missed removing the old out-of-union "inverse" member, which caused the struct size to change which then gives size mismatch warnings when using an old iptables. It is interesting to see that gcc did not warn about this before. (Filed http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47376 ) Signed-off-by: Jan Engelhardt commit e2651647080930a1846196c3b79f4de662100388 Author: Paul Mundt Date: Thu Jan 20 21:24:03 2011 +0900 serial: sh-sci: Handle port memory region reservations. At the moment the request/release_port ops are no-ops with the port remapping case tied in to the config_port op. This moves the remap logic in to the request_port, balances it with unmapping in the port release, and finally takes care of the mem region reservations. All existing users are of the port autoconf variety, so we follow the example of other drivers that wrap in to the port request by way of the config op in the UART_CONFIG_TYPE case. This is the first step towards fixing up conflicts with multiple users of the same ports, as currently happens between sh-sci and spi_sh_sci. Signed-off-by: Paul Mundt commit c0c06bd244179f754d68684fd87674585a153e40 Author: Chris Wilson Date: Thu Jan 20 11:18:48 2011 +0000 drm/i915/ringbuffer: Kill an annoyingly frequent debug message This is better handled through the tracepoints and just clutters the debug logs. Signed-off-by: Chris Wilson commit fd82be6c0a359fc706a805a49b1f167af21e63ea Author: Stefan Achatz Date: Thu Jan 6 09:00:41 2011 +0100 HID: roccat: Fix an error message when reading more data from bin attributes Using cat or something to read from binary attributes would try to do an additional read with offset equal to filesize. This resulted in an invalid attribute error. This is fixed by giving the right answer instead of EINVAL. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit e68cc603b063416c85f3e408184219fb71d4a9ff Author: Stefan Achatz Date: Thu Jan 6 09:00:34 2011 +0100 HID: roccat: Add support for Roccat Arvo keyboard This patch add support for Roccat Arvo keyboard. Arvo has 5 additional configurable buttons and the ability to deactivate certain keys. Userland tools can soon be found at http://sourceforge.net/projects/roccat Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit fe4402931e43e81a4129eba41d05cf8907603af5 Merge: 417ae14 4efe070 Author: Chris Wilson Date: Thu Jan 20 09:40:42 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Apply the SandyBridge stability fixes from -fixes. commit 82d800d8e7fa731b50deb851d16b68050673f587 Merge: 28a51ba cc4fc02 Author: Patrick McHardy Date: Thu Jan 20 10:33:55 2011 +0100 Merge branch 'connlimit' of git://dev.medozas.de/linux Conflicts: Documentation/feature-removal-schedule.txt Signed-off-by: Patrick McHardy commit 28a51ba59a1a983d63d4775e9bb8230fe0fb3b29 Author: Florian Westphal Date: Thu Jan 20 10:23:26 2011 +0100 netfilter: do not omit re-route check on NF_QUEUE verdict ret != NF_QUEUE only works in the "--queue-num 0" case; for queues > 0 the test should be '(ret & NF_VERDICT_MASK) != NF_QUEUE'. However, NF_QUEUE no longer DROPs the skb unconditionally if queueing fails (due to NF_VERDICT_FLAG_QUEUE_BYPASS verdict flag), so the re-route test should also be performed if this flag is set in the verdict. The full test would then look something like && ((ret & NF_VERDICT_MASK) == NF_QUEUE && (ret & NF_VERDICT_FLAG_QUEUE_BYPASS)) This is rather ugly, so just remove the NF_QUEUE test altogether. The only effect is that we might perform an unnecessary route lookup in the NF_QUEUE case. ip6table_mangle did not have such a check. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 Merge: cc7ec45 5d84492 Author: David S. Miller Date: Thu Jan 20 00:06:15 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 5d8449286456659cdd0998e62d80df2d9e77e9e3 Author: Jan Engelhardt Date: Thu Jan 20 08:48:15 2011 +0100 netfilter: xtables: remove extraneous header that slipped in Commit 0b8ad87 (netfilter: xtables: add missing header files to export list) erroneously added this. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit cc7ec456f82da7f89a5b376e613b3ac4311b3e9a Author: Eric Dumazet Date: Wed Jan 19 19:26:56 2011 +0000 net_sched: cleanups Cleanup net/sched code to current CodingStyle and practices. Reduce inline abuse Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 7180a03118cac7256fb04f929fe34d0aeee92c40 Author: Alban Crequy Date: Wed Jan 19 04:56:36 2011 +0000 af_unix: coding style: remove one level of indentation in unix_shutdown() Signed-off-by: Alban Crequy Reviewed-by: Ian Molton Signed-off-by: David S. Miller commit b8970f0bfc78103cb74c66055de7379b15097840 Author: John Fastabend Date: Mon Jan 17 08:06:09 2011 +0000 net_sched: implement a root container qdisc sch_mqprio This implements a mqprio queueing discipline that by default creates a pfifo_fast qdisc per tx queue and provides the needed configuration interface. Using the mqprio qdisc the number of tcs currently in use along with the range of queues alloted to each class can be configured. By default skbs are mapped to traffic classes using the skb priority. This mapping is configurable. Configurable parameters, struct tc_mqprio_qopt { __u8 num_tc; __u8 prio_tc_map[TC_BITMASK + 1]; __u8 hw; __u16 count[TC_MAX_QUEUE]; __u16 offset[TC_MAX_QUEUE]; }; Here the count/offset pairing give the queue alignment and the prio_tc_map gives the mapping from skb->priority to tc. The hw bit determines if the hardware should configure the count and offset values. If the hardware bit is set then the operation will fail if the hardware does not implement the ndo_setup_tc operation. This is to avoid undetermined states where the hardware may or may not control the queue mapping. Also minimal bounds checking is done on the count/offset to verify a queue does not exceed num_tx_queues and that queue ranges do not overlap. Otherwise it is left to user policy or hardware configuration to create useful mappings. It is expected that hardware QOS schemes can be implemented by creating appropriate mappings of queues in ndo_tc_setup(). One expected use case is drivers will use the ndo_setup_tc to map queue ranges onto 802.1Q traffic classes. This provides a generic mechanism to map network traffic onto these traffic classes and removes the need for lower layer drivers to know specifics about traffic types. Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 4f57c087de9b46182545676d2c594120a20f2e58 Author: John Fastabend Date: Mon Jan 17 08:06:04 2011 +0000 net: implement mechanism for HW based QOS This patch provides a mechanism for lower layer devices to steer traffic using skb->priority to tx queues. This allows for hardware based QOS schemes to use the default qdisc without incurring the penalties related to global state and the qdisc lock. While reliably receiving skbs on the correct tx ring to avoid head of line blocking resulting from shuffling in the LLD. Finally, all the goodness from txq caching and xps/rps can still be leveraged. Many drivers and hardware exist with the ability to implement QOS schemes in the hardware but currently these drivers tend to rely on firmware to reroute specific traffic, a driver specific select_queue or the queue_mapping action in the qdisc. By using select_queue for this drivers need to be updated for each and every traffic type and we lose the goodness of much of the upstream work. Firmware solutions are inherently inflexible. And finally if admins are expected to build a qdisc and filter rules to steer traffic this requires knowledge of how the hardware is currently configured. The number of tx queues and the queue offsets may change depending on resources. Also this approach incurs all the overhead of a qdisc with filters. With the mechanism in this patch users can set skb priority using expected methods ie setsockopt() or the stack can set the priority directly. Then the skb will be steered to the correct tx queues aligned with hardware QOS traffic classes. In the normal case with single traffic class and all queues in this class everything works as is until the LLD enables multiple tcs. To steer the skb we mask out the lower 4 bits of the priority and allow the hardware to configure upto 15 distinct classes of traffic. This is expected to be sufficient for most applications at any rate it is more then the 8021Q spec designates and is equal to the number of prio bands currently implemented in the default qdisc. This in conjunction with a userspace application such as lldpad can be used to implement 8021Q transmission selection algorithms one of these algorithms being the extended transmission selection algorithm currently being used for DCB. Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit e7ed828f10bd89a28f821ae7f20e691704d61923 Author: Vlad Dogaru Date: Thu Jan 13 23:38:31 2011 +0000 netlink: support setting devgroup parameters If a rtnetlink request specifies a negative or zero ifindex and has no interface name attribute, but has a group attribute, then the chenges are made to all the interfaces belonging to the specified group. Signed-off-by: Vlad Dogaru Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit cbda10fa97d72c7a1923be4426171aa90e8c6dab Author: Vlad Dogaru Date: Thu Jan 13 23:38:30 2011 +0000 net_device: add support for network device groups Net devices can now be grouped, enabling simpler manipulation from userspace. This patch adds a group field to the net_device structure, as well as rtnetlink support to query and modify it. Signed-off-by: Vlad Dogaru Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 441c793a56502638d45d5da2195056d686147370 Author: Shan Wei Date: Thu Jan 13 22:19:52 2011 +0000 net: cleanup unused macros in net directory Clean up some unused macros in net/*. 1. be left for code change. e.g. PGV_FROM_VMALLOC, PGV_FROM_VMALLOC, KMEM_SAFETYZONE. 2. never be used since introduced to kernel. e.g. P9_RDMA_MAX_SGE, UTIL_CTRL_PKT_SIZE. Signed-off-by: Shan Wei Acked-by: Sjur Braendeland Signed-off-by: David S. Miller commit 6997e618910b902081a5123f228aac620faa899b Author: Jon Mason Date: Tue Jan 18 15:02:22 2011 +0000 vxge: update driver version Update vxge driver version to 2.5.2 Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 16fded7da2cefc619ece0d44f8df76b533c43fd2 Author: Jon Mason Date: Tue Jan 18 15:02:21 2011 +0000 vxge: MSIX one shot mode To reduce the possibility of losing an interrupt in the handler due to a race between an interrupt processing and disable/enable of interrupts, enable MSIX one shot. Also, add support for adaptive interrupt coalesing Signed-off-by: Jon Mason Signed-off-by: Masroor Vettuparambil Signed-off-by: David S. Miller commit 1d15f81cda496f1c1d59af7458ea0bcdeeb726f3 Author: Jon Mason Date: Tue Jan 18 15:02:20 2011 +0000 vxge: correct eprom version detection The firmware PXE EPROM version detection is failing due to passing the wrong parameter into firmware query function. Also, the version printing function has an extraneous newline. Signed-off-by: Jon Mason Signed-off-by: Sivakumar Subramani Signed-off-by: David S. Miller commit 6cca200362b46a6845b3f07367f5068a427161e1 Author: Jon Mason Date: Tue Jan 18 15:02:19 2011 +0000 vxge: cleanup probe error paths Reorder the commands to be in the inverse order of their allocations (instead of the random order they appear to be in), propagate return code on errors from pci_request_region and register_netdev, reduce the config_dev_cnt and total_dev_cnt counters on remove, and return the correct error code for vdev->vpaths kzalloc failures. Also, prevent leaking of vdev->vpaths memory and netdev in vxge_probe error path due to freeing for these not occurring in vxge_device_unregister. Signed-off-by: Jon Mason Signed-off-by: Sivakumar Subramani Signed-off-by: David S. Miller commit 14f0290ba44de6ed435fea24bba26e7868421c66 Merge: f5c88f5 a5db219 Author: Patrick McHardy Date: Wed Jan 19 23:51:37 2011 +0100 Merge branch 'master' of /repos/git/net-next-2.6 commit f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82 Author: Patrick McHardy Date: Wed Jan 19 19:10:49 2011 +0100 netfilter: nf_conntrack: fix lifetime display for disabled connections When no tstamp extension exists, ct_delta_time() returns -1, which is then assigned to an u64 and tested for negative values to decide whether to display the lifetime. This obviously doesn't work, use a s64 and merge the two minor functions into one. Signed-off-by: Patrick McHardy commit cc4fc022571376412986e27e08b0765e9cb2aafb Author: Jan Engelhardt Date: Tue Jan 18 17:32:40 2011 +0100 netfilter: xtables: connlimit revision 1 This adds destination address-based selection. The old "inverse" member is overloaded (memory-wise) with a new "flags" variable, similar to how J.Park did it with xt_string rev 1. Since revision 0 userspace only sets flag 0x1, no great changes are made to explicitly test for different revisions. Signed-off-by: Jan Engelhardt commit fbb327c5945448e98480d610815143a6d4a63638 Author: Felix Fietkau Date: Tue Jan 18 15:48:48 2011 +0100 mac80211: drop non-auth 3-addr data frames when running as a 4-addr station When running as a 4-addr station against an AP that has the 4-addr VLAN interface and the main 3-addr AP interface bridged together, sometimes frames originating from the station were looping back from the 3-addr AP interface, causing the bridge code to emit warnings about receiving frames with its own source address. I'm not sure why this is happening yet, but I think it's a good idea to drop all frames (except 802.1x/EAP frames) that do not match the configured addressing mode, including 4-address frames sent to a 3-address station. User test reports indicate that the problem goes away with this patch. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5dd36bc933e8be84f8369ac64505a2938f9ce036 Author: Johannes Berg Date: Tue Jan 18 13:52:23 2011 +0100 mac80211: allow advertising correct maximum aggregate size Currently, mac80211 always advertises that it may send up to 64 subframes in an aggregate. This is fine, since it's the max, but might as well be set to zero instead since it doesn't have any information. However, drivers might have that information, so allow them to set a variable giving it, which will then be used. The default of zero will be fine since to the peer that means we don't know and it will just use its own limit for the buffer size. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 0b01f030d38e00650e2db42da083d8647aad40a5 Author: Johannes Berg Date: Tue Jan 18 13:51:05 2011 +0100 mac80211: track receiver's aggregation reorder buffer size The aggregation code currently doesn't implement the buffer size negotiation. It will always request a max buffer size (which is fine, if a little pointless, as the mac80211 code doesn't know and might just use 0 instead), but if the peer requests a smaller size it isn't possible to honour this request. In order to fix this, look at the buffer size in the addBA response frame, keep track of it and pass it to the driver in the ampdu_action callback when called with the IEEE80211_AMPDU_TX_OPERATIONAL action. That way the driver can limit the number of subframes in aggregates appropriately. Note that this doesn't fix any drivers apart from the addition of the new argument -- they all need to be updated separately to use this variable! Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit ac1bd8464f161ed1475ef73c431b926256c6b5bb Author: Johannes Berg Date: Tue Jan 18 13:45:32 2011 +0100 mac80211: don't return beacons when mesh is disabled When mesh is disabled, mac80211 was returning beacons with an empty mesh ID. That isn't desirable, even if drivers shouldn't be trying to get beacons to start with. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 4801416c76a3a355076d6d371c00270dfe332e1c Author: Ben Greear Date: Sat Jan 15 19:13:48 2011 +0000 ath9k: Fix up hardware mode and beacons with multiple vifs. When using a mixture of AP and Station interfaces, the hardware mode was using the type of the last VIF registered. Instead, we should keep track of the number of different types of vifs and set the mode accordingly. In addtion, use the vif type instead of hardware opmode when dealing with beacons. Attempt to move some of the common setup code into smaller methods so we can re-use it when changing vif mode as well as adding/deleting vifs. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit f0b8220c64242e19f41ad1b4eec3225d53715cbe Author: Felix Fietkau Date: Sat Jan 15 14:30:15 2011 +0100 ath9k: fix excessive BAR sending when a frame exceeds its retry limit Because the sendbar variable was not reset to zero, the stack would send Block ACK requests for all subframes following the one that failed, which could mess up the receiver side block ack window. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 21f28e6f0061568b2347aa7517249fc034f949b5 Author: Felix Fietkau Date: Sat Jan 15 14:30:14 2011 +0100 ath9k: try more than one tid when scheduling a new aggregate Sometimes the first TID in the first AC's list is not available for forming a new aggregate (the BAW might not allow it), however other TIDs may have data available for sending. Prevent a slowdown of other TIDs by going through multiple entries until we've either hit the last one or enough AMPDUs are pending in the hardware queue. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a4d6e17d3ee0f9d12474b1692f7a0574f1aab53c Author: Rajkumar Manoharan Date: Sat Jan 15 01:42:01 2011 +0530 ath9k_hw: fix carrier leakage calibration for AR9271 AR9285 carrier leakage calibration related workaround on high temperature is not applicable for AR9271. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 4e3ae3873858f1e64afb19975360000bee15b502 Author: Rajkumar Manoharan Date: Sat Jan 15 01:33:28 2011 +0530 ath9k_htc: keep calibrated noise floor value for oper channel The ath9k_hw assumes that caldata is valid only for oper channel. But with ath9k_htc case, the caldata is passed for all channels on hw_reset though we are not doing calibration on that channel. So the oper channel's nf history got cleared to default due to mismatch in channel flags. This patch also saves some space. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit bdd196a3e00d2be8b50d8af0d8cf845884f4d59b Author: Rajkumar Manoharan Date: Sat Jan 15 01:01:22 2011 +0530 ath9k: preserve caldata history buffer across scanning caldata's channel info is never filled with operating channel info which is causing the operating channel's noise floor history buffer is reset to default nf during channel change. Signed-off-by: Rajkumar Manoharan Acked-by: Felix Fietkau Signed-off-by: John W. Linville commit bfc31df33b162540c6c3e1473e022cd0a312a522 Author: Ben Greear Date: Fri Jan 14 09:32:18 2011 -0800 mac80211: Show max retry-counts in kernel messages. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 0a65169b1f602b955176cb5f0789139d0fccb041 Author: Wey-Yi Guy Date: Fri Jan 14 08:07:56 2011 -0800 mac80211: mesh only parameter mppath maybe unused mppath is mesh related parameter and maybe unused Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 115dad7a7f42e68840392767323ceb9306dbdb36 Author: Felix Fietkau Date: Fri Jan 14 00:06:27 2011 +0100 ath9k_hw: partially revert "fix dma descriptor rx error bit parsing" The rx error bit parsing was changed to consider PHY errors and various decryption errors separately. While correct according to the documentation, this is causing spurious decryption error reports in some situations. Fix this by restoring the original order of the checks in those places, where the errors are meant to be mutually exclusive. If a CRC error is reported, then MIC failure and decryption errors are irrelevant, and a PHY error is unlikely. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit df6ba5d80d6c9b51471d5fa046c3c06988e5f62a Author: Luciano Coelho Date: Wed Jan 12 15:26:30 2011 +0200 mac80211: add hw configuration for max ampdu buffer size Some devices don't support the maximum AMDPU buffer size of 64, so we need to add an option to configure this in the hardware configuration. This value will be used in the ADDBA response instead of the value suggested in the request, if the latter is greater than the max supported. Signed-off-by: Luciano Coelho Tested-by: Juuso Oikarinen Signed-off-by: John W. Linville commit dcac908babcd8ce21057e476c8df609b28ad2cd8 Author: Nick Ledovskikh Date: Tue Jan 11 14:35:12 2011 +0000 mac80211:mesh_mpp_table_grow call should depend on MESH_WORK_GROW_MPP_TABLE flag. Replace MESH_WORK_GROW_MPATH_TABLE by MESH_WORK_GROW_MPP_TABLE in mesh_mpp_table_grow call condition. (Clearly the original was a typo... -- JWL) Signed-off-by: Nickolay Ledovskikh Signed-off-by: John W. Linville commit fda9b7afa70f9003853929821748aec98d567b1e Author: Wojciech Dubowik Date: Tue Jan 11 09:00:31 2011 +0100 ath5k: Fix return codes for eeprom read functions. Eeprom read functions are of bool type and not int. Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit 8b3f4616d40a2ad19dd14af40b73f56860c812ea Author: Felix Fietkau Date: Mon Jan 10 17:05:50 2011 -0700 ath9k: reduce the likelihood of baseband hang check false positives Since baseband hangs are rare, but the hang check function has a high false positive rate in some situations, we need to add more reliable indicators. In AP mode we can use blocked beacon transmissions as an indicator, they should be rare enough. In station mode, we can skip the hang check entirely, since a true hang will trigger beacon loss detection, and mac80211 will rescan, which leads to a hw reset that will bring the hardware back to life. To make this more reliable, we need to skip fast channel changes if the hardware appears to be stuck. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 2ed72229d60fc6f3ac9941b75d1e1522b08a975a Author: Felix Fietkau Date: Mon Jan 10 17:05:49 2011 -0700 ath9k: reinitialize block ack window data when starting aggregation There might be some old stale data left, which could confuse tracking of pending tx frames. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 49447f2f9d47c4a57a76db702c9c1dab32fa7934 Author: Felix Fietkau Date: Mon Jan 10 17:05:48 2011 -0700 ath9k: fix initial sequence number after starting an ampdu session txtid->seq_start may not always be up to date, when there is HT non-AMPDU traffic just before starting an AMPDU session. Relying on txtid->seq_next is better, since it is also used to generate the sequence numbers for all QoS data frames. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a9e99a0cea3b6e27cca23ad2ef57331a25d886bb Author: Felix Fietkau Date: Mon Jan 10 17:05:47 2011 -0700 ath9k: fix bogus sequence number increases on aggregation tid flush When a tid pointer is passed to ath_tx_send_normal(), it increases the starting sequence number for the next AMPDU action frame, which should only be done if the sequence number assignment is fresh. In this case it is clearly not. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 80d184e6cfb1ba7371152c4c91652d770c9caddb Author: RA-Jay Hung Date: Mon Jan 10 11:28:10 2011 +0100 rt2x00: Fix and fine-tune rf registers for RT3070/RT3071/RT3090 Basically fix and fine-tune RT3070/RT3071/RT3090 chip RF initial value when call rt2800_init_rfcsr Signed-off-by: RA-Jay Hung Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7f6e144fb99a4a70d3c5ad5f074204c5b89a6f65 Author: RA-Jay Hung Date: Mon Jan 10 11:27:43 2011 +0100 rt2x00: Fix radio off hang issue for PCIE interface PCI/PCIE radio off behavior is different from SOC/USB. They mainly use MCU command to disable DMA, TX/RX and enter power saving mode. Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 9d52501b421450ddd9e000c9788ac3be0e44ef1c Author: Joel A Fernandes Date: Mon Jan 10 00:44:23 2011 -0600 mac80211: Rewrote code for checking if destinations are proxied. Rewrote code for checking if the destination is proxied by a mesh portal, to facilitate better understanding of the functionality. Signed-off-by: Joel A Fernandes Acked-by: Javier Cardona Signed-off-by: John W. Linville commit 04cf53f465049c7c509aac7b776f75d38ef68e69 Author: Sujith Manoharan Date: Tue Jan 4 13:17:28 2011 +0530 ath9k_hw: Offload USB eeprom reading to target For USB devices, reading the EEPROM data can be offloaded to the target. Use multiple register reads to take advantage of this feature to reduce initialization time. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 09a525d33870e8a16076ec0200cc5002f6bef35d Author: Sujith Manoharan Date: Tue Jan 4 13:17:18 2011 +0530 ath9k_htc: Add multiple register read API This would decrease latency in reading bulk registers. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit fcdc403c31ed5bb5f3baf42f4e2b5e7198fef0c0 Author: Nishant Sarmukadam Date: Thu Dec 30 11:23:34 2010 -0800 mwl8k: Enable HW encryption for AP mode set_key callback is defined for mac80211 to install keys for HW crypto in AP mode. Driver currently falls back to SW crypto in STA mode. Add support to configure the keys appropriately in the hardware after the set_key routine is called. Signed-off-by: Nishant Sarmukadam Signed-off-by: Pradeep Nemavat Signed-off-by: Thomas Pedersen Signed-off-by: John W. Linville commit d9a07d4980514e701555c4f03b865a54c4c48b4a Author: Nishant Sarmukadam Date: Thu Dec 30 11:23:33 2010 -0800 mwl8k: Set mac80211 rx status flags appropriately when hw crypto is enabled When hw crypto is enabled, set rx status flags appropriately depending on whether hw crypto is enabled for a particular bss. Also report MIC errors to mac80211, so that counter measures can be initiated Signed-off-by: Nishant Sarmukadam Signed-off-by: yogesh powar Signed-off-by: Thomas Pedersen Signed-off-by: John W. Linville commit e53d9b964e2568172149d41b3157af9cde9accaf Author: Nishant Sarmukadam Date: Thu Dec 30 11:23:32 2010 -0800 mwl8k: Add encapsulation of data packet for crypto Different tail pads will be needed for crypto depending on the crypto mode. Add support to encapsulate the packets with appropriate pad value. Signed-off-by: Nishant Sarmukadam Signed-off-by: Pradeep Nemavat Signed-off-by: Thomas Pedersen Signed-off-by: John W. Linville commit 252486a13a36e2846ff046c18aae67658692eced Author: Nishant Sarmukadam Date: Thu Dec 30 11:23:31 2010 -0800 mwl8k: Modify add_dma_header to include pad parameters Add capability to add_dma_header to support padding at tail of the data packet to be transmitted when crypto is enabled. Padding is required for adding crypto information in data packets for supporting 802.11 security modes. Signed-off-by: Nishant Sarmukadam Signed-off-by: Pradeep Nemavat Signed-off-by: Thomas Pedersen Signed-off-by: John W. Linville commit 417ae1476de3ae9689a374d70565f41b3474641e Author: Chris Wilson Date: Wed Jan 19 15:04:42 2011 +0000 drm/i915: Include TLB miss latency in g4x watermark computations Reports of FIFO underruns are still persisting on gm45. References: https://bugs.freedesktop.org/show_bug.cgi?id=27589 Signed-off-by: Chris Wilson commit a992ca2a0498edd22a88ac8c41570f536de29c9e Author: Pablo Neira Ayuso Date: Wed Jan 19 16:00:07 2011 +0100 netfilter: nf_conntrack_tstamp: add flow-based timestamp extension This patch adds flow-based timestamping for conntracks. This conntrack extension is disabled by default. Basically, we use two 64-bits variables to store the creation timestamp once the conntrack has been confirmed and the other to store the deletion time. This extension is disabled by default, to enable it, you have to: echo 1 > /proc/sys/net/netfilter/nf_conntrack_timestamp This patch allows to save memory for user-space flow-based loogers such as ulogd2. In short, ulogd2 does not need to keep a hashtable with the conntrack in user-space to know when they were created and destroyed, instead we use the kernel timestamp. If we want to have a sane IPFIX implementation in user-space, this nanosecs resolution timestamps are also useful. Other custom user-space applications can benefit from this via libnetfilter_conntrack. This patch modifies the /proc output to display the delta time in seconds since the flow start. You can also obtain the flow-start date by means of the conntrack-tools. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit e66ef2f81f1d36b5413e3fc7ff548de683f0750b Merge: 474b62d 78b3fb4 Author: Mark Brown Date: Wed Jan 19 14:50:22 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 42b16b3fbb5ee4555f5dee6220f3ccaa6e1ebe47 Author: Jesper Juhl Date: Mon Jan 17 00:09:38 2011 +0100 Kill off warning: ‘inline’ is not at beginning of declaration Fix a bunch of warning: ‘inline’ is not at beginning of declaration messages when building a 'make allyesconfig' kernel with -Wextra. These warnings are trivial to kill, yet rather annoying when building with -Wextra. The more we can cut down on pointless crap like this the better (IMHO). A previous patch to do this for a 'allnoconfig' build has already been merged. This just takes the cleanup a little further. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit f0940cee222790e6e995a23f25c4ffb23f939a24 Author: Namhyung Kim Date: Tue Jan 11 21:15:03 2011 +0900 dio: fix typos in comments Signed-off-by: Namhyung Kim Cc: Jiri Kosina Signed-off-by: Jiri Kosina commit 5a3a7658863f74f28cef53b9336bff7423659801 Author: Justin P. Mattock Date: Wed Jan 19 15:36:38 2011 +0100 Comment typo fixes for 'descriptor' Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 7044882ef231201ed84e14b766d948d4c6b46f82 Author: Jim Cromie Date: Wed Dec 29 10:18:58 2010 -0500 replace obsolete CONFIG_DYNAMIC_PRINTK_DEBUG with CONFIG_DYNAMIC_DEBUG former is obsoleted by latter, done by       commit e9d376f0fa66bd630fe27403669c6ae6c22a868f       Author: Jason Baron       Date:   Thu Feb 5 11:51:38 2009 -0500 most defconfig mentions have been removed in the big defconfig cleanup, but the one in s6105_defconfig remains. Signed-off-by:  Jim Cromie Signed-off-by: Jiri Kosina commit 2099973abfb96f98290d52de24940561e29bbeea Author: Jesper Juhl Date: Tue Nov 9 00:09:25 2010 +0100 scsi: Remove unnecessary casts of void ptr returning alloc function return values The [vk][cmz]alloc(_node) family of functions return void pointers which it's completely unnecessary/pointless to cast to other pointer types since that happens implicitly. This patch removes such casts from drivers/scsi/ Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 1dcb202f42d0483d8d24015d8ded3badc1d11e2e Author: Jesper Juhl Date: Tue Nov 9 00:08:50 2010 +0100 drivers/message/, i2o: Remove unnecessary casts of void ptr returning alloc function return values The [vk][cmz]alloc(_node) family of functions return void pointers which it's completely unnecessary/pointless to cast to other pointer types since that happens implicitly. This patch removes such casts from drivers/message/ Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 288db88216081bed4761ad0924527a9ca54025e9 Author: Jesper Juhl Date: Tue Nov 9 00:08:25 2010 +0100 GPU DRM: Remove unnecessary casts of void ptr returning alloc function return values The [vk][cmz]alloc(_node) family of functions return void pointers which it's completely unnecessary/pointless to cast to other pointer types since that happens implicitly. This patch removes such casts from drivers/gpu/drm/ Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 633f2ea26665d37bb3c8ae30799aa14988622653 Author: Chris Wilson Date: Wed Jan 19 13:29:42 2011 +0000 drm/i915: Disable SSC for outputs other than LVDS or DP For CRT and SDVO/HDMI, we need to use a normal, non-SSC, clock and so we must clear any enabling bits left-over from earlier outputs. And also seems to correct the LVDS panel on the Lenovo U160. However, at one point, it did cause an "ERROR failed to disable trancoder". So prolonged testing on top of Jesse's refactored and error-checking CRTC logic is desired. Signed-off-by: Chris Wilson commit 9a4114ffa7b6f5f4635e3745a8dc051d15d4596a Author: Bryan Freed Date: Wed Jan 12 13:38:39 2011 -0800 drm/i915/bios: Change default clock source on PineView to use SSC The i915 driver normally assumes the video bios has configured several of the LVDS panel registers, and it just inherits the values. If the vbios has not run, several of these will need to be setup. If these are not correct then although the panel looks ok, output from an HDMI encoder (eg, Chrontel CH7036) will be incorrect. Signed-off-by: Mark Hayter [ickle: minor adjustments] Signed-off-by: Chris Wilson commit aa9b500ddf1a6318e7cf8b1754696edddae86db9 Author: Bryan Freed Date: Wed Jan 12 13:43:19 2011 -0800 drm/i915: Honour LVDS sync polarity from EDID The i915 driver normally assumes the video bios has configured several of the LVDS panel registers, and it just inherits the values. If the vbios has not run, several of these will need to be setup. So we need to check that the LVDS sync polarity is correctly configured per any available modelines (e.g. EDID) and adjust if not, issuing a warning as we do. Signed-off-by: Mark Hayter Signed-off-by: Chris Wilson commit 474b62d6eee733abdcd36f8e3e5ce504fbb9110b Author: Mark Brown Date: Tue Jan 18 16:14:44 2011 +0000 ASoC: Provide per widget type callback when executing DAPM sequences Many modern devices have features such as DC servos which take time to start. Currently these are handled by per-widget events but this makes it difficult to paralleise operations on multiple widgets, meaning delays can end up being needlessly serialised. By providing a callback to drivers when all widgets of a given type have been handled during a DAPM sequence the core allows drivers to start operations separately and wait for them to complete much more simply. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 20e4859dedfc7e7b620d1756b29f8483c5be5fcc Author: Mark Brown Date: Sat Jan 15 13:40:50 2011 +0000 ASoC: Add support for sequencing within With larger devices there may be many widgets of the same type in series in an audio path. Allow drivers to specify an additional level of ordering within each widget type by adding a subsequence number to widgets and then splitting operations on widgets so that widgets of the same type but different sequence numbers are processed separately. A typical example would be a supply widget which requires that another widget be enabled to provide power or clocking. SND_SOC_DAPM_PGA_S() and SND_SOC_DAPM_SUPPLY_S() macros are provided allowing this to be used with PGAs and supplies as these are the most commonly affected widgets. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 828a842f2e02de5d884ee14bd3c21ddbc77ec60e Author: Mark Brown Date: Sat Jan 15 13:14:30 2011 +0000 ASoC: Explicitly say if we're powering up or down Rather than passing the sequence to use for DAPM widgets around by reference explicitly say if we're powering up or down until the point where we need the sequence itself. This should make no practical difference in itself but supports future refactoring. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ccab5c82759e2ace74b2e84f82d1e0eedd932571 Author: Jesse Barnes Date: Tue Jan 18 15:49:25 2011 -0800 drm/i915: tune Sandy Bridge DRPS constants These make us increase our frequency much more readily, and decrease them only after significant idle time, resulting in a 20% performance increase for nexuiz. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 311bd68e024f9006db66cbadc3bd9f62fd663f4b Author: Chris Wilson Date: Thu Jan 13 19:06:50 2011 +0000 drm/i915: Trivial sparse fixes Move code around and invoke iomem annotation in a few more places in order to silence sparse. Still a few more iomem annotations to go... Signed-off-by: Chris Wilson commit 18b2190ca5bd3f19717421b1591c79c9b0372428 Author: Alexander Lam Date: Mon Jan 3 13:28:56 2011 -0500 drm/i915: allow 945 to control self refresh (CxSR) automatically I changed 945's self refresh to work without the need for the driver to enable/disable self refresh manually based on the idle state of the gpu. This is much better than enabling/disabling self refresh for various reasons, including staying in a lower power state for more time and avoiding the need for cpu cycles. This was originally done manually to workaround issues with the hardware hanging. However, since 944001201: drm/i915: enable low power render writes on GEN3 hardware, automatic CxSR seems stable. Signed-off-by: Alexander Lam Acked-by : Li Peng [ickle: play safe with the ordering and disable CxSR before tweaking any watermark and enable afterwards.] Signed-off-by: Chris Wilson commit b0b544cd37c060e261afb2cf486296983fcb56da Author: Chris Wilson Date: Sun Jan 9 12:04:40 2011 +0000 drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU 945 class hardware has an interesting quirk in which the vblank interrupt is not raised if the CPU is in a low power state. (We also suspect that the memory bus is clocked to the CPU/c-state and not the GPU so there are secondary starvation issues.) In order to prevent the most obvious issue of the low of the vblank interrupt (stuttering compositing that only updates when the mouse is moving) is to install a PM QoS request to prevent low c-states whilst the GPU is active. Signed-off-by: Chris Wilson commit f67a559daaa0e2ba616bfe9438f202bc57bc8c72 Author: Jesse Barnes Date: Wed Jan 5 10:31:48 2011 -0800 drm/i915: skip FDI & PCH enabling for DP_A eDP on the CPU doesn't need the PCH set up at all, it can in fact cause problems. So avoid FDI training and PCH PLL enabling in that case. Signed-off-by: Jesse Barnes Tested-by: Yuanhan Liu Signed-off-by: Chris Wilson commit 6f06ce184c765fd8d50669a8d12fdd566c920859 Author: Jesse Barnes Date: Tue Jan 4 15:09:38 2011 -0800 drm/i915: set phase sync pointer override enable before setting phase sync pointer We need to unlock the phase sync pointer enable bit before we can actually enable the phase sync pointer workaround on Ironlake. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 0fc932b8ec36116bb759105ce910b0475e63112a Author: Jesse Barnes Date: Tue Jan 4 15:09:37 2011 -0800 drm/i915: factor out FDI disable and add FDI assertions Factor out the FDI disable function (make it a mirror of ironlake_fdi_enable) and add some FDI related assertions to the FDI training code (we need an active pipe & plane before we start transmitting bits). Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 040484af3a4efa65786b6e107fbe74747679e17c Author: Jesse Barnes Date: Mon Jan 3 12:14:26 2011 -0800 drm/i915: add transcoder enable/disable functions Along with assertion checks for the FDI transmitters and receivers (including PLLs). Modify the pipe enable function to check for FDI PLL status as well, when driving PCH ports. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit d9b6cb568bc6eca8db88357bf8bbb92d42a91b1e Author: Jesse Barnes Date: Tue Jan 4 15:09:35 2011 -0800 drm/i915: assert panel is unlocked before writing transcoder timing regs Otherwise our writes will be silently ignored. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 92f2584a083986c05fc811bbdf380c3fa7c12296 Author: Jesse Barnes Date: Tue Jan 4 15:09:34 2011 -0800 drm/i915: add PCH DPLL enable/disable functions With assertions to check transcoder and reference clock state. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 63d7bbe9ded4146e3f78e5742b119fa1fdb52665 Author: Jesse Barnes Date: Tue Jan 4 15:09:33 2011 -0800 drm/i915: add PLL enable/disable functions For pre-ILK only. Saves some code in the CRTC enable/disable functions and allows us to check for pipe and panel status at enable/disable time. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit ea0760cfc00b9e534423fdaf630d1c8ce7a5ede0 Author: Jesse Barnes Date: Tue Jan 4 15:09:32 2011 -0800 drm/i915: add panel lock assertion function When PLLs or timing regs are changed, we need to make sure the panel lock will allow it. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit b24e71798871089da1a4ab049db2800afc1aac0c Author: Jesse Barnes Date: Tue Jan 4 15:09:30 2011 -0800 drm/i915: add pipe/plane enable/disable functions Add plane enable/disable functions to prevent duplicated code and allow us to easily check for plane enable/disable requirements (such as pipe enable, plane status, pll status etc). Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 65993d64a31844ad444694efb2d159eb9c883e49 Author: Jesse Barnes Date: Tue Jan 4 15:09:29 2011 -0800 drm/i915: don't enable plane, pipe and PLL prematurely On Ironlake+ we need to enable these in a specific order. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 01fe9dbde19a1a27b8ee63e2d964562962e1eb78 Author: Chris Wilson Date: Sun Jan 16 19:37:30 2011 +0000 drm/i915: Use ACPI OpRegion to determine lid status Admittedly, trusting ACPI or the BIOS at all to be correct is littered with numerous examples where it is wrong. Maybe, just maybe, we will have better luck using the ACPI OpRegion lid status... Signed-off-by: Chris Wilson commit a211701eb1e4a41bbee22d61f35dba8e55925db4 Author: Harsha Priya Date: Tue Jan 11 14:50:59 2011 +0530 ASoC: sst_platform porting sst dsp driver interface as per latest in Greg's staging tree The interface between sst platform driver and intel sst dsp driver have been changed in Greg's staging tree - next branch This patch adds the interface changes compatible with the new interface in Greg's staging tree Signed-off-by: Harsha Priya Signed-off-by: Vinod Koul Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a1926d1745114789687ac029ae8c58944b7d2256 Merge: 492e917 52fc43f Author: Mark Brown Date: Wed Jan 19 11:22:54 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 00c89c1d1831225bb89b0627e02d0d3f875ec0a4 Author: Marc Reilly Date: Sat Jan 15 11:36:57 2011 +1100 Introduce VPR200 board. Signed-off-by: Marc Reilly Signed-off-by: Sascha Hauer commit 98b7d550f292ae96f1058f19b83aadd6985a6fa0 Author: Richard Zhao Date: Fri Jan 14 17:48:04 2011 +0800 arm: mx50_rdp: add i2c bus support Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 82c520dccf7fd5afcd95b941f48c25f38c162c77 Author: Richard Zhao Date: Fri Jan 14 17:48:03 2011 +0800 arm: mx50_rdp: add fec support Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit a929dcf70ed74b8ff52b6fca54f6ebb463e829f4 Author: Jason Liu Date: Tue Jan 11 05:44:29 2011 +0800 ARM i.MX50: Rename devices-mx50.h There are devices-imx51.h and devices-imx53.h under arch/arm/mach-mx5 directory. So, had better rename devices-mx50.h to devices-imx50.h to follow the same naming convention with imx51 and imx53 part. Signed-off-by: Jason Liu Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit e8183a6c6238a192fba32ac47d75fd076ca487a6 Author: Paul Mundt Date: Wed Jan 19 17:51:37 2011 +0900 serial: sh-sci: Fix up ioremap handling. We were using an IS_ERR() check for the ioremap case, presumably because this matched the old custom ioremap call that sh64 was providing. Now that all ioremap() implementations trap the IS_ERR case and hand back a NULL, check for that instead. Signed-off-by: Paul Mundt commit 86b7d0e288c326d3ea7c22600cb7b6d84abb2968 Author: Paul Mundt Date: Wed Jan 19 17:50:35 2011 +0900 serial: sh-sci: Kill off unused SCSCR definitions. Presently there are only a few hardcoded cases using these definitions, so kill off the unused ones completely. This will make it easier to transition off of the remaining cases. Signed-off-by: Paul Mundt commit 073e84c9320e3fbd26b6a2537c6f592466b25af3 Author: Paul Mundt Date: Wed Jan 19 17:30:53 2011 +0900 serial: sh-sci: Handle request_irq() failures. request_irq() can fail, so actually do something with the error path instead of blindly ignoring it. Signed-off-by: Paul Mundt commit d535a2305facf9b49a65bd412c6deaaf4d4316f2 Author: Paul Mundt Date: Wed Jan 19 17:19:35 2011 +0900 serial: sh-sci: Require a device per port mapping. In the olden days it was possible to register a map of ports per device, but this has long since been abandoned due to the desire to match up with clkdev and other functionality. As a result, all of the in-tree users have for some time already been migrated off of such behaviour, while we've left support code in place to deal with either case. Dropping the code permits for quite a bit of simplification, so we do that now before any users of the old interface are able to be added back in. Signed-off-by: Paul Mundt commit 27bd107525607e6a64c612ca3c43ca0dac4768b1 Author: Paul Mundt Date: Wed Jan 19 15:37:31 2011 +0900 serial: sh-sci: Kill off some DMA ifdeffery. There's nothing worth hiding under the ifdef in the platform DMA definitions, and we certainly don't want board code adding this in to their platform data definitions, so we always expose the slave rx/tx and device pointer members instead. Signed-off-by: Paul Mundt commit ce6738b60d94bb317bc568ef7b81a227b2928bd4 Author: Paul Mundt Date: Wed Jan 19 15:24:40 2011 +0900 serial: sh-sci: Consolidate port definition structures. Presently the port defs are lamely copied around between competing data structures (one platform facing, the other driver internal). As we pretty much require all of the data from the platform facing structure within the driver too, simply nest the pointer directly and kill off the duplication. Signed-off-by: Paul Mundt commit 22cc83780e214f4f009384f9c1d0658629625d49 Author: Paul Mundt Date: Wed Jan 19 14:37:14 2011 +0900 serial: sh-sci: Provide a helper for muxed IRQs. All of the muxed IRQs presently populate the IRQ array verbosely, this simply provides a trivial helper to do it for them. Signed-off-by: Paul Mundt commit 80f8f1027b99660897bdeaeae73002185d829906 Author: Eric Dumazet Date: Tue Jan 18 07:46:52 2011 +0000 net: filter: dont block softirqs in sk_run_filter() Packet filter (BPF) doesnt need to disable softirqs, being fully re-entrant and lock-less. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d6ae3bae3d1bf7a8bf367e29f2cac0788dcd0db5 Author: Alban Crequy Date: Tue Jan 18 06:39:15 2011 +0000 af_unix: implement socket filter Linux Socket Filters can already be successfully attached and detached on unix sockets with setsockopt(sockfd, SOL_SOCKET, SO_{ATTACH,DETACH}_FILTER, ...). See: Documentation/networking/filter.txt But the filter was never used in the unix socket code so it did not work. This patch uses sk_filter() to filter buffers before delivery. This short program demonstrates the problem on SOCK_DGRAM. int main(void) { int i, j, ret; int sv[2]; struct pollfd fds[2]; char *message = "Hello world!"; char buffer[64]; struct sock_filter ins[32] = {{0,},}; struct sock_fprog filter; socketpair(AF_UNIX, SOCK_DGRAM, 0, sv); for (i = 0 ; i < 2 ; i++) { fds[i].fd = sv[i]; fds[i].events = POLLIN; fds[i].revents = 0; } for(j = 1 ; j < 13 ; j++) { /* Set a socket filter to truncate the message */ memset(ins, 0, sizeof(ins)); ins[0].code = BPF_RET|BPF_K; ins[0].k = j; filter.len = 1; filter.filter = ins; setsockopt(sv[1], SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter)); /* send a message */ send(sv[0], message, strlen(message) + 1, 0); /* The filter should let the message pass but truncated. */ poll(fds, 2, 0); /* Receive the truncated message*/ ret = recv(sv[1], buffer, 64, 0); printf("received %d bytes, expected %d\n", ret, j); } for (i = 0 ; i < 2 ; i++) close(sv[i]); return 0; } Signed-off-by: Alban Crequy Reviewed-by: Ian Molton Signed-off-by: David S. Miller commit e735038f3848a720f84a819c8191ed2f6a1beed8 Author: Paul Mundt Date: Wed Jan 19 14:18:06 2011 +0900 serial: sh-sci: Kill off unused membase kludge. All users of the platform port data specify a mapbase where the driver later derives the membase from. Now that UPF flags are taken in to account for generic ioremapping we can kill off the port-specific membase clobbering and simply use the generic paths. This derives from a time when sh64 was not capable of using the generic ioremap implementation and had employed early bolted DTLB mappings for port access, which is no longer an issue. Signed-off-by: Paul Mundt commit 7c86ad4a50ece39305b1be900df9a58645716602 Author: Paul Mundt Date: Wed Jan 19 14:16:42 2011 +0900 serial: sh-sci: Kill off unused clock string. Now that the clock string isn't used by the driver anymore, kill it off from the platform structure. Signed-off-by: Paul Mundt commit a5db219f4cf9f67995eabd53b81a1232c82f5852 Merge: c56eb8f ff76015 Author: David S. Miller Date: Tue Jan 18 16:28:31 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 492e917635a0fa05439bb562fd51577efc9cef30 Merge: 065ae67 c88c282 Author: Mark Brown Date: Tue Jan 18 19:11:23 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 065ae6784f03016ed1c0613863461a162388cf5a Author: Vinod Koul Date: Tue Jan 18 19:11:48 2011 +0530 ASoC: Add dependency on INTEL_SCU_IPC for Intel MID drivers Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0d00a85752ab0fb4f0f7758e35d54b931a25d812 Author: Peter Ujfalusi Date: Tue Jan 18 15:51:45 2011 +0200 ASoC: core: Remove dapm_sync call from soc_post_component_init snd_soc_dapm_new_widgets will call dapm_power_widgets at the end, so there is no need to call snd_soc_dapm_sync after snd_soc_dapm_new_widgets. Signed-off-by: Peter Ujfalusi Reviewed-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 93557f53e1fbd9e2b6574ab0a9b5852628fde9e3 Author: Jiri Olsa Date: Tue Jan 18 18:12:24 2011 +0100 netfilter: nf_conntrack: nf_conntrack snmp helper Adding support for SNMP broadcast connection tracking. The SNMP broadcast requests are now paired with the SNMP responses. Thus allowing using SNMP broadcasts with firewall enabled. Please refer to the following conversation: http://marc.info/?l=netfilter-devel&m=125992205006600&w=2 Patrick McHardy wrote: > > The best solution would be to add generic broadcast tracking, the > > use of expectations for this is a bit of abuse. > > The second best choice I guess would be to move the help() function > > to a shared module and generalize it so it can be used for both. This patch implements the "second best choice". Since the netbios-ns conntrack module uses the same helper functionality as the snmp, only one helper function is added for both snmp and netbios-ns modules into the new object - nf_conntrack_broadcast. Signed-off-by: Jiri Olsa Signed-off-by: Patrick McHardy commit 94d117a1c78df38abdea0c09ef00c205b923b567 Author: Eric Dumazet Date: Tue Jan 18 16:27:56 2011 +0100 netfilter: ipt_CLUSTERIP: remove "no conntrack!" When a packet is meant to be handled by another node of the cluster, silently drop it instead of flooding kernel log. Note : INVALID packets are also dropped without notice. Signed-off-by: Eric Dumazet Acked-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit a8fc0d9b3401cb5e42a437293db383998290157d Merge: 94b27cc 0b8ad87 Author: Patrick McHardy Date: Tue Jan 18 16:20:53 2011 +0100 Merge branch 'master' of git://dev.medozas.de/linux commit 94b27cc36123069966616670c3653cd6873babe9 Author: Florian Westphal Date: Tue Jan 18 16:08:30 2011 +0100 netfilter: allow NFQUEUE bypass if no listener is available If an skb is to be NF_QUEUE'd, but no program has opened the queue, the packet is dropped. This adds a v2 target revision of xt_NFQUEUE that allows packets to continue through the ruleset instead. Because the actual queueing happens outside of the target context, the 'bypass' flag has to be communicated back to the netfilter core. Unfortunately the only choice to do this without adding a new function argument is to use the target function return value (i.e. the verdict). In the NF_QUEUE case, the upper 16bit already contain the queue number to use. The previous patch reduced NF_VERDICT_MASK to 0xff, i.e. we now have extra room for a new flag. If a hook issued a NF_QUEUE verdict, then the netfilter core will continue packet processing if the queueing hook returns -ESRCH (== "this queue does not exist") and the new NF_VERDICT_FLAG_QUEUE_BYPASS flag is set in the verdict value. Note: If the queue exists, but userspace does not consume packets fast enough, the skb will still be dropped. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit f615df76ed862b7d3927ec5f55b805ca19be29d9 Author: Florian Westphal Date: Tue Jan 18 15:52:14 2011 +0100 netfilter: reduce NF_VERDICT_MASK to 0xff NF_VERDICT_MASK is currently 0xffff. This is because the upper 16 bits are used to store errno (for NF_DROP) or the queue number (NF_QUEUE verdict). As there are up to 0xffff different queues available, there is no more room to store additional flags. At the moment there are only 6 different verdicts, i.e. we can reduce NF_VERDICT_MASK to 0xff to allow storing additional flags in the 0xff00 space. NF_VERDICT_BITS would then be reduced to 8, but because the value is exported to userspace, this might cause breakage; e.g.: e.g. 'queuenr = (1 << NF_VERDICT_BITS) | NF_QUEUE' would now break. Thus, remove NF_VERDICT_BITS usage in the kernel and move the old value to the 'userspace compat' section. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit 06cdb6349c1f3fd439398dbc04ce4c696f0a41ab Author: Florian Westphal Date: Tue Jan 18 15:28:38 2011 +0100 netfilter: nfnetlink_queue: do not free skb on error Move free responsibility from nf_queue to caller. This enables more flexible error handling; we can now accept the skb instead of freeing it. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit f15850861860636c905b33a9a5be3dcbc2b0d56a Author: Florian Westphal Date: Tue Jan 18 15:27:28 2011 +0100 netfilter: nfnetlink_queue: return error number to caller instead of returning -1 on error, return an error number to allow the caller to handle some errors differently. ECANCELED is used to indicate that the hook is going away and should be ignored. A followup patch will introduce more 'ignore this hook' conditions, (depending on queue settings) and will move kfree_skb responsibility to the caller. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit 5f2cafe73671d865af88494159f3e8c1b322e1c5 Author: Florian Westphal Date: Tue Jan 18 15:18:08 2011 +0100 netfilter: Kconfig: NFQUEUE is useless without NETFILTER_NETLINK_QUEUE NFLOG already does the same thing for NETFILTER_NETLINK_LOG. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit 45eec34195853e918518231dcefaca1ea4ebacfc Author: Changli Gao Date: Tue Jan 18 15:08:13 2011 +0100 netfilter: nf_conntrack: remove an atomic bit operation As this ct won't be seen by the others, we don't need to set the IPS_CONFIRMED_BIT in atomic way. Signed-off-by: Changli Gao Cc: Tim Gardner Cc: Eric Dumazet Signed-off-by: Patrick McHardy commit a7c2f4d7daf9bbea362763fa7353b1862a2487ad Author: Changli Gao Date: Tue Jan 18 15:02:48 2011 +0100 netfilter: nf_nat: fix conversion to non-atomic bit ops My previous patch (netfilter: nf_nat: don't use atomic bit operation) made a mistake when converting atomic_set to a normal bit 'or'. IPS_*_BIT should be replaced with IPS_*. Signed-off-by: Changli Gao Cc: Tim Gardner Cc: Eric Dumazet Signed-off-by: Patrick McHardy commit 1da09c43ce5f4fcd98143feb7d2513fe6fd62848 Author: Paul Mundt Date: Tue Jan 18 19:56:04 2011 +0900 sh: pci: Support asynchronous initialization of SH-X3 PCIe channels. SH-X3 controllers all have pretty dire delays needed for PHY wakeup, so we attempt to mitigate the damage by bringing them up asynchronously, simply using the synchronization points for persistent bridge to channel numbering. Signed-off-by: Paul Mundt commit 0b8ad876275c74e4bfb6ec3150793f3c0ecfcee2 Author: Jan Engelhardt Date: Tue Jan 18 11:23:06 2011 +0100 netfilter: xtables: add missing header files to export list Signed-off-by: Jan Engelhardt commit 0260c1dccc6a1018f8cf2c4778dffb47fc5d1c4c Author: Jan Engelhardt Date: Tue Jan 18 07:33:09 2011 +0100 netfilter: xtables: use __uXX guarded types for userspace exports Signed-off-by: Jan Engelhardt commit 1cc34c30be0e27d4ba8c1ce04a8a4f46c927d121 Author: Richard Weinberger Date: Tue Jan 18 01:36:57 2011 +0100 netfilter: xt_connlimit: use hotdrop jump mark Signed-off-by: Richard Weinberger Signed-off-by: Jan Engelhardt commit ae9d67aff60af59548b6c7d1a74febea09660122 Author: Jan Engelhardt Date: Tue Jan 18 06:48:12 2011 +0100 audit: export symbol for use with xt_AUDIT When xt_AUDIT is built as a module, modpost reports a problem. MODPOST 322 modules ERROR: "audit_enabled" [net/netfilter/x_tables.ko] undefined! WARNING: modpost: Found 1 section mismatch(es). Cc: Thomas Graf Signed-off-by: Jan Engelhardt commit f1e231a356f90a67f8547c2881a62c92084683c6 Author: Jan Engelhardt Date: Tue Jan 18 06:30:13 2011 +0100 netfilter: xtables: add missing aliases for autoloading via iptables Signed-off-by: Jan Engelhardt commit 18d1d7fbcc260e67d249bf90b454d8cf34288453 Author: Artem Bityutskiy Date: Mon Jan 17 22:27:56 2011 +0200 UBIFS: introduce mounting flag This is a preparational patch which removes the 'c->always_chk_crc' which was set during mounting and remounting to R/W mode and introduces 'c->mounting' flag which is set when mounting. Now the 'c->always_chk_crc' flag is the same as 'c->remounting_rw && c->mounting'. This patch is a preparation for the next one which will need to know when we are mounting and remounting to R/W mode, which is exactly what 'c->always_chk_crc' effectively is, but its name does not suite the next patch. The other possibility would be to just re-name it, but then we'd end up with less logical flags coverage. Signed-off-by: Artem Bityutskiy commit d8cdda3efb9331bedbcca2343591eab2316f4cae Author: Artem Bityutskiy Date: Mon Jan 17 20:27:45 2011 +0200 UBIFS: re-arrange variables in ubifs_info This is a cosmetic patch which re-arranges variables in 'struct ubifs_info' so that all boolean-like variables which are only changed during mounting or re-mounting to R/W mode are places together. Then they are turned into bit-fields, which makes the structure a little bit smaller. Signed-off-by: Artem Bityutskiy commit 7898e1f8e9eb1bee88c92d636e0ab93f2cbe31c6 Author: Casey Schaufler Date: Mon Jan 17 08:05:27 2011 -0800 Subject: [PATCH] Smack: mmap controls for library containment In the embedded world there are often situations where libraries are updated from a variety of sources, for a variety of reasons, and with any number of security characteristics. These differences might include privilege required for a given library provided interface to function properly, as occurs from time to time in graphics libraries. There are also cases where it is important to limit use of libraries based on the provider of the library and the security aware application may make choices based on that criteria. These issues are addressed by providing an additional Smack label that may optionally be assigned to an object, the SMACK64MMAP attribute. An mmap operation is allowed if there is no such attribute. If there is a SMACK64MMAP attribute the mmap is permitted only if a subject with that label has all of the access permitted a subject with the current task label. Security aware applications may from time to time wish to reduce their "privilege" to avoid accidental use of privilege. One case where this arises is the environment in which multiple sources provide libraries to perform the same functions. An application may know that it should eschew services made available from a particular vendor, or of a particular version. In support of this a secondary list of Smack rules has been added that is local to the task. This list is consulted only in the case where the global list has approved access. It can only further restrict access. Unlike the global last, if no entry is found on the local list access is granted. An application can add entries to its own list by writing to /smack/load-self. The changes appear large as they involve refactoring the list handling to accomodate there being more than one rule list. Signed-off-by: Casey Schaufler commit 219d8df86805b8bb20b375707e9be734100ce89d Author: Dimitris Papastamos Date: Mon Jan 17 11:00:12 2011 +0000 ASoC: WM8995: Add regulator handling code Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a1b3b5eeeebac8acfa7838ef90f5a00a6f9188a0 Author: Mark Brown Date: Fri Dec 24 16:59:30 2010 +0000 ASoC: Avoid direct register cache access when setting defaults Directly accessing the register cache means that we can't use anything except a flat register cache so use snd_soc_update_bits(). Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 203db220718c735dcb959fddc64e94fff3b52f73 Author: Dimitris Papastamos Date: Fri Jan 14 15:49:40 2011 +0000 ASoC: WM8991: Add initial WM8991 driver The WM8991 is a highly integrated ultra-low power hi-fi CODEC designed for handsets rich in multimedia features such as GPS, mobile TV, digital audio playback and gaming. This driver was originally written by Graeme Gregory and has been maintained out of tree by Mark Brown and Dimitris Papastamos. Signed-off-by: Graeme Gregory Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 70a7ca34dbdcc6f0ed332baf2b308bab2871424a Author: Vinod Koul Date: Fri Jan 14 19:22:48 2011 +0530 ASoC: soc core allow machine driver to register the card The machine driver can't register the card directly and need to do this thru soc-audio device creation This patch allows the register and unregister card to be directly called by machine drivers Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit dacfecdbf3a0a5072984ff8b3c224a48c8461008 Author: Vasiliy Kulikov Date: Mon Jan 17 13:08:45 2011 +0300 HID: hid-roccat-koneplus: potential NULL dereference kmalloc() may fail, if so return -ENOMEM. Also koneplus_init_koneplus_device_struct() should check return code of koneplus_get_startup_profile() and propagate its return code. Signed-off-by: Vasiliy Kulikov Signed-off-by: Jiri Kosina commit c5e0591ae3a13adfe2d6d685ba9cc6d84d0e58df Author: Michael Witten Date: Mon Jan 17 00:08:41 2011 +0000 Kconfig: BLK_THROTTLE -> BLK_DEV_THROTTLING It would seem that `CONFIG_BLK_THROTTLE' doesn't exist, as it is only referenced in the documentation for `CONFIG_BLK_CGROUP'. The only other choice is `CONFIG_BLK_DEV_THROTTLING': $ git grep --cached THROTTL -- \*Kconfig block/Kconfig:config BLK_DEV_THROTTLING init/Kconfig: CONFIG_BLK_THROTTLE=y. Signed-off-by: Michael Witten Signed-off-by: Jiri Kosina commit 79e2e7597de5e36a2f7f0dca13011f46ee37c809 Author: Michael Witten Date: Sun Jan 16 21:43:10 2011 +0000 Kconfig: Typo: seti -> set Also, I introduced some punctuation to facilitate reading. Signed-off-by: Michael Witten Signed-off-by: Jiri Kosina commit fbabf31e4d482149b5e2704eb0287cf9117bdcf3 Author: Thomas Graf Date: Sun Jan 16 18:12:59 2011 +0100 netfilter: create audit records for x_tables replaces The setsockopt() syscall to replace tables is already recorded in the audit logs. This patch stores additional information such as table name and netfilter protocol. Cc: Patrick McHardy Cc: Eric Paris Cc: Al Viro Signed-off-by: Thomas Graf Signed-off-by: Patrick McHardy commit 43f393caec0362abe03c72799d3f342af3973070 Author: Thomas Graf Date: Sun Jan 16 18:10:28 2011 +0100 netfilter: audit target to record accepted/dropped packets This patch adds a new netfilter target which creates audit records for packets traversing a certain chain. It can be used to record packets which are rejected administraively as follows: -N AUDIT_DROP -A AUDIT_DROP -j AUDIT --type DROP -A AUDIT_DROP -j DROP a rule which would typically drop or reject a packet would then invoke the new chain to record packets before dropping them. -j AUDIT_DROP The module is protocol independant and works for iptables, ip6tables and ebtables. The following information is logged: - netfilter hook - packet length - incomming/outgoing interface - MAC src/dst/proto for ethernet packets - src/dst/protocol address for IPv4/IPv6 - src/dst port for TCP/UDP/UDPLITE - icmp type/code Cc: Patrick McHardy Cc: Eric Paris Cc: Al Viro Signed-off-by: Thomas Graf Signed-off-by: Patrick McHardy commit 8b4ae3342dbcb6a0def3a7b3ae7aee633a81e758 Author: James Bottomley Date: Wed Dec 22 10:24:36 2010 -0600 eliminate special FLUSH flag from page table This was used to flush a region even if the page table entry had been cleared. In theory this was never necessary, but now we've switched to alias based flushing, the whole set of code associated with it can be dumped. Signed-off-by: James Bottomley Signed-off-by: James Bottomley commit f311847c2fcebd81912e2f0caf8a461dec28db41 Author: James Bottomley Date: Wed Dec 22 10:22:11 2010 -0600 parisc: flush pages through tmpalias space The kernel has an 8M tmpailas space (originally designed for copying and clearing pages but now only used for clearing). The idea is to place zeros into the cache above a physical page rather than into the physical page and flush the cache, because often the zeros end up being replaced quickly anyway. We can also use the tmpalias space for flushing a page. The difference here is that we have to do tmpalias processing in the non access data and instruction traps. The principle is the same: as long as we know the physical address and have a virtual address congruent to the real one, the flush will be effective. In order to use the tmpalias space, the icache miss path has to be enhanced to check for the alias region to make the fic instruction effective. Signed-off-by: James Bottomley commit f4ed1009fcea8502d1191ef3e435e9d83c286b80 Author: Jianbin Kang Date: Fri Jan 14 20:07:05 2011 +0800 kbuild: add GNU GLOBAL tags generation GNU GLOBAL (http://www.gnu.org/software/global/) is a source code tagging system It is really cheap to support it in kbuild system. Signed-off-by: Jianbin Kang Signed-off-by: Michal Marek commit 38b3439d84f4a310bd29e3dbc21dffe9119ef157 Author: Mike Crowe Date: Wed Jan 12 00:53:52 2011 -0500 setlocalversion: update mercurial tag parsing The tag output of hg doesn't quite match what setlocalversion currently expects, so update it to handle the latest format. Signed-off-by: Mike Crowe Signed-off-by: Mike Frysinger Signed-off-by: Michal Marek commit d862a6622e9db508d4b28cc7c5bc28bd548cc24e Author: Patrick McHardy Date: Fri Jan 14 15:45:56 2011 +0100 netfilter: nf_conntrack: use is_vmalloc_addr() Use is_vmalloc_addr() in nf_ct_free_hashtable() and get rid of the vmalloc flags to indicate that a hash table has been allocated using vmalloc(). Signed-off-by: Patrick McHardy commit 0134e89c7bcc9fde1da962c82a120691e185619f Merge: c7066f7 6faee60 Author: Patrick McHardy Date: Fri Jan 14 14:12:37 2011 +0100 Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6 Conflicts: net/ipv4/route.c Signed-off-by: Patrick McHardy commit c7066f70d9610df0b9406cc635fc09e86136e714 Author: Patrick McHardy Date: Fri Jan 14 13:36:42 2011 +0100 netfilter: fix Kconfig dependencies Fix dependencies of netfilter realm match: it depends on NET_CLS_ROUTE, which itself depends on NET_SCHED; this dependency is missing from netfilter. Since matching on realms is also useful without having NET_SCHED enabled and the option really only controls whether the tclassid member is included in route and dst entries, rename the config option to IP_ROUTE_CLASSID and move it outside of traffic scheduling context to get rid of the NET_SCHED dependeny. Reported-by: Vladis Kletnieks Signed-off-by: Patrick McHardy commit 62ffac4d70ed996d303da0ac8e32c89b9810115c Author: Stephen Warren Date: Thu Jan 13 15:22:08 2011 -0700 ASoC: tegra: Add DAPM widgets/routes for Harmony With this change, I can capture from a microphone plugged into the mic jack on Harmony (after unmuting Left Input PGA, and maybe turning up the gain there too). Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b0ee5fbab742d234f87c0186a5cae2aba85ba7a7 Author: Stephen Warren Date: Thu Jan 13 15:21:53 2011 -0700 ASoC: tegra: Remove TEGRA_I2S_AUDIO from Kconfig That config variable doesn't exist in the mainline kernel, and hence the dependency shouldn't either. In linux-tegra-2.6.36, the dependency did exist to avoid a conflict with the old non-ALSA Tegra I2S driver. However, this isn't and won't be upstreamed. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4e10bda05d6c7d4aba509bbbab5ba748d54c702f Author: Vinod Koul Date: Thu Jan 13 22:48:52 2011 +0530 ASoC: soc core add inline to handle card list initialzation Currently the soc_probe initializes the card hence it does the card list initialzation. But if machines directly register the card they would need to do these steps, so putting them as inline would save lot of code This patch adds an inline to do list initialzation Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Signed-off-by: Mark Brown commit 150dd2f8c42bdb3c51533459e3ff5075d8720260 Author: Vinod Koul Date: Thu Jan 13 22:48:32 2011 +0530 ASoC: soc core move the card debugfs initialization The card debugfs initialization is done in soc_probe but would be better if it is done when the card in registered This patch moves the debugfs initialization to register_card() Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Signed-off-by: Mark Brown commit b0e264855cc42106cc41426e68651b5d67df444d Author: Vinod Koul Date: Thu Jan 13 22:48:02 2011 +0530 ASoC: soc core move card cleanup from soc_remove() In soc_remove() the card resources are cleaned up. This can also be done in card_unregister() This patch move this cleanup into a new function and calls it from card_unregister. This paves way for further work to allow card registartion from machine. Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Signed-off-by: Mark Brown commit adc0485b9e6419df0106a37288a72a5cc9d097e6 Author: Andrea Gelmini Date: Thu Jan 13 23:01:53 2011 +0100 Documentation: dm-crypt: update cryptsetup homepage Signed-off-by: Andrea Gelmini Acked-by: Milan Broz Signed-off-by: Jiri Kosina commit 422650e65a41a61b2f92396dfa4faa6a4df89913 Author: Stephen Warren Date: Tue Jan 11 12:48:53 2011 -0700 ASoC: tegra: s/IS_ERR_OR_NULL/IS_ERR/ for clk_get_sys A recent discussion on linux-arm-kernel noted that the value returned by clk_get_sys is an opaque token, and not strictly a pointer; it is meaningful only to the clock API, clients should not dereference the value, and the clock API must accept any non-IS_ERR value it returned. Hence, only IS_ERR is appropriate to interpret the result, not IS_ERR_OR_NULL. I checked that clk_get_sys in both ASoC's for-next and Tegra's for-next do behave as described; NULL is not returned in the case of error. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1500b7b5ffaacb8199e0a61162f5d349fb19acbe Author: Dimitris Papastamos Date: Thu Jan 13 12:20:38 2011 +0000 ASoC: Automatically assign the default readable()/volatile() functions Ensure that all calls to readable_register()/volatile_register() go via the snd_soc_codec function pointers. If the default register access table has been given but no functions for handling readable()/volatile() registers, use the default ones provided by soc-cache. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d4754ec91c7b094298f0b2ba02327e6887671edc Author: Dimitris Papastamos Date: Thu Jan 13 12:20:37 2011 +0000 ASoC: Update users of readable_register()/volatile_register() Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 066d16c3e8194677a9aaeb06a45e4014387d16f1 Author: Dimitris Papastamos Date: Thu Jan 13 12:20:36 2011 +0000 ASoC: soc-cache: Add support for default readable()/volatile() functions For common scenarios, device drivers can provide a table of all the registers that are at least either readable/writable/volatile. The idea is that if a register lookup fails, all of its read/write/vol members will be zero and will be treated as default. This also reduces the size of the register access array. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3e8e2cc45c9d6b5c1265838a8cff701815321dbc Merge: a193436 7bd1fd8 Author: Mark Brown Date: Thu Jan 13 13:58:23 2011 +0000 Merge branch 'for-2.6.38' into for-2.6.39 commit 7bd1fd8a96098b84664acdca5361defaf1e6ce9f Author: Seungwhan Youn Date: Thu Jan 13 11:08:21 2011 +0900 ASoC: documentation updates This patch is only for RFC purpose of ASoC documentation updates which match with current ASoC codes with documents. Mostly modify features are modified to be sync with changes after multi-component patches. Signed-off-by: Seungwhan Youn Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6faee60a4e82075853a437831768cc9e2e563e4e Author: Florian Westphal Date: Mon Dec 20 15:57:47 2010 +0100 netfilter: ebt_ip6: allow matching on ipv6-icmp types/codes To avoid adding a new match revision icmp type/code are stored in the sport/dport area. Signed-off-by: Florian Westphal Reviewed-by: Holger Eitzenberger Reviewed-by: Bart De Schuymer Signed-off-by: Pablo Neira Ayuso commit 255d0dc34068a976550ce555e153c0bfcfec7cc6 Author: Eric Dumazet Date: Sat Dec 18 18:35:15 2010 +0100 netfilter: x_table: speedup compat operations One iptables invocation with 135000 rules takes 35 seconds of cpu time on a recent server, using a 32bit distro and a 64bit kernel. We eventually trigger NMI/RCU watchdog. INFO: rcu_sched_state detected stall on CPU 3 (t=6000 jiffies) COMPAT mode has quadratic behavior and consume 16 bytes of memory per rule. Switch the xt_compat algos to use an array instead of list, and use a binary search to locate an offset in the sorted array. This halves memory need (8 bytes per rule), and removes quadratic behavior [ O(N*N) -> O(N*log2(N)) ] Time of iptables goes from 35 s to 150 ms. Signed-off-by: Eric Dumazet Signed-off-by: Pablo Neira Ayuso commit b017900aac4a158b9bf7ffdcb8a369a91115b3e4 Author: Patrick McHardy Date: Wed Dec 15 09:46:26 2010 +0100 netfilter: xt_conntrack: support matching on port ranges Add a new revision 3 that contains port ranges for all of origsrc, origdst, replsrc and repldst. The high ports are appended to the original v2 data structure to allow sharing most of the code with v1 and v2. Use of the revision specific port matching function is made dependant on par->match->revision. Signed-off-by: Patrick McHardy Signed-off-by: Pablo Neira Ayuso commit 5df15196a2bbf16ca4c6a797ec00ff36d0d5c179 Author: Jan Engelhardt Date: Sun Dec 26 10:22:22 2010 +0100 netfilter: xt_comment: drop unneeded unsigned qualifier Since a string is stored, and not something like a MAC address that would rely on (un)signedness, drop the qualifier. Signed-off-by: Jan Engelhardt Signed-off-by: Pablo Neira Ayuso commit c6d2d445d8dee04cde47eb4021636399a4239e9f Author: Hans Schillstrom Date: Mon Jan 3 14:45:03 2011 +0100 IPVS: netns, final patch enabling network name space. all init_net removed, (except for some alloc related that needs to be there) Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 4a98480bccc2f5998c5564d254392635b9aa04c2 Author: Hans Schillstrom Date: Mon Jan 3 14:45:02 2011 +0100 IPVS: netns, misc init_net removal in core. init_net removed in __ip_vs_addr_is_local_v6, and got net as param. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 763f8d0ed4f1ce38b35cc0e05482b7799b82789b Author: Hans Schillstrom Date: Mon Jan 3 14:45:01 2011 +0100 IPVS: netns, svc counters moved in ip_vs_ctl,c Last two global vars to be moved, ip_vs_ftpsvc_counter and ip_vs_nullsvc_counter. [horms@verge.net.au: removed whitespace-change-only hunk] Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit f2431e6e9255461eb1476340a89ad32ad4b38b03 Author: Hans Schillstrom Date: Mon Jan 3 14:45:00 2011 +0100 IPVS: netns, trash handling trash list per namspace, and reordering of some params in dst struct. [ horms@verge.net.au: Use cancel_delayed_work_sync() instead of cancel_rearming_delayed_work(). Found during merge conflict resoliution ] Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit f6340ee0c6b9498ec918a7bb2f44e20abb8b2833 Author: Hans Schillstrom Date: Mon Jan 3 14:44:59 2011 +0100 IPVS: netns, defense work timer. This patch makes defense work timer per name-space, A net ptr had to be added to the ipvs struct, since it's needed by defense_work_handler. [ horms@verge.net.au: Use cancel_delayed_work_sync() instead of cancel_rearming_delayed_work(). Found during merge conflict resoliution ] Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit a0840e2e165a370ca24a59545e564e9881a55891 Author: Hans Schillstrom Date: Mon Jan 3 14:44:58 2011 +0100 IPVS: netns, ip_vs_ctl local vars moved to ipvs struct. Moving global vars to ipvs struct, except for svc table lock. Next patch for ctl will be drop-rate handling. *v3 __ip_vs_mutex remains global ip_vs_conntrack_enabled(struct netns_ipvs *ipvs) Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 6e67e586e7289c144d5a189d6e0fa7141d025746 Author: Hans Schillstrom Date: Mon Jan 3 14:44:57 2011 +0100 IPVS: netns, connection hash got net as param. Connection hash table is now name space aware. i.e. net ptr >> 8 is xor:ed to the hash, and this is the first param to be compared. The net struct is 0xa40 in size ( a little bit smaller for 32 bit arch:s) and cache-line aligned, so a ptr >> 5 might be a more clever solution ? All lookups where net is compared uses net_eq() which returns 1 when netns is disabled, and the compiler seems to do something clever in that case. ip_vs_conn_fill_param() have *net as first param now. Three new inlines added to keep conn struct smaller when names space is disabled. - ip_vs_conn_net() - ip_vs_conn_net_set() - ip_vs_conn_net_eq() *v3 moved net compare to the end in "fast path" Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit b17fc9963f837ef1acfe36e193108fb16ed58647 Author: Hans Schillstrom Date: Mon Jan 3 14:44:56 2011 +0100 IPVS: netns, ip_vs_stats and its procfs The statistic counter locks for every packet are now removed, and that statistic is now per CPU, i.e. no locks needed. However summing is made in ip_vs_est into ip_vs_stats struct which is moved to ipvs struc. procfs, ip_vs_stats now have a "per cpu" count and a grand total. A new function seq_file_single_net() in ip_vs.h created for handling of single_open_net() since it does not place net ptr in a struct, like others. /var/lib/lxc # cat /proc/net/ip_vs_stats_percpu Total Incoming Outgoing Incoming Outgoing CPU Conns Packets Packets Bytes Bytes 0 0 3 1 9D 34 1 0 1 2 49 70 2 0 1 2 34 76 3 1 2 2 70 74 ~ 1 7 7 18A 18E Conns/s Pkts/s Pkts/s Bytes/s Bytes/s 0 0 0 0 0 *v3 ip_vs_stats reamains as before, instead ip_vs_stats_percpu is added. u64 seq lock added *v4 Bug correction inbytes and outbytes as own vars.. per_cpu counter for all stats now as suggested by Julian. [horms@verge.net.au: removed whitespace-change-only hunk] Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit f131315fa272d337dfca7dad2f033ff5296dad65 Author: Hans Schillstrom Date: Mon Jan 3 14:44:55 2011 +0100 IPVS: netns awareness to ip_vs_sync All global variables moved to struct ipvs, most external changes fixed (i.e. init_net removed) in sync_buf create + 4 replaced by sizeof(struct..) Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 29c2026fd4980c144d9c746dc1565060f08e5796 Author: Hans Schillstrom Date: Mon Jan 3 14:44:54 2011 +0100 IPVS: netns awareness to ip_vs_est All variables moved to struct ipvs, most external changes fixed (i.e. init_net removed) *v3 timer per ns instead of a common timer in estimator. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit ab8a5e8408c3df2d654611bffc3aaf04f418b266 Author: Hans Schillstrom Date: Mon Jan 3 14:44:53 2011 +0100 IPVS: netns awareness to ip_vs_app All variables moved to struct ipvs, most external changes fixed (i.e. init_net removed) in ip_vs_protocol param struct net *net added to: - register_app() - unregister_app() This affected almost all proto_xxx.c files Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 9bbac6a904d0816dae58b454692c54d6773cc20d Author: Hans Schillstrom Date: Mon Jan 3 14:44:52 2011 +0100 IPVS: netns, common protocol changes and use of appcnt. appcnt and timeout_table moved from struct ip_vs_protocol to ip_vs proto_data. struct net *net added as first param to - register_app() - unregister_app() - app_conn_bind() - ip_vs_conn_new() [horms@verge.net.au: removed cosmetic-change-only hunk] Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 9330419d9aa4f97df412ac9be9fc0388c67dd315 Author: Hans Schillstrom Date: Mon Jan 3 14:44:51 2011 +0100 IPVS: netns, use ip_vs_proto_data as param. ip_vs_protocol *pp is replaced by ip_vs_proto_data *pd in function call in ip_vs_protocol struct i.e. :, - timeout_change() - state_transition() ip_vs_protocol_timeout_change() got ipvs as param, due to above and a upcoming patch - defence work Most of this changes are triggered by Julians comment: "tcp_timeout_change should work with the new struct ip_vs_proto_data so that tcp_state_table will go to pd->state_table and set_tcp_state will get pd instead of pp" *v3 Mostly comments from Julian The pp -> pd conversion should start from functions like ip_vs_out() that use pp = ip_vs_proto_get(iph.protocol), now they should use ip_vs_proto_data_get(net, iph.protocol). conn_in_get() and conn_out_get() unused param *pp, removed. *v4 ip_vs_protocol_timeout_change() walk the proto_data path. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 88fe2d372793a71ae4f6319a16f537d56a83906c Author: Hans Schillstrom Date: Mon Jan 3 14:44:50 2011 +0100 IPVS: netns preparation for proto_ah_esp In this phase (one), all local vars will be moved to ipvs struct. Remaining work, add param struct net *net to a couple of functions that common for all protos. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 9d934878e7870fbbbd8eaed2e467552536877def Author: Hans Schillstrom Date: Mon Jan 3 14:44:49 2011 +0100 IPVS: netns preparation for proto_sctp In this phase (one), all local vars will be moved to ipvs struct. Remaining work, add param struct net *net to a couple of functions that is common for all protos and use ip_vs_proto_data *v3 Removed unuset function set_state_timeout() Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 78b16bde104cc74bedbf462b0ebed2990f35ff6b Author: Hans Schillstrom Date: Mon Jan 3 14:44:48 2011 +0100 IPVS: netns preparation for proto_udp In this phase (one), all local vars will be moved to ipvs struct. Remaining work, add param struct net *net to a couple of functions that is common for all protos and use ip_vs_proto_data *v3 Removed unused function set_state_timeout() Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 4a85b96c08ef84076f84e87280223a4301988ed9 Author: Hans Schillstrom Date: Mon Jan 3 14:44:47 2011 +0100 IPVS: netns preparation for proto_tcp In this phase (one), all local vars will be moved to ipvs struct. Remaining work, add param struct net *net to a couple of functions that is common for all protos and use all ip_vs_proto_data *v3 Removed unused function as sugested by Simon Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 252c64103237f1841088f0f29b4f084b1c774546 Author: Hans Schillstrom Date: Mon Jan 3 14:44:46 2011 +0100 IPVS: netns, prepare protocol Add support for protocol data per name-space. in struct ip_vs_protocol, appcnt will be removed when all protos are modified for network name-space. This patch causes warnings of unused functions, they will be used when next patch will be applied. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit b6e885ddb903e681b7cbb4e68ad775154660e1f4 Author: Hans Schillstrom Date: Mon Jan 3 14:44:45 2011 +0100 IPVS: netns awarness to lblc sheduler var sysctl_ip_vs_lblc_expiration moved to ipvs struct as sysctl_lblc_expiration procfs updated to handle this. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit d0a1eef9c38218af20c809b2220a960b7ed81a36 Author: Hans Schillstrom Date: Mon Jan 3 14:44:44 2011 +0100 IPVS: netns awarness to lblcr sheduler var sysctl_ip_vs_lblcr_expiration moved to ipvs struct as sysctl_lblcr_expiration procfs updated to handle this. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit fc723250c9cb046cc19833a2b1c4309bbf59ac36 Author: Hans Schillstrom Date: Mon Jan 3 14:44:43 2011 +0100 IPVS: netns to services part 1 Services hash tables got netns ptr a hash arg, While Real Servers (rs) has been moved to ipvs struct. Two new inline functions added to get net ptr from skb. Since ip_vs is called from different contexts there is two places to dig for the net ptr skb->dev or skb->sk this is handled in skb_net() and skb_sknet() Global functions, ip_vs_service_get() ip_vs_lookup_real_service() etc have got struct net *net as first param. If possible get net ptr skb etc, - if not &init_net is used at this early stage of patching. ip_vs_ctl.c procfs not ready for netns yet. *v3 Comments by Julian - __ip_vs_service_find and __ip_vs_svc_fwm_find are fast path, net_eq(svc->net, net) so the check is at the end now. - net = skb_net(skb) in ip_vs_out moved after check for skb_dst. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 61b1ab4583e275af216c8454b9256de680499b19 Author: Hans Schillstrom Date: Mon Jan 3 14:44:42 2011 +0100 IPVS: netns, add basic init per netns. Preparation for network name-space init, in this stage some empty functions exists. In most files there is a check if it is root ns i.e. init_net if (!net_eq(net, &init_net)) return ... this will be removed by the last patch, when enabling name-space. *v3 ip_vs_conn.c merge error corrected. net_ipvs #ifdef removed as sugested by Jan Engelhardt [ horms@verge.net.au: Removed whitespace-change-only hunks ] Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit fee1cc0895fd7bde875a86bbc3a1e82089e540b8 Merge: ae90bde 0c21e3a Author: Simon Horman Date: Thu Jan 13 10:29:21 2011 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD commit a193436c5d52e8398af22462beaa03407fa89b2e Author: Kuninori Morimoto Date: Wed Jan 12 15:32:07 2011 +0900 ASoC: sh: fsi-ak4642: fixup platform device id Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit aea170a099793abcd0e6de46b947458073204241 Author: Dimitris Papastamos Date: Wed Jan 12 10:38:58 2011 +0000 ASoC: soc-cache: Add reg_size as a member to snd_soc_codec Simplify the use of reg_size, by calculating it once and storing it in the codec structure for later reference. The value of reg_size is reg_cache_size * reg_word_size. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d779fce5d79525d66269c8f6e430e1515d697f3d Author: Dimitris Papastamos Date: Wed Jan 12 10:22:28 2011 +0000 ASoC: soc-cache: Ensure flat compression uses a copy of the defaults cache With the addition of the cache fallback functionality, it is necessary to ensure that if the register defaults cache was marked as __devinitconst and the LZO compression is not compiled in the kernel, the fallback to flat compression will still use a copy of the defaults cache. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9f975356f7b17f2923a66b2f8bd505287ab4359c Author: Konrad Rzeszutek Wilk Date: Mon Dec 6 18:24:32 2010 -0500 [IA64] Add DMA_ERROR_CODE define. This piggybacks on git commit 8fd524b355daef0945692227e726fb444cebcd4f ("x86: Kill bad_dma_address variable") wherein we use now the dma_map_ops->mapping_error to check for errors and the standard check is against DMA_ERROR_CODE. Introduce it to the IA64 world. CC: FUJITA Tomonori CC: Jesse Barnes Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Tony Luck commit 9f040c7941df09eca6e6a15cfa766b719d8cafb3 Author: Mark Brown Date: Mon Jan 10 19:06:08 2011 +0000 ASoC: Fix indentation in soc_remove() Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 861f2faf4fbd4fb46a436d41dcb5ff75b243ab3a Author: Dimitris Papastamos Date: Tue Jan 11 11:43:51 2011 +0000 ASoC: soc-core: Simplify compress_type overriding functionality Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1321e8838bf9bbc883450675d5c501cb8510f1a4 Author: Dimitris Papastamos Date: Tue Jan 11 11:29:49 2011 +0000 ASoC: soc-cache: Clean up the cache manipulation code Use Takashi's clean up code to make the cache manipulation code more readable. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0378b6acc8ee20720dce23d5157185e09189d41c Author: Seungwhan Youn Date: Tue Jan 11 07:26:06 2011 +0900 ASoC: SAMSUNG: Clean-up header includes This patch remove including unnecessary/duplicated headers which relative with Samsung SoCs. Signed-off-by: Seungwhan Youn Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 180c329d6b0db49687c88303e7f3754e7afdc3bf Author: Timur Tabi Date: Mon Jan 10 15:58:13 2011 -0600 ASoC: let snd_soc_update_bits() return an error code Update snd_soc_update_bits() so that it returns a negative error code if the the read or write operation fails. Note that currently, a lot of the lower-level read functions have an unsigned integer return type (and some of them even try to return a negative number), but this code still appears to work in those cases. An examination of the code shows that all current callers are compatible with this change. Signed-off-by: Timur Tabi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4fde768ecf39360eaed44152c2556dd10c3e0ce7 Author: Dimitris Papastamos Date: Tue Jan 11 09:28:32 2011 +0000 ASoC: WM8995: Remember to flush the cache on resume Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5c68536f32a46c8ccc98df3d9b154e1f33f72447 Author: Harsha Priya Date: Tue Jan 11 14:50:35 2011 +0530 ASoC: sst_platform created helper functions Few funtions can be modularized in this driver to make them look cleaner like managing the stream status with locks and filling pcm parameters. This patch adds helper functions to do the same. Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8a9dab1a555e3f2088c68cae792dfd7e854e65e4 Author: Mark Brown Date: Mon Jan 10 22:25:21 2011 +0000 ASoC: Update name of debugfs root symbol to snd_soc_ Everything else is using snd_soc_ so we should use it here too. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 8b75d714a6ae6445841006ae2074dae095608c36 Author: Stephen Warren Date: Fri Jan 7 22:36:17 2011 -0700 ASoC: tegra: Kconfig and Makefile Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a8bf1ba1c803d63311a2fb3c38c172df6a606faa Author: Stephen Warren Date: Fri Jan 7 22:36:16 2011 -0700 ASoC: tegra: Harmony machine support Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a50a399b8ba169816d8afae66bfd42fbb65b1973 Author: Stephen Warren Date: Fri Jan 7 22:36:15 2011 -0700 ASoC: tegra: Machine utility code Many portions of Tegra ASoC machine drivers will be similar or identical. To avoid cut/paste, this file will act as a repository for all that common code. For now, it solely includes code to reprogram the audio PLL for 44.1KHz- vs. 48KHz-based sample rates. Signed-Off-By: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 71f78e22146c522b26fc2074fcd9cb81806895b1 Author: Stephen Warren Date: Fri Jan 7 22:36:14 2011 -0700 ASoC: tegra: Add tegra-i2s driver This provides an ASoC DAI interface for Tegra's I2S controller. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7605eb5bc327497aed1816d6238d3b64e032b491 Author: Stephen Warren Date: Fri Jan 7 22:36:13 2011 -0700 ASoC: tegra: Add tegra-pcm driver This provides an ASoC platform driver that manages Tegra's APB DMA controller. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f0d8af4f528ee6dd63670521d429edac67934c06 Author: Stephen Warren Date: Fri Jan 7 22:36:12 2011 -0700 ASoC: tegra: Add tegra-das driver The DAS (Digital Audio Switch) is a mux/crossbar which sits between the DACs (Digital Audio Controllers) and the DAPs (Digital Audio Ports). Audio data may be routed between DACs and DAPs in various combinations as required by board design/application. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit faff4bb067d15a3bc0dde8c50cbc1a7075e314de Author: Stephen Warren Date: Fri Jan 7 22:36:11 2011 -0700 ASoC: Export debugfs root dentry A couple Tegra ASoC drivers will create debugfs entries. Mark requested these by under debugfs/asoc/ not just debugfs/. To enable this, export the dentry representing debugfs/asoc/. Also, rename debugfs_root -> asoc_debugfs_root now it's exported to prevent potential symbol name clashes. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 2aa86323d815bab62a7e1d3ef8ed6c81a6dfeffa Author: Dimitris Papastamos Date: Mon Jan 10 10:10:56 2011 +0000 ASoC: soc-core: Add support for NULL default register caches The infrastructure for handling NULL default register maps is already included in the soc-cache code, just ensure that we don't try to dereference a NULL pointer while accessing a NULL register cache. Signed-off-by: Dimitris Papastamos Acked-by: Timur Tabi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0d51a9cbb6c1275cc0f3840c36f8b7840a438c59 Author: Mark Brown Date: Thu Jan 6 16:04:57 2011 +0000 ASoC: Taint the kernel if debugfs is used to write directly to CODECs Since direct register writes may confuse the drivers and are supposed to be used only in diagnostic situations discourage their use in production by tainting the kernel when we do a write. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 9c6df19e55799d23863eb414b0ee850c4fd3a174 Author: Seungwhan Youn Date: Fri Jan 7 13:57:23 2011 +0900 ASoC: SAMSUNG: Move PCM specific definitions into pcm.c This patch moves PCM specific definitions, they doesn't need to be shared, into 'pcm.c' from 'pcm.h'. Signed-off-by: Seungwhan Youn Acked-by: Jassi Brar Signed-off-by: Mark Brown commit f7f741810f14f971337b15892007622c3af1f109 Author: Seungwhan Youn Date: Fri Jan 7 13:51:26 2011 +0900 ASoC: SAMSUNG: Clean-up DMA header file This patch moves DMA specific definitions, they doesn't need to be shared, into 'dma.c' from 'dma.h'. And remove unnecessery definitions on 'dma.h'. Signed-off-by: Seungwhan Youn Acked-by: Jassi Brar Signed-off-by: Mark Brown commit 4f644ea70d54bf851fc0ebc77fa0f66fce7cb7d2 Author: Seungwhan Youn Date: Fri Jan 7 13:46:52 2011 +0900 ASoC: SAMSUNG: Remove AC97 header file This patch moves AC97 specific definitions, they doesn't need to be shared, into 'ac97.c' from 'ac97.h'. This patch also remove header file, 'ac97.h', and remove includes on machine drivers. Signed-off-by: Seungwhan Youn Acked-by: Jassi Brar Signed-off-by: Mark Brown commit fd0d08d9edc8ffc900896e1d1f7f287e6fde1ab3 Author: Vinod Koul Date: Fri Jan 7 16:21:12 2011 +0530 ASoC: mid-x86 - remove the flag in makefile previous commit e62255f2adf2 introduced DDEBUG flag in Makefile This causes all debug statemenets to be ON. This patch removes this flag Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f5c6b2aa33cdacb4902c7b946395f7e73b00d4ce Author: Vinod Koul Date: Fri Jan 7 16:20:56 2011 +0530 ASoC: sst platform - fix the style inconsistency this patch fixes the style inconsistency by removing empty space in MODULE_ALIAS also removes a redundant return statement Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b22dab8883250d5fd91c8c4a7bd00c5985ac82ad Author: Vinod Koul Date: Fri Jan 7 16:20:28 2011 +0530 ASoC: sn95031 fix the code style and format inconsistencies this patch fixes inconsistencies commented by Mark. This also fixes few other style things in audio_map & header file Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 168f2e14319aba3125946649604e858cbae85be6 Author: Tony Luck Date: Thu Jan 6 16:58:58 2011 -0800 pstore: fix build warning for unused return value from sysfs_create_file fs/pstore/inode.c: In function 'init_pstore_fs': fs/pstore/inode.c:266: warning: ignoring return value of 'sysfs_create_file', declared with attribute warn_unused_result Reported-by: Stephen Rothwell Signed-off-by: Tony Luck commit e62255f2adf2e6407d9ac72f5d5ec17712a4fc1d Author: Vinod Koul Date: Tue Jan 4 20:17:04 2011 +0530 ASoC: sst v2: Add makefiles and kconfigs changes This patch adds the makefile and kconfig changes for mid asoc drivers: platform and machine driver which are introduced in 2 preceeding patches Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 55c720369dbe1dd558b87478e3448df837fbe7a3 Author: Vinod Koul Date: Tue Jan 4 20:16:50 2011 +0530 ASoC sst v2: Add medfield machine driver This patch adds the medfield machine driver Machine driver glues the sn95031 codec driver and sst_platform driver to form the asoc sound driver Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d927fdae5cb2ca36f0c5b61e528078e8c1261607 Author: Vinod Koul Date: Tue Jan 4 20:16:32 2011 +0530 ASoC: sst v2: Add mid platform driver This patch adds the platform driver for mid asoc drivers. This platfrom driver sends commands to sst dsp engine driver for the dai operations. For this purpose it depends on intel_sst driver which is currently in staging tree Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4dc69be22163bab880384858f30cb8cc76ad47f9 Author: Vinod Koul Date: Tue Jan 4 20:16:07 2011 +0530 ASoC: sst v2: Add sn95031 codec driver This patch adds the sn95031 asoc codec driver. This driver currently supports only playback. Capture and jack detection to be added later Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f005fe12b90c5b9fe180a09209a893e09affa8aa Author: Yinghai Lu Date: Mon Dec 27 16:48:32 2010 -0800 x86-64: Move out cleanup higmap [_brk_end, _end) out of init_memory_mapping() It is not related to init_memory_mapping(), and init_memory_mapping() is getting more bigger. So make it as seperated function and call it from reserve_brk() and that is point when _brk_end is concluded. Signed-off-by: Yinghai Lu LKML-Reference: <4D1933E0.7090305@kernel.org> Signed-off-by: H. Peter Anvin commit 0bb77c465f02e8281e24b9f02e7dc8a7e2b81ee2 Author: Tony Luck Date: Mon Jan 3 14:22:11 2011 -0800 pstore: X86 platform interface using ACPI/APEI/ERST The 'error record serialization table' in ACPI provides a suitable amount of persistent storage for use by the pstore filesystem. Signed-off-by: Tony Luck commit 1411e0ec3123ae4c4ead6bfc9fe3ee5a3ae5c327 Author: Yinghai Lu Date: Mon Dec 27 16:48:17 2010 -0800 x86-64, numa: Put pgtable to local node memory Introduce init_memory_mapping_high(), and use it with 64bit. It will go with every memory segment above 4g to create page table to the memory range itself. before this patch all page tables was on one node. with this patch, one RED-PEN is killed debug out for 8 sockets system after patch [ 0.000000] initial memory mapped : 0 - 20000000 [ 0.000000] init_memory_mapping: [0x00000000000000-0x0000007f74ffff] [ 0.000000] 0000000000 - 007f600000 page 2M [ 0.000000] 007f600000 - 007f750000 page 4k [ 0.000000] kernel direct mapping tables up to 7f750000 @ [0x7f74c000-0x7f74ffff] [ 0.000000] RAMDISK: 7bc84000 - 7f745000 .... [ 0.000000] Adding active range (0, 0x10, 0x95) 0 entries of 3200 used [ 0.000000] Adding active range (0, 0x100, 0x7f750) 1 entries of 3200 used [ 0.000000] Adding active range (0, 0x100000, 0x1080000) 2 entries of 3200 used [ 0.000000] Adding active range (1, 0x1080000, 0x2080000) 3 entries of 3200 used [ 0.000000] Adding active range (2, 0x2080000, 0x3080000) 4 entries of 3200 used [ 0.000000] Adding active range (3, 0x3080000, 0x4080000) 5 entries of 3200 used [ 0.000000] Adding active range (4, 0x4080000, 0x5080000) 6 entries of 3200 used [ 0.000000] Adding active range (5, 0x5080000, 0x6080000) 7 entries of 3200 used [ 0.000000] Adding active range (6, 0x6080000, 0x7080000) 8 entries of 3200 used [ 0.000000] Adding active range (7, 0x7080000, 0x8080000) 9 entries of 3200 used [ 0.000000] init_memory_mapping: [0x00000100000000-0x0000107fffffff] [ 0.000000] 0100000000 - 1080000000 page 2M [ 0.000000] kernel direct mapping tables up to 1080000000 @ [0x107ffbd000-0x107fffffff] [ 0.000000] memblock_x86_reserve_range: [0x107ffc2000-0x107fffffff] PGTABLE [ 0.000000] init_memory_mapping: [0x00001080000000-0x0000207fffffff] [ 0.000000] 1080000000 - 2080000000 page 2M [ 0.000000] kernel direct mapping tables up to 2080000000 @ [0x207ff7d000-0x207fffffff] [ 0.000000] memblock_x86_reserve_range: [0x207ffc0000-0x207fffffff] PGTABLE [ 0.000000] init_memory_mapping: [0x00002080000000-0x0000307fffffff] [ 0.000000] 2080000000 - 3080000000 page 2M [ 0.000000] kernel direct mapping tables up to 3080000000 @ [0x307ff3d000-0x307fffffff] [ 0.000000] memblock_x86_reserve_range: [0x307ffc0000-0x307fffffff] PGTABLE [ 0.000000] init_memory_mapping: [0x00003080000000-0x0000407fffffff] [ 0.000000] 3080000000 - 4080000000 page 2M [ 0.000000] kernel direct mapping tables up to 4080000000 @ [0x407fefd000-0x407fffffff] [ 0.000000] memblock_x86_reserve_range: [0x407ffc0000-0x407fffffff] PGTABLE [ 0.000000] init_memory_mapping: [0x00004080000000-0x0000507fffffff] [ 0.000000] 4080000000 - 5080000000 page 2M [ 0.000000] kernel direct mapping tables up to 5080000000 @ [0x507febd000-0x507fffffff] [ 0.000000] memblock_x86_reserve_range: [0x507ffc0000-0x507fffffff] PGTABLE [ 0.000000] init_memory_mapping: [0x00005080000000-0x0000607fffffff] [ 0.000000] 5080000000 - 6080000000 page 2M [ 0.000000] kernel direct mapping tables up to 6080000000 @ [0x607fe7d000-0x607fffffff] [ 0.000000] memblock_x86_reserve_range: [0x607ffc0000-0x607fffffff] PGTABLE [ 0.000000] init_memory_mapping: [0x00006080000000-0x0000707fffffff] [ 0.000000] 6080000000 - 7080000000 page 2M [ 0.000000] kernel direct mapping tables up to 7080000000 @ [0x707fe3d000-0x707fffffff] [ 0.000000] memblock_x86_reserve_range: [0x707ffc0000-0x707fffffff] PGTABLE [ 0.000000] init_memory_mapping: [0x00007080000000-0x0000807fffffff] [ 0.000000] 7080000000 - 8080000000 page 2M [ 0.000000] kernel direct mapping tables up to 8080000000 @ [0x807fdfc000-0x807fffffff] [ 0.000000] memblock_x86_reserve_range: [0x807ffbf000-0x807fffffff] PGTABLE [ 0.000000] Initmem setup node 0 [0000000000000000-000000107fffffff] [ 0.000000] NODE_DATA [0x0000107ffbd000-0x0000107ffc1fff] [ 0.000000] Initmem setup node 1 [0000001080000000-000000207fffffff] [ 0.000000] NODE_DATA [0x0000207ffbb000-0x0000207ffbffff] [ 0.000000] Initmem setup node 2 [0000002080000000-000000307fffffff] [ 0.000000] NODE_DATA [0x0000307ffbb000-0x0000307ffbffff] [ 0.000000] Initmem setup node 3 [0000003080000000-000000407fffffff] [ 0.000000] NODE_DATA [0x0000407ffbb000-0x0000407ffbffff] [ 0.000000] Initmem setup node 4 [0000004080000000-000000507fffffff] [ 0.000000] NODE_DATA [0x0000507ffbb000-0x0000507ffbffff] [ 0.000000] Initmem setup node 5 [0000005080000000-000000607fffffff] [ 0.000000] NODE_DATA [0x0000607ffbb000-0x0000607ffbffff] [ 0.000000] Initmem setup node 6 [0000006080000000-000000707fffffff] [ 0.000000] NODE_DATA [0x0000707ffbb000-0x0000707ffbffff] [ 0.000000] Initmem setup node 7 [0000007080000000-000000807fffffff] [ 0.000000] NODE_DATA [0x0000807ffba000-0x0000807ffbefff] Signed-off-by: Yinghai Lu LKML-Reference: <4D1933D1.9020609@kernel.org> Signed-off-by: H. Peter Anvin commit dbef7b56d2fc5115f26f72a0b080283bbf972cab Author: Yinghai Lu Date: Mon Dec 27 16:48:08 2010 -0800 x86-64, numa: Allocate memnodemap under max_pfn_mapped We need to access it right way, so make sure that it is mapped already. Prepare to put page table on local node, and nodemap is used before that. Signed-off-by: Yinghai Lu LKML-Reference: <4D1933C8.7060105@kernel.org> Signed-off-by: H. Peter Anvin commit 45635ab5e41bcde94a82f9a05d660ef77fe38c1b Author: Yinghai Lu Date: Mon Dec 27 16:47:54 2010 -0800 x86: Change get_max_mapped() to inline Move it into head file. to prepare use it in other files. [ hpa: added missing and changed type to phys_addr_t. ] Signed-off-by: Yinghai Lu LKML-Reference: <4D1933BA.8000508@kernel.org> Signed-off-by: H. Peter Anvin commit 1a4a678b12c84db9ae5dce424e0e97f0559bb57c Author: Yinghai Lu Date: Fri Dec 17 16:59:07 2010 -0800 memblock: Make find_memory_core_early() find from top-down That is used for find ram in node or bootmem type. We should make it top-down so it will be consistent to memblock_find, and to avoid allocating potentially valuable low memory before we actually need it. Suggested-by: Jeremy Fitzhardinge Signed-off-by: Yinghai Lu LKML-Reference: <4D0C075B.3040501@kernel.org> Signed-off-by: H. Peter Anvin commit 32e3f2b00c529477d26895c5428ed95bba537443 Author: Yinghai Lu Date: Fri Dec 17 16:58:40 2010 -0800 x86-64, gart: Fix allocation with memblock When trying to change alloc_bootmem with memblock to go with real top-down Found one old system: [ 0.000000] Node 0: aperture @ ac000000 size 64 MB [ 0.000000] Aperture pointing to e820 RAM. Ignoring. [ 0.000000] Your BIOS doesn't leave a aperture memory hole [ 0.000000] Please enable the IOMMU option in the BIOS setup [ 0.000000] This costs you 64 MB of RAM [ 0.000000] memblock_x86_reserve_range: [0x2020000000-0x2023ffffff] aperture64 [ 0.000000] Cannot allocate aperture memory hole (ffff882020000000,65536K) [ 0.000000] memblock_x86_free_range: [0x2020000000-0x2023ffffff] [ 0.000000] Kernel panic - not syncing: Not enough memory for aperture [ 0.000000] Pid: 0, comm: swapper Not tainted 2.6.37-rc5-tip-yh-06229-gb792dc2-dirty #331 [ 0.000000] Call Trace: [ 0.000000] [] ? panic+0x91/0x1a3 [ 0.000000] [] ? gart_iommu_hole_init+0x3d7/0x4a3 [ 0.000000] [] ? _etext+0x0/0x3 [ 0.000000] [] ? pci_iommu_alloc+0x47/0x71 [ 0.000000] [] ? mem_init+0x19/0xec [ 0.000000] [] ? start_kernel+0x20a/0x3e8 [ 0.000000] [] ? x86_64_start_reservations+0x9c/0xa0 [ 0.000000] [] ? x86_64_start_kernel+0x114/0x11b it means __alloc_bootmem_nopanic() get too high for that aperture. Use memblock_find_in_range() with limit directly. Signed-off-by: Yinghai Lu LKML-Reference: <4D0C0740.90104@kernel.org> Signed-off-by: H. Peter Anvin commit 4b239f458c229de044d6905c2b0f9fe16ed9e01e Author: Yinghai Lu Date: Fri Dec 17 16:58:28 2010 -0800 x86-64, mm: Put early page table high While dubug kdump, found current kernel will have problem with crashkernel=512M. It turns out that initial mapping is to 512M, and later initial mapping to 4G (acutally is 2040M in my platform), will put page table near 512M. then initial mapping to 128g will be near 2g. before this patch: [ 0.000000] initial memory mapped : 0 - 20000000 [ 0.000000] init_memory_mapping: [0x00000000000000-0x0000007f74ffff] [ 0.000000] 0000000000 - 007f600000 page 2M [ 0.000000] 007f600000 - 007f750000 page 4k [ 0.000000] kernel direct mapping tables up to 7f750000 @ [0x1fffc000-0x1fffffff] [ 0.000000] memblock_x86_reserve_range: [0x1fffc000-0x1fffdfff] PGTABLE [ 0.000000] init_memory_mapping: [0x00000100000000-0x0000207fffffff] [ 0.000000] 0100000000 - 2080000000 page 2M [ 0.000000] kernel direct mapping tables up to 2080000000 @ [0x7bc01000-0x7bc83fff] [ 0.000000] memblock_x86_reserve_range: [0x7bc01000-0x7bc7efff] PGTABLE [ 0.000000] RAMDISK: 7bc84000 - 7f745000 [ 0.000000] crashkernel reservation failed - No suitable area found. after patch: [ 0.000000] initial memory mapped : 0 - 20000000 [ 0.000000] init_memory_mapping: [0x00000000000000-0x0000007f74ffff] [ 0.000000] 0000000000 - 007f600000 page 2M [ 0.000000] 007f600000 - 007f750000 page 4k [ 0.000000] kernel direct mapping tables up to 7f750000 @ [0x7f74c000-0x7f74ffff] [ 0.000000] memblock_x86_reserve_range: [0x7f74c000-0x7f74dfff] PGTABLE [ 0.000000] init_memory_mapping: [0x00000100000000-0x0000207fffffff] [ 0.000000] 0100000000 - 2080000000 page 2M [ 0.000000] kernel direct mapping tables up to 2080000000 @ [0x207ff7d000-0x207fffffff] [ 0.000000] memblock_x86_reserve_range: [0x207ff7d000-0x207fffafff] PGTABLE [ 0.000000] RAMDISK: 7bc84000 - 7f745000 [ 0.000000] memblock_x86_reserve_range: [0x17000000-0x36ffffff] CRASH KERNEL [ 0.000000] Reserving 512MB of memory at 368MB for crashkernel (System RAM: 133120MB) It means with the patch, page table for [0, 2g) will need 2g, instead of under 512M, page table for [4g, 128g) will be near 128g, instead of under 2g. That would good, if we have lots of memory above 4g, like 1024g, or 2048g or 16T, will not put related page table under 2g. that would be have chance to fill the under 2g if 1G or 2M page is not used. the code change will use add map_low_page() and update unmap_low_page() for 64bit, and use them to get access the corresponding high memory for page table setting. Signed-off-by: Yinghai Lu LKML-Reference: <4D0C0734.7060900@kernel.org> Signed-off-by: H. Peter Anvin commit ca01d6dd2d7a2652000307520777538740efc286 Author: Tony Luck Date: Tue Dec 28 14:25:21 2010 -0800 pstore: new filesystem interface to platform persistent storage Some platforms have a small amount of non-volatile storage that can be used to store information useful to diagnose the cause of a system crash. This is the generic part of a file system interface that presents information from the crash as a series of files in /dev/pstore. Once the information has been seen, the underlying storage is freed by deleting the files. Signed-off-by: Tony Luck commit ae90bdeaeac6b964b7a1e853a90a19f358a9ac20 Author: KOVACS Krisztian Date: Wed Dec 15 23:53:41 2010 +0100 netfilter: fix compilation when conntrack is disabled but tproxy is enabled The IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but failed to update the #ifdef stanzas guarding the defragmentation related fields and code in skbuff and conntrack related code in nf_defrag_ipv6.c. This patch adds the required #ifdefs so that IPv6 tproxy can truly be used without connection tracking. Original report: http://marc.info/?l=linux-netdev&m=129010118516341&w=2 Reported-by: Randy Dunlap Signed-off-by: KOVACS Krisztian Acked-by: Randy Dunlap Signed-off-by: Patrick McHardy commit f1c722295e029eace7960fc687efd5afd67dc555 Author: Jan Engelhardt Date: Wed Dec 15 22:58:53 2010 +0100 netfilter: xtables: use guarded types We are supposed to use the kernel's own types in userspace exports. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit b880c1f077000956b9f475d5f3b6c5e45ff2e342 Author: Hans Schillstrom Date: Fri Nov 19 14:25:14 2010 +0100 IPVS: Backup, adding version 0 sending capabilities This patch adds a sysclt net.ipv4.vs.sync_version that can be used to send sync msg in version 0 or 1 format. sync_version value is logical, Value 1 (default) New version 0 Plain old version Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 986a075795339c5ea1122ce9290dfd5504252eb0 Author: Hans Schillstrom Date: Fri Nov 19 14:25:13 2010 +0100 IPVS: Backup, Change sending to Version 1 format Enable sending and removal of version 0 sending Affected functions, ip_vs_sync_buff_create() ip_vs_sync_conn() ip_vs_core.c removal of IPv4 check. *v5 Just check cp->pe_data_len in ip_vs_sync_conn Check if padding needed before adding a new sync_conn to the buffer, i.e. avoid sending padding at the end. *v4 moved sanity check and pe_name_len after sloop. use cp->pe instead of cp->dest->svc->pe real length in each sync_conn, not padded length however total size of a sync_msg includes padding. *v3 Sending ip_vs_sync_conn_options in network order. Sending Templates for ONE_PACKET conn. Renaming of ip_vs_sync_mesg to ip_vs_sync_mesg_v0 Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit fe5e7a1efb664df0280f10377813d7099fb7eb0f Author: Hans Schillstrom Date: Fri Nov 19 14:25:12 2010 +0100 IPVS: Backup, Adding Version 1 receive capability Functionality improvements * flags changed from 16 to 32 bits * fwmark added (32 bits) * timeout in sec. added (32 bits) * pe data added (Variable length) * IPv6 capabilities (3x16 bytes for addr.) * Version and type in every conn msg. ip_vs_process_message() now handles Version 1 messages and will call ip_vs_process_message_v0() for version 0 messages. ip_vs_proc_conn() is common for both version, and handles the update of connection hash. ip_vs_conn_fill_param_sync() - Version 1 messages only ip_vs_conn_fill_param_sync_v0() - Version 0 messages only Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 2981bc9a63456500037ca1f434b93a561e63f384 Author: Hans Schillstrom Date: Fri Nov 19 14:25:11 2010 +0100 IPVS: Backup, Adding structs for new sync format New structs defined for version 1 of sync. * ip_vs_sync_v4 Ipv4 base format struct * ip_vs_sync_v6 Ipv6 base format struct Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit a5959d53d6048a56103ee0ade1eb6f2c0c733b1d Author: Hans Schillstrom Date: Fri Nov 19 14:25:10 2010 +0100 IPVS: Handle Scheduling errors. If ip_vs_conn_fill_param_persist return an error to ip_vs_sched_persist, this error must propagate as ignored=-1 to ip_vs_schedule(). Errors from ip_vs_conn_new() in ip_vs_sched_persist() and ip_vs_schedule() should also return *ignored=-1; This patch just relies on the fact that ignored is 1 before calling ip_vs_sched_persist(). Sent from Julian: "The new case when ip_vs_conn_fill_param_persist fails should set *ignored = -1, so that we can use NF_DROP, see below. *ignored = -1 should be also used for ip_vs_conn_new failure in ip_vs_sched_persist() and ip_vs_schedule(). The new negative value should be handled in tcp,udp,sctp" "To summarize: - *ignored = 1: protocol tried to schedule (eg. on SYN), found svc but the svc/scheduler decides that this packet should be accepted with NF_ACCEPT because it must not be scheduled. - *ignored = 0: scheduler can not find destination, so try bypass or return ICMP and then NF_DROP (ip_vs_leave). - *ignored = -1: scheduler tried to schedule but fatal error occurred, eg. ip_vs_conn_new failure (ENOMEM) or ip_vs_sip_fill_param failure such as missing Call-ID, ENOMEM on skb_linearize or pe_data. In this case we should return NF_DROP without any attempts to send ICMP with ip_vs_leave." More or less all ideas and input to this patch is work from Julian Anastasov Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 3716522653a79b724b02ee911f1b60c41932f847 Author: Hans Schillstrom Date: Fri Nov 19 14:25:09 2010 +0100 IPVS: skb defrag in L7 helpers L7 helpers like sip needs skb defrag since L7 data can be fragmented. This patch requires "IPVS Break ports-2 into src_port and dst_port" patch Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit ce144f249f3f21a095a093d5d1ebd845177858da Author: Hans Schillstrom Date: Fri Nov 19 14:25:08 2010 +0100 IPVS: Split ports[2] into src_port and dst_port Avoid sending invalid pointer due to skb_linearize() call. This patch prepares for next patch where skb_linearize is a part. In ip_vs_sched_persist() params the ports ptr will be replaced by src and dst port. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 0e051e683ba4acb4e67c272c6a89707d974099d1 Author: Hans Schillstrom Date: Fri Nov 19 14:25:07 2010 +0100 IPVS: Backup, Prepare for transferring firewall marks (fwmark) to the backup daemon. One struct will have fwmark added: * ip_vs_conn ip_vs_conn_new() and ip_vs_find_dest() will have an extra param - fwmark The effects of that, is in this patch. Signed-off-by: Hans Schillstrom Acked-by: Julian Anastasov Signed-off-by: Simon Horman commit 2c2bf086146c7e4ff526247e9fd1db23dada88c3 Merge: 3bfd45f 8f1b03a Author: Patrick McHardy Date: Tue Nov 16 10:21:27 2010 +0100 Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6 commit 3bfd45f93c8bca7a5dc955235ff083602d95aa43 Author: Eric Dumazet Date: Tue Nov 16 10:19:18 2010 +0100 netfilter: nf_conntrack: one less atomic op in nf_ct_expect_insert() Instead of doing atomic_inc(&exp->use) twice, call atomic_add(2, &exp->use); Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 8f1b03a4c18e8f3f0801447b62330faa8ed3bb37 Author: Simon Horman Date: Tue Nov 9 10:08:49 2010 +0900 ipvs: allow transmit of GRO aggregated skbs Attempt at allowing LVS to transmit skbs of greater than MTU length that have been aggregated by GRO and can thus be deaggregated by GSO. Cc: Julian Anastasov Cc: Herbert Xu Signed-off-by: Simon Horman commit a333e2ec05791bb866086274ac9749315900a0a6 Author: Eric Dumazet Date: Mon Nov 15 19:46:33 2010 +0100 ipvs: remove shadow rt variable Remove a sparse warning about rt variable. Signed-off-by: Eric Dumazet Signed-off-by: Simon Horman commit 4ecd29447e6b9c12190e21c3e44ed5b12693c467 Author: Eric Dumazet Date: Mon Nov 15 18:38:52 2010 +0100 ipvs: add static and read_mostly attributes ip_vs_conn_tab_bits & ip_vs_conn_tab_mask are static to ipvs/ip_vs_conn.c ip_vs_conn_tab_size, ip_vs_conn_tab_mask, ip_vs_conn_tab [the pointer], ip_vs_conn_rnd are mostly read. Signed-off-by: Eric Dumazet Signed-off-by: Simon Horman commit 8aadf93c9c1ff1a53aafd18d038be0d709b5ebc0 Author: Simon Horman Date: Tue Nov 9 09:33:28 2010 +0900 IPVS: buffer argument to ip_vs_process_message() should not be const It is assigned to a non-const variable and its contents are modified. Acked-by: Hans Schillstrom Signed-off-by: Simon Horman commit 7ae246a15a5c9d26cfb572d36794325db0400b18 Author: Simon Horman Date: Tue Nov 9 09:33:25 2010 +0900 IPVS: Remove useless { } block from ip_vs_process_message() Acked-by: Hans Schillstrom Signed-off-by: Simon Horman commit d494262b8a0f3507b62104a565849124abe29827 Author: Simon Horman Date: Tue Nov 9 09:33:15 2010 +0900 IPVS: Make the cp argument to ip_vs_sync_conn() static Acked-by: Hans Schillstrom Signed-off-by: Simon Horman commit ea2c73afc23db3084fd857b027446c38fc7ff2c9 Author: Simon Horman Date: Mon Nov 8 20:06:30 2010 +0900 IPVS: Only match pe_data created by the same pe Only match persistence engine data if it was created by the same persistence engine. Reported-by: Julian Anastasov Signed-off-by: Simon Horman commit e9e5eee8733739f13a204132b502494b3f494f3b Author: Simon Horman Date: Mon Nov 8 20:05:57 2010 +0900 IPVS: Add persistence engine to connection entry The dest of a connection may not exist if it has been created as the result of connection synchronisation. But in order for connection entries for templates with persistence engine data created through connection synchronisation to be valid access to the persistence engine pointer is required. So add the persistence engine to the connection itself. Signed-off-by: Simon Horman commit c5d277d29ad1ae9add8d6984025ccd2e835971ce Author: Eric Dumazet Date: Mon Nov 15 19:45:13 2010 +0100 netfilter: rcu sparse cleanups Use RCU helpers to reduce number of sparse warnings (CONFIG_SPARSE_RCU_POINTER=y), and adds lockdep checks. Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit ab0cba25128e1435a59b1ec4ae0c7505548fed87 Author: Eric Dumazet Date: Mon Nov 15 18:45:12 2010 +0100 netfilter: nf_nat_amanda: rename a variable Avoid a sparse warning about 'ret' variable shadowing Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit eb733162ae4f69b93f7c08012e6e239f31796de8 Author: Eric Dumazet Date: Mon Nov 15 18:43:59 2010 +0100 netfilter: add __rcu annotations Use helpers to reduce number of sparse warnings (CONFIG_SPARSE_RCU_POINTER=y) Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit be9e9163afcfc3137e7c6377cb0c7b406318fde0 Author: Eric Dumazet Date: Mon Nov 15 18:18:29 2010 +0100 netfilter: nf_ct_frag6_sysctl_table is static Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 0e60ebe04c51807db972d03665651ae6b5c26d7e Author: Eric Dumazet Date: Mon Nov 15 18:17:21 2010 +0100 netfilter: add __rcu annotations Add some __rcu annotations and use helpers to reduce number of sparse warnings (CONFIG_SPARSE_RCU_POINTER=y) Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 9811600f7c1f18152430c6b93b0a76fdd88a59ce Author: Frédéric Leroy Date: Mon Nov 15 13:57:56 2010 +0100 netfilter: xt_CLASSIFY: add ARP support, allow CLASSIFY target on any table Signed-off-by: Frédéric Leroy Signed-off-by: Patrick McHardy commit 03c0e5bb34c9755ae4d955c97fba40b24e9c7fe7 Author: Changli Gao Date: Mon Nov 15 12:27:27 2010 +0100 netfilter: nf_nat: define nat_pptp_info as needed Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit e0e76c83becc7536e8371e560504d836d34fcf7d Author: Changli Gao Date: Mon Nov 15 12:23:24 2010 +0100 netfilter: ct_extend: define NF_CT_EXT_* as needed Less IDs make nf_ct_ext smaller. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit 76a2d3bcfcc86e2a8044258515b86492a37631a3 Author: Changli Gao Date: Mon Nov 15 11:59:03 2010 +0100 netfilter: nf_nat: don't use atomic bit operation As we own the conntrack and the others can't see it until we confirm it, we don't need to use atomic bit operation on ct->status. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit 0f8e80044b26b4b30213a3fdffebd325cdc21362 Author: Changli Gao Date: Mon Nov 15 11:51:06 2010 +0100 netfilter: nf_conntrack: define ct_*_info as needed Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit 3b2368806915e1e69ac3bcc0d6a7cfde64307655 Author: Changli Gao Date: Mon Nov 15 11:47:52 2010 +0100 netfilter: ct_extend: fix the wrong alloc_size In function update_alloc_size(), sizeof(struct nf_ct_ext) is added twice wrongly. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit b468645d72c2b4a15512f0a18e77670ea058b861 Author: Jan Engelhardt Date: Mon Nov 15 11:23:06 2010 +0100 netfilter: xt_LOG: do print MAC header on FORWARD I am observing consistent behavior even with bridges, so let's unlock this. xt_mac is already usable in FORWARD, too. Section 9 of http://ebtables.sourceforge.net/br_fw_ia/br_fw_ia.html#section9 says the MAC source address is changed, but my observation does not match that claim -- the MAC header is retained. Signed-off-by: Jan Engelhardt [Patrick; code inspection seems to confirm this] Signed-off-by: Patrick McHardy commit ca36181050a523f6c0af3ef7cb509bbbc4ede276 Author: Changli Gao Date: Fri Nov 12 17:34:17 2010 +0100 netfilter: xt_NFQUEUE: remove modulo operations Signed-off-by: Changli Gao Acked-by: Eric Dumazet Signed-off-by: Patrick McHardy commit e5fc9e7a666e5964b60e05903b90aa832354b68c Author: Changli Gao Date: Fri Nov 12 17:33:17 2010 +0100 netfilter: nf_conntrack: don't always initialize ct->proto ct->proto is big(60 bytes) due to structure ip_ct_tcp, and we don't need to initialize the whole for all the other protocols. This patch moves proto to the end of structure nf_conn, and pushes the initialization down to the individual protocols. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy commit 8f5585ec3d173819dd7e751f661c33af39d7ec60 Author: Paul Mundt Date: Tue May 25 18:31:12 2010 +0900 watchdog: shwdt: driver model conversion. This is a long overdue driver model conversion for the shwdt watchdog driver. This is the initial conversion, more incremental changes to follow. Signed-off-by: Paul Mundt commit b1fa888e0124763e5bafda074874fc7ac0f2f23f Author: Paul Mundt Date: Mon May 24 10:55:59 2010 +0900 watchdog: shwdt: Kill off mmap stub and superfluous comments. The wdt mmaping thing was a special-cased hack that nothing in the wild depends on, so just kill it off. While at it, sanitize the superfluous comments in preparation for a driver rewrite and overhauled interface. Signed-off-by: Paul Mundt